From 4596c125853ed15be0f02dab3b18a0679027d5fb Mon Sep 17 00:00:00 2001 From: TIHan Date: Tue, 25 Sep 2018 17:30:39 -0700 Subject: [PATCH 001/137] Initial nullness work for fun types --- src/fsharp/ConstraintSolver.fs | 76 ++++++++++++++++++++++++++++--- src/fsharp/IlxGen.fs | 2 +- src/fsharp/NicePrint.fs | 10 +++- src/fsharp/PostInferenceChecks.fs | 2 +- src/fsharp/QuotationTranslator.fs | 2 +- src/fsharp/TastOps.fs | 45 +++++++++++------- src/fsharp/TastOps.fsi | 5 ++ src/fsharp/TastPickle.fs | 4 +- src/fsharp/TcGlobals.fs | 4 +- src/fsharp/TypeChecker.fs | 2 +- src/fsharp/TypeRelations.fs | 6 +-- src/fsharp/symbols/Symbols.fs | 20 +++++++- src/fsharp/symbols/Symbols.fsi | 8 +++- src/fsharp/tast.fs | 45 ++++++++++++++++-- 14 files changed, 192 insertions(+), 39 deletions(-) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 869d0dc31a3..866ac16b546 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -156,6 +156,7 @@ exception ConstraintSolverInfiniteTypes of ContextInfo * DisplayEnv * TType * TT exception ConstraintSolverTypesNotInEqualityRelation of DisplayEnv * TType * TType * range * range * ContextInfo exception ConstraintSolverTypesNotInSubsumptionRelation of DisplayEnv * TType * TType * range * range exception ConstraintSolverMissingConstraint of DisplayEnv * Tast.Typar * Tast.TyparConstraint * range * range +exception ConstraintSolverNullnessWarning of DisplayEnv * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverError of string * range * range exception ConstraintSolverRelatedInformation of string option * range * exn @@ -228,7 +229,7 @@ let rec occursCheck g un ty = | TType_ucase(_, l) | TType_app (_, l) | TType_tuple (_, l) -> List.exists (occursCheck g un) l - | TType_fun (d, r) -> occursCheck g un d || occursCheck g un r + | TType_fun (d, r, _nullness) -> occursCheck g un d || occursCheck g un r | TType_var r -> typarEq un r | TType_forall (_, tau) -> occursCheck g un tau | _ -> false @@ -578,7 +579,7 @@ let rec SimplifyMeasuresInType g resultFirst ((generalizable, generalized) as pa | TType_app (_, l) | TType_tuple (_, l) -> SimplifyMeasuresInTypes g param l - | TType_fun (d, r) -> if resultFirst then SimplifyMeasuresInTypes g param [r;d] else SimplifyMeasuresInTypes g param [d;r] + | TType_fun (d, r, _nullness) -> if resultFirst then SimplifyMeasuresInTypes g param [r;d] else SimplifyMeasuresInTypes g param [d;r] | TType_var _ -> param | TType_forall (_, tau) -> SimplifyMeasuresInType g resultFirst param tau | TType_measure unt -> @@ -615,7 +616,7 @@ let rec GetMeasureVarGcdInType v ty = | TType_app (_, l) | TType_tuple (_, l) -> GetMeasureVarGcdInTypes v l - | TType_fun (d, r) -> GcdRational (GetMeasureVarGcdInType v d) (GetMeasureVarGcdInType v r) + | TType_fun (d, r, _nullness) -> GcdRational (GetMeasureVarGcdInType v d) (GetMeasureVarGcdInType v r) | TType_var _ -> ZeroRational | TType_forall (_, tau) -> GetMeasureVarGcdInType v tau | TType_measure unt -> MeasureVarExponent v unt @@ -777,6 +778,47 @@ and solveTypMeetsTyparConstraints (csenv:ConstraintSolverEnv) ndeep m2 trace ty SolveMemberConstraint csenv false false ndeep m2 trace traitInfo ++ (fun _ -> CompleteD) )))) +and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) nullness1 nullness2 = + match nullness1, nullness2 with + | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> + CompleteD + | Nullness.Variable nv1, _ when not nv1.IsSolved -> + trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) + CompleteD + | _, Nullness.Variable nv2 when not nv2.IsSolved -> + trace.Exec (fun () -> nv2.Set nullness2) (fun () -> nv2.Unset()) + CompleteD + | Nullness.Variable nv1, _ -> SolveNullnessEquiv csenv m2 trace nv1.Solution nullness2 + | _, Nullness.Variable nv2 -> SolveNullnessEquiv csenv m2 trace nullness1 nv2.Solution + | Nullness.Known n1, Nullness.Known n2 -> + match n1, n2 with + | Oblivious, _ -> CompleteD + | _, Oblivious -> CompleteD + | WithNull, WithNull -> CompleteD + | WithoutNull, WithoutNull -> CompleteD + | _, _ -> WarnD(ConstraintSolverNullnessWarning(csenv.DisplayEnv, n1, n2, csenv.m, m2)) + +and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) nullness1 nullness2 = + match nullness1, nullness2 with + | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> + CompleteD + | Nullness.Variable nv1, _ when not nv1.IsSolved -> + trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) + CompleteD + | _, Nullness.Variable nv2 when not nv2.IsSolved -> + trace.Exec (fun () -> nv2.Set nullness2) (fun () -> nv2.Unset()) + CompleteD + | Nullness.Variable nv1, _ -> SolveNullnessEquiv csenv m2 trace nv1.Solution nullness2 + | _, Nullness.Variable nv2 -> SolveNullnessEquiv csenv m2 trace nullness1 nv2.Solution + | Nullness.Known n1, Nullness.Known n2 -> + match n1, n2 with + | Oblivious, _ -> CompleteD + | _, Oblivious -> CompleteD + | WithNull, WithNull -> CompleteD + | WithoutNull, WithoutNull -> CompleteD + | WithNull, WithoutNull -> CompleteD + | WithoutNull, WithNull -> + WarnD(ConstraintSolverNullnessWarning(csenv.DisplayEnv, n1, n2, csenv.m, m2)) /// Add the constraint "ty1 = ty2" to the constraint problem. /// Propagate all effects of adding this constraint, e.g. to solve type variables @@ -818,7 +860,10 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> if evalTupInfoIsStruct tupInfo1 <> evalTupInfoIsStruct tupInfo2 then ErrorD (ConstraintSolverError(FSComp.SR.tcTupleStructMismatch(), csenv.m, m2)) else SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 - | TType_fun (d1, r1) , TType_fun (d2, r2) -> SolveFunTypeEqn csenv ndeep m2 trace None d1 d2 r1 r2 + | TType_fun (d1, r1, nullness1) , TType_fun (d2, r2, nullness2) -> + SolveFunTypeEqn csenv ndeep m2 trace None d1 d2 r1 r2 ++ (fun () -> + SolveNullnessEquiv csenv m2 trace nullness1 nullness2 + ) | TType_measure ms1 , TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 | TType_forall(tps1, rty1), TType_forall(tps2, rty2) -> if tps1.Length <> tps2.Length then localAbortD else @@ -890,7 +935,11 @@ and SolveTypeSubsumesType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalT | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> if evalTupInfoIsStruct tupInfo1 <> evalTupInfoIsStruct tupInfo2 then ErrorD (ConstraintSolverError(FSComp.SR.tcTupleStructMismatch(), csenv.m, m2)) else SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 (* nb. can unify since no variance *) - | TType_fun (d1, r1) , TType_fun (d2, r2) -> SolveFunTypeEqn csenv ndeep m2 trace cxsln d1 d2 r1 r2 (* nb. can unify since no variance *) + | TType_fun (d1, r1, nullness1) , TType_fun (d2, r2, nullness2) -> + (* nb. can unify since no variance *) + SolveFunTypeEqn csenv ndeep m2 trace cxsln d1 d2 r1 r2 ++ (fun () -> + SolveNullnessSubsumesNullness csenv m2 trace nullness1 nullness2 + ) | TType_measure ms1, TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 // Enforce the identities float=float<1>, float32=float32<1> and decimal=decimal<1> @@ -1685,6 +1734,20 @@ and AddConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace tp newConstraint = CompleteD))) +and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) nullness = + let m = csenv.m + let denv = csenv.DisplayEnv + match nullness with + | Nullness.Variable nv1 when not nv1.IsSolved -> + trace.Exec (fun () -> nv1.Set KnownNull) (fun () -> nv1.Unset()) + CompleteD + | Nullness.Variable nv -> SolveNullnessSupportsNull csenv ndeep m2 trace nv.Solution + | Nullness.Known n1 -> + match n1 with + | Oblivious -> CompleteD + | WithNull -> CompleteD + | WithoutNull -> WarnD(ConstraintSolverNullnessWarning(denv, n1, WithoutNull, m, m2)) + and SolveTypeSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let g = csenv.g let m = csenv.m @@ -1694,7 +1757,8 @@ and SolveTypeSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = AddConstraint csenv ndeep m2 trace destTypar (TyparConstraint.SupportsNull m) | None -> if TypeSatisfiesNullConstraint g m ty then CompleteD else - match ty with + match stripTyparEqns ty with + | TType_fun (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace nullness | NullableTy g _ -> ErrorD (ConstraintSolverError(FSComp.SR.csNullableTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) | _ -> diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs index 903a424a4e4..8a25eae0ee6 100644 --- a/src/fsharp/IlxGen.fs +++ b/src/fsharp/IlxGen.fs @@ -438,7 +438,7 @@ and GenTypeAux amap m (tyenv: TypeReprEnv) voidOK ptrsOK ty = | TType_tuple (tupInfo, args) -> GenTypeAux amap m tyenv VoidNotOK ptrsOK (mkCompiledTupleTy g (evalTupInfoIsStruct tupInfo) args) - | TType_fun (dty, returnTy) -> EraseClosures.mkILFuncTy g.ilxPubCloEnv (GenTypeArgAux amap m tyenv dty) (GenTypeArgAux amap m tyenv returnTy) + | TType_fun (dty, returnTy, _nullness) -> EraseClosures.mkILFuncTy g.ilxPubCloEnv (GenTypeArgAux amap m tyenv dty) (GenTypeArgAux amap m tyenv returnTy) | TType_ucase (ucref, args) -> let cuspec,idx = GenUnionCaseSpec amap m tyenv ucref args diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs index c4ed19f1ee0..0ca97c7f798 100755 --- a/src/fsharp/NicePrint.fs +++ b/src/fsharp/NicePrint.fs @@ -953,7 +953,15 @@ module private PrintTypes = | TType_fun _ -> let rec loop soFarL ty = match stripTyparEqns ty with - | TType_fun (dty,rty) -> loop (soFarL --- (layoutTypeWithInfoAndPrec denv env 4 dty ^^ wordL (tagPunctuation "->"))) rty + | TType_fun (dty,rty,nullness) -> + let part1 = soFarL --- (layoutTypeWithInfoAndPrec denv env 4 dty ^^ wordL (tagPunctuation "->")) + let part2 = loop part1 rty + let part3 = + match nullness.Evaluate() with + | WithNull -> part2 ^^ wordL (tagText "| null") + | WithoutNull -> part2 + | Oblivious -> part2 ^^ wordL (tagText "| lol") + part3 | rty -> soFarL --- layoutTypeWithInfoAndPrec denv env 5 rty bracketIfL (prec <= 4) (loop emptyL ty) diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index 761d5395e88..713a7da5163 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -341,7 +341,7 @@ let rec CheckTypeDeep ((visitTy,visitTyconRefOpt,visitAppTyOpt,visitTraitSolutio | TType_ucase (_,tinst) -> CheckTypesDeep f g env tinst | TType_tuple (_,tys) -> CheckTypesDeep f g env tys - | TType_fun (s,t) -> CheckTypeDeep f g env true s; CheckTypeDeep f g env true t + | TType_fun (s,t,_nullness) -> CheckTypeDeep f g env true s; CheckTypeDeep f g env true t | TType_var tp -> if not tp.IsSolved then match visitTyarOpt with diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs index 9c7bc53e333..d3f999ff37f 100644 --- a/src/fsharp/QuotationTranslator.fs +++ b/src/fsharp/QuotationTranslator.fs @@ -805,7 +805,7 @@ and ConvType cenv env m ty = #endif QP.mkILNamedTy(ConvTyconRef cenv tcref m, ConvTypes cenv env m tyargs) - | TType_fun(a,b) -> QP.mkFunTy(ConvType cenv env m a,ConvType cenv env m b) + | TType_fun(a,b,_nullness) -> QP.mkFunTy(ConvType cenv env m a,ConvType cenv env m b) | TType_tuple(tupInfo,l) -> ConvType cenv env m (mkCompiledTupleTy cenv.g (evalTupInfoIsStruct tupInfo) l) | TType_var(tp) -> QP.mkVarTy(ConvTyparRef cenv env m tp) | TType_forall(_spec,_ty) -> wfail(Error(FSComp.SR.crefNoInnerGenericsInQuotations(),m)) diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index 4b161ac1d27..78ac16d8883 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -187,11 +187,11 @@ let rec remapTypeAux (tyenv : Remap) (ty:TType) = if tupInfo === tupInfo' && l === l' then ty else TType_tuple (tupInfo', l') - | TType_fun (d, r) as ty -> + | TType_fun (d, r, nullness) as ty -> let d' = remapTypeAux tyenv d let r' = remapTypeAux tyenv r if d === d' && r === r' then ty else - TType_fun (d', r') + TType_fun (d', r', nullness) | TType_forall (tps, ty) -> let tps', tyenv = copyAndRemapAndBindTypars tyenv tps @@ -748,7 +748,7 @@ let rec stripTyEqnsAndErase eraseFuncAndTuple (g:TcGlobals) ty = stripTyEqnsAndErase eraseFuncAndTuple g g.nativeint_ty else ty - | TType_fun(a, b) when eraseFuncAndTuple -> TType_app(g.fastFunc_tcr, [ a; b]) + | TType_fun(a, b, _nullness) when eraseFuncAndTuple -> TType_app(g.fastFunc_tcr, [ a; b] (* , nullness *) ) | TType_tuple(tupInfo, l) when eraseFuncAndTuple -> mkCompiledTupleTy g (evalTupInfoIsStruct tupInfo) l | ty -> ty @@ -771,7 +771,7 @@ let rec stripExnEqns (eref:TyconRef) = let primDestForallTy g ty = ty |> stripTyEqns g |> (function TType_forall (tyvs, tau) -> (tyvs, tau) | _ -> failwith "primDestForallTy: not a forall type") -let destFunTy g ty = ty |> stripTyEqns g |> (function TType_fun (tyv, tau) -> (tyv, tau) | _ -> failwith "destFunTy: not a function type") +let destFunTy g ty = ty |> stripTyEqns g |> (function TType_fun (tyv, tau, _nullness) -> (tyv, tau) | _ -> failwith "destFunTy: not a function type") let destAnyTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple (tupInfo, l) -> tupInfo, l | _ -> failwith "destAnyTupleTy: not a tuple type") let destRefTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple (tupInfo, l) when not (evalTupInfoIsStruct tupInfo) -> l | _ -> failwith "destRefTupleTy: not a reference tuple type") let destStructTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple (tupInfo, l) when evalTupInfoIsStruct tupInfo -> l | _ -> failwith "destStructTupleTy: not a struct tuple type") @@ -803,13 +803,13 @@ let destAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst) -> let tcrefOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tcref | _ -> failwith "tcrefOfAppTy") let argsOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(_, tinst) -> tinst | _ -> []) let tryDestTyparTy g ty = ty |> stripTyEqns g |> (function TType_var v -> Some v | _ -> None) -let tryDestFunTy g ty = ty |> stripTyEqns g |> (function TType_fun (tyv, tau) -> Some(tyv, tau) | _ -> None) +let tryDestFunTy g ty = ty |> stripTyEqns g |> (function TType_fun (tyv, tau, _nullness) -> Some(tyv, tau) | _ -> None) let tryDestAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> Some tcref | _ -> None) let tryAnyParTy g ty = ty |> stripTyEqns g |> (function TType_var v -> Some v | TType_measure unt when isUnitParMeasure g unt -> Some(destUnitParMeasure g unt) | _ -> None) let (|AppTy|_|) g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst) -> Some (tcref, tinst) | _ -> None) let (|RefTupleTy|_|) g ty = ty |> stripTyEqns g |> (function TType_tuple(tupInfo, tys) when not (evalTupInfoIsStruct tupInfo) -> Some tys | _ -> None) -let (|FunTy|_|) g ty = ty |> stripTyEqns g |> (function TType_fun(dty, rty) -> Some (dty, rty) | _ -> None) +let (|FunTy|_|) g ty = ty |> stripTyEqns g |> (function TType_fun(dty, rty, _nullness) -> Some (dty, rty) | _ -> None) let tryNiceEntityRefOfTy ty = let ty = stripTyparEqnsAux false ty @@ -842,7 +842,7 @@ let convertToTypeWithMetadataIfPossible g ty = let (tupInfo, tupElemTys) = destAnyTupleTy g ty mkOuterCompiledTupleTy g (evalTupInfoIsStruct tupInfo) tupElemTys elif isFunTy g ty then - let (a,b) = destFunTy g ty + let (a, b (*, nullness *) ) = destFunTy g ty mkAppTy g.fastFunc_tcr [a; b] else ty @@ -958,7 +958,7 @@ and typeAEquivAux erasureFlag g aenv ty1 ty2 = typesAEquivAux erasureFlag g aenv b1 b2 | TType_tuple (s1, l1), TType_tuple (s2, l2) -> structnessAEquiv s1 s2 && typesAEquivAux erasureFlag g aenv l1 l2 - | TType_fun (dtys1, rty1), TType_fun (dtys2, rty2) -> + | TType_fun (dtys1, rty1, _nullness1), TType_fun (dtys2, rty2, _nullness2) -> typeAEquivAux erasureFlag g aenv dtys1 dtys2 && typeAEquivAux erasureFlag g aenv rty1 rty2 | TType_measure m1, TType_measure m2 -> match erasureFlag with @@ -1014,8 +1014,10 @@ let rec getErasedTypes g ty = if tp.IsErased then [ty] else [] | TType_app (_, b) | TType_ucase(_, b) | TType_tuple (_, b) -> List.foldBack (fun ty tys -> getErasedTypes g ty @ tys) b [] - | TType_fun (dty, rty) -> - getErasedTypes g dty @ getErasedTypes g rty + | TType_fun (dty, rty, nullness) -> + match nullness.Evaluate() with + | WithNull -> [ty] + | _ -> getErasedTypes g dty @ getErasedTypes g rty | TType_measure _ -> [ty] @@ -1044,7 +1046,11 @@ let unionCaseRefOrder = // Make some common types //--------------------------------------------------------------------------- -let mkFunTy d r = TType_fun (d, r) +let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) +let KnownNull = Nullness.Known WithNull +let KnownNonNull = Nullness.Known WithoutNull +let AssumeNonNull = KnownNonNull +let mkFunTy d r = TType_fun (d, r, NewNullnessVar()) let (-->) d r = mkFunTy d r let mkForallTy d r = TType_forall (d, r) let mkForallTyIfNeeded d r = if isNil d then r else mkForallTy d r @@ -2045,7 +2051,9 @@ and accFreeInType opts ty acc = | [h] -> accFreeInType opts h acc // optimization to avoid unneeded call | _ -> accFreeInTypes opts tinst acc | TType_ucase (UCRef(tc, _), tinst) -> accFreeInTypes opts tinst (accFreeTycon opts tc acc) - | TType_fun (d, r) -> accFreeInType opts d (accFreeInType opts r acc) + | TType_fun (d, r, _nullness) -> + // note, nullness variables are _not_ part of the type system proper + accFreeInType opts d (accFreeInType opts r acc) | TType_var r -> accFreeTyparRef opts r acc | TType_forall (tps, r) -> unionFreeTyvars (boundTypars opts tps (freeInType opts r)) acc | TType_measure unt -> accFreeInMeasure opts unt acc @@ -2132,7 +2140,7 @@ and accFreeInTypeLeftToRight g cxFlag thruFlag acc ty = accFreeInTypesLeftToRight g cxFlag thruFlag acc l | TType_app (_, tinst) -> accFreeInTypesLeftToRight g cxFlag thruFlag acc tinst | TType_ucase (_, tinst) -> accFreeInTypesLeftToRight g cxFlag thruFlag acc tinst - | TType_fun (d, r) -> accFreeInTypeLeftToRight g cxFlag thruFlag (accFreeInTypeLeftToRight g cxFlag thruFlag acc d ) r + | TType_fun (d, r, _nullness) -> accFreeInTypeLeftToRight g cxFlag thruFlag (accFreeInTypeLeftToRight g cxFlag thruFlag acc d ) r | TType_var r -> accFreeTyparRefLeftToRight g cxFlag thruFlag acc r | TType_forall (tps, r) -> unionFreeTyparsLeftToRight (boundTyparsLeftToRight g cxFlag thruFlag tps (accFreeInTypeLeftToRight g cxFlag thruFlag emptyFreeTyparsLeftToRight r)) acc | TType_measure unt -> List.foldBack (fun (tp, _) acc -> accFreeTyparRefLeftToRight g cxFlag thruFlag acc tp) (ListMeasureVarOccsWithNonZeroExponents unt) acc @@ -2522,7 +2530,7 @@ module SimplifyTypes = | TType_app (_, tinst) -> List.fold (foldTypeButNotConstraints f) z tinst | TType_ucase (_, tinst) -> List.fold (foldTypeButNotConstraints f) z tinst | TType_tuple (_, tys) -> List.fold (foldTypeButNotConstraints f) z tys - | TType_fun (s, t) -> foldTypeButNotConstraints f (foldTypeButNotConstraints f z s) t + | TType_fun (s, t, _nullness) -> foldTypeButNotConstraints f (foldTypeButNotConstraints f z s) t | TType_var _ -> z | TType_measure _ -> z @@ -3205,7 +3213,12 @@ module DebugPrint = begin let tcL = layoutTyconRef tcref auxTyparsL env tcL prefix tinst | TType_tuple (_tupInfo, tys) -> sepListL (wordL (tagText "*")) (List.map (auxTypeAtomL env) tys) |> wrap - | TType_fun (f, x) -> ((auxTypeAtomL env f ^^ wordL (tagText "->")) --- auxTypeL env x) |> wrap + | TType_fun (f, x, nullness) -> + let core = ((auxTypeAtomL env f ^^ wordL (tagText "->")) --- auxTypeL env x) |> wrap + match nullness.Evaluate() with + | WithNull -> core ^^ wordL (tagText "| null") + | WithoutNull -> core + | Oblivious -> core ^^ wordL (tagText "| lol") | TType_var typar -> auxTyparWrapL env isAtomic typar | TType_measure unt -> #if DEBUG @@ -7333,7 +7346,7 @@ let rec typeEnc g (gtpsType, gtpsMethod) ty = sprintf "System.ValueTuple%s"(tyargsEnc g (gtpsType, gtpsMethod) tys) else sprintf "System.Tuple%s"(tyargsEnc g (gtpsType, gtpsMethod) tys) - | TType_fun (f, x) -> + | TType_fun (f, x, _nullness) -> "Microsoft.FSharp.Core.FSharpFunc" + tyargsEnc g (gtpsType, gtpsMethod) [f;x] | TType_var typar -> typarEnc g (gtpsType, gtpsMethod) typar diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index d2a532c37a9..d7edcc799bf 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -45,6 +45,11 @@ val stripTyEqnsWrtErasure: Erasure -> TcGlobals -> TType -> TType // Build common types //------------------------------------------------------------------------- +val KnownNull : Nullness +val KnownNonNull : Nullness +val AssumeNonNull : Nullness +val NewNullnessVar : unit -> Nullness + /// Build a function type val mkFunTy : TType -> TType -> TType diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index 3f184165ad2..1fc79cf195a 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -1573,7 +1573,7 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> p_byte 0 st; p_tys l st | TType_app(ERefNonLocal nleref,[]) -> p_byte 1 st; p_simpletyp nleref st | TType_app (tc,tinst) -> p_byte 2 st; p_tup2 (p_tcref "typ") p_tys (tc,tinst) st - | TType_fun (d,r) -> + | TType_fun (d,r,_nullness) -> p_byte 3 st // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value p_ty2 isStructThisArgPos d st @@ -1593,7 +1593,7 @@ let _ = fill_u_ty (fun st -> | 0 -> let l = u_tys st in TType_tuple (tupInfoRef, l) | 1 -> u_simpletyp st | 2 -> let tc = u_tcref st in let tinst = u_tys st in TType_app (tc,tinst) - | 3 -> let d = u_ty st in let r = u_ty st in TType_fun (d,r) + | 3 -> let d = u_ty st in let r = u_ty st in TType_fun (d,r, AssumeNonNull) | 4 -> let r = u_tpref st in r.AsType | 5 -> let tps = u_tyar_specs st in let r = u_ty st in TType_forall (tps,r) | 6 -> let unt = u_measure_expr st in TType_measure unt diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index d6fb7cd3c73..706729abf7f 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -342,11 +342,13 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let v_system_Reflection_MethodInfo_ty = mkSysNonGenericTy ["System";"Reflection"] "MethodInfo" let v_nullable_tcr = findSysTyconRef sys "Nullable`1" + let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) + (* local helpers to build value infos *) let mkNullableTy ty = TType_app(v_nullable_tcr, [ty]) let mkByrefTy ty = TType_app(v_byref_tcr, [ty]) let mkNativePtrTy ty = TType_app(v_nativeptr_tcr, [ty]) - let mkFunTy d r = TType_fun (d, r) + let mkFunTy d r = TType_fun (d, r, NewNullnessVar()) let (-->) d r = mkFunTy d r let mkIteratedFunTy dl r = List.foldBack mkFunTy dl r let mkSmallRefTupledTy l = match l with [] -> v_unit_ty | [h] -> h | tys -> mkRawRefTupleTy tys diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index ecbeaf06b46..cce95a6a842 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -15640,7 +15640,7 @@ module EstablishTypeDefinitionCores = else acc - | TType_fun (d, r) -> + | TType_fun (d, r, _nullness) -> accInAbbrevType d (accInAbbrevType r acc) | TType_var _ -> acc diff --git a/src/fsharp/TypeRelations.fs b/src/fsharp/TypeRelations.fs index 43944d7a92f..929ea14fee8 100755 --- a/src/fsharp/TypeRelations.fs +++ b/src/fsharp/TypeRelations.fs @@ -42,7 +42,7 @@ let rec TypeDefinitelySubsumesTypeNoCoercion ndeep g amap m ty1 ty2 = | TType_tuple (tupInfo1,l1) ,TType_tuple (tupInfo2,l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (typeEquiv g) l1 l2 - | TType_fun (d1,r1) ,TType_fun (d2,r2) -> + | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> typeEquiv g d1 d2 && typeEquiv g r1 r2 | TType_measure measure1, TType_measure measure2 -> measureEquiv g measure1 measure2 @@ -78,7 +78,7 @@ let rec TypesFeasiblyEquiv ndeep g amap m ty1 ty2 = | TType_tuple (tupInfo1, l1) ,TType_tuple (tupInfo2, l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 - | TType_fun (d1,r1) ,TType_fun (d2,r2) -> + | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> (TypesFeasiblyEquiv ndeep g amap m) d1 d2 && (TypesFeasiblyEquiv ndeep g amap m) r1 r2 | TType_measure _, TType_measure _ -> true @@ -100,7 +100,7 @@ let rec TypeFeasiblySubsumesType ndeep g amap m ty1 canCoerce ty2 = | TType_tuple (tupInfo1,l1) ,TType_tuple (tupInfo2,l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 - | TType_fun (d1,r1) ,TType_fun (d2,r2) -> + | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> (TypesFeasiblyEquiv ndeep g amap m) d1 d2 && (TypesFeasiblyEquiv ndeep g amap m) r1 r2 | TType_measure _, TType_measure _ -> true diff --git a/src/fsharp/symbols/Symbols.fs b/src/fsharp/symbols/Symbols.fs index 00e3c6a303c..23a33439668 100644 --- a/src/fsharp/symbols/Symbols.fs +++ b/src/fsharp/symbols/Symbols.fs @@ -2029,12 +2029,28 @@ and FSharpType(cenv, ty:TType) = | TType_measure (Measure.Inv _) -> FSharpEntity(cenv, cenv.g.measureinverse_tcr) | _ -> invalidOp "not a named type" + member __.HasNullAnnotation = + protect <| fun () -> + match stripTyparEqns ty with + | TType_fun(_, _, nullness) -> match nullness.Evaluate() with WithNull -> true | _ -> false + | TType_app (_, _) -> false + | TType_tuple (_, _) -> false + | _ -> false + + member __.IsNullOblivious = + protect <| fun () -> + match stripTyparEqns ty with + | TType_fun(_, _, nullness) -> match nullness.Evaluate() with Oblivious -> true | _ -> false + | TType_app (_, _) -> false + | TType_tuple (_, _) -> false + | _ -> false + member __.GenericArguments = protect <| fun () -> match stripTyparEqns ty with | TType_app (_, tyargs) | TType_tuple (_, tyargs) -> (tyargs |> List.map (fun ty -> FSharpType(cenv, ty)) |> makeReadOnlyCollection) - | TType_fun(d, r) -> [| FSharpType(cenv, d); FSharpType(cenv, r) |] |> makeReadOnlyCollection + | TType_fun(d, r, _nullness) -> [| FSharpType(cenv, d); FSharpType(cenv, r) |] |> makeReadOnlyCollection | TType_measure (Measure.Con _) -> [| |] |> makeReadOnlyCollection | TType_measure (Measure.Prod (t1, t2)) -> [| FSharpType(cenv, TType_measure t1); FSharpType(cenv, TType_measure t2) |] |> makeReadOnlyCollection | TType_measure Measure.One -> [| |] |> makeReadOnlyCollection @@ -2115,7 +2131,7 @@ and FSharpType(cenv, ty:TType) = | TType_app (tc1, b1) -> 10200 + int32 tc1.Stamp + List.sumBy hashType b1 | TType_ucase _ -> 10300 // shouldn't occur in symbols | TType_tuple (_, l1) -> 10400 + List.sumBy hashType l1 - | TType_fun (dty, rty) -> 10500 + hashType dty + hashType rty + | TType_fun (dty, rty, _nullness) -> 10500 + hashType dty + hashType rty | TType_measure _ -> 10600 hashType ty diff --git a/src/fsharp/symbols/Symbols.fsi b/src/fsharp/symbols/Symbols.fsi index 7b7f565fdcf..25c40c7ce50 100644 --- a/src/fsharp/symbols/Symbols.fsi +++ b/src/fsharp/symbols/Symbols.fsi @@ -921,7 +921,13 @@ and [] public FSharpType = /// Get the type definition for a type member TypeDefinition : FSharpEntity - + + /// Indicates this type is known to have a null annotation + member HasNullAnnotation: bool + + /// Indicates this type is assumed to support the null value + member IsNullOblivious: bool + /// Get the generic arguments for a tuple type, a function type or a type constructed using a named entity member GenericArguments : IList diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 726d4d1ee04..e767d2a33ee 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -3898,6 +3898,45 @@ and override x.ToString() = x.FieldName +and Nullness = + | Known of NullnessInfo + | Variable of NullnessVar + member n.Evaluate() = + match n with + | Known info -> info + | Variable v -> v.Evaluate() + override n.ToString() = match n.Evaluate() with WithNull -> " | null" | WithoutNull -> "" | Oblivious -> " lol" + +and NullnessVar = + { mutable solution: Nullness option } + + member nv.Evaluate() = + match nv.solution with + | None -> WithoutNull + | Some soln -> soln.Evaluate() + + member nv.IsSolved = nv.solution.IsSome + + member nv.Set(nullness) = + assert (not nv.IsSolved) + nv.solution <- Some nullness + + member nv.Unset() = + assert nv.IsSolved + nv.solution <- None + + member nv.Solution = + assert nv.IsSolved + nv.solution.Value + +and NullnessInfo = + // we know that there is an extra null value in the type + | WithNull + // we know that there is no extra null value in the type + | WithoutNull + // we know we don't care + | Oblivious + and /// The algebra of types [] @@ -3921,7 +3960,7 @@ and /// TType_fun(domainType,rangeType). /// /// Indicates the type is a function type - | TType_fun of TType * TType + | TType_fun of TType * TType * Nullness /// TType_ucase(unionCaseRef, typeInstantiation) /// @@ -3943,7 +3982,7 @@ and | TType_forall (_tps, ty) -> ty.GetAssemblyName() | TType_app (tcref, _tinst) -> tcref.CompilationPath.ILScopeRef.QualifiedName | TType_tuple (_tupInfo, _tinst) -> "" - | TType_fun (_d,_r) -> "" + | TType_fun _ -> "" | TType_measure _ms -> "" | TType_var tp -> tp.Solution |> function Some sln -> sln.GetAssemblyName() | None -> "" | TType_ucase (_uc,_tinst) -> @@ -3962,7 +4001,7 @@ and | TupInfo.Const false -> "" | TupInfo.Const true -> "struct ") + String.concat "," (List.map string tinst) + ")" - | TType_fun (d,r) -> "(" + string d + " -> " + string r + ")" + | TType_fun (d,r,nullness) -> "(" + string d + " -> " + string r + ")" + nullness.ToString() | TType_ucase (uc,tinst) -> "ucase " + uc.CaseName + (match tinst with [] -> "" | tys -> "<" + String.concat "," (List.map string tys) + ">") | TType_var tp -> match tp.Solution with From c27665c74a66d60e46b11ac56adb8d36cd080aaf Mon Sep 17 00:00:00 2001 From: TIHan Date: Tue, 2 Oct 2018 14:44:44 -0700 Subject: [PATCH 002/137] Handling constraint solver nullness --- .../FSharp.Compiler.Private/FSComp.resx | 4 ++-- src/fsharp/CompileOps.fs | 17 ++++++++++++++++- src/fsharp/ConstraintSolver.fsi | 1 + 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index a56052a1e9d..be8589241b4 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -3082,7 +3082,7 @@ This number is outside the allowable range for 32-bit floats - This is not a valid numeric literal. Valid numeric literals include 1, 0x1, 0b0001 (int), 1u (uint32), 1L (int64), 1UL (uint64), 1s (int16), 1us (uint16), 1y (sbyte), 1uy (byte), 1.0 (float), 1.0f (float32), 1.0m (decimal), 1I (BigInteger). + This is not a valid numeric literal. Valid numeric literals include 1, 0x1, 0b0001 (int), 1u (uint32), 1L (int64), 1UL (uint64), 1s (int16), 1y (sbyte), 1uy (byte), 1.0 (float), 1.0f (float32), 1.0m (decimal), 1I (BigInteger). This is not a valid byte literal @@ -4360,4 +4360,4 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. - + \ No newline at end of file diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 3517d044284..4668758946b 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -193,7 +193,8 @@ let GetRangeOfDiagnostic(err:PhasedDiagnostic) = | NonRigidTypar(_, _, _, _, _, m) | ConstraintSolverTupleDiffLengths(_, _, _, m, _) | ConstraintSolverInfiniteTypes(_, _, _, _, m, _) - | ConstraintSolverMissingConstraint(_, _, _, m, _) + | ConstraintSolverMissingConstraint(_, _, _, m, _) + | ConstraintSolverNullnessWarning(_, _, _, m, _) | ConstraintSolverTypesNotInEqualityRelation(_, _, _, m, _, _) | ConstraintSolverError(_, m, _) | ConstraintSolverTypesNotInSubsumptionRelation(_, _, _, m, _) @@ -631,6 +632,20 @@ let OutputPhasedErrorR (os:StringBuilder) (err:PhasedDiagnostic) = if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore + | ConstraintSolverNullnessWarning(_denv, nullness, nullness2, m, m2) -> + + let msg = + // TODO: Put this in FSComp.SR. + match nullness, nullness2 with + | WithNull, WithoutNull -> "Expected the type to have null." + | WithoutNull, WithNull -> "Expected the type to not have null." + | _ -> String.Empty + + os.Append(msg) |> ignore + + if m.StartLine <> m2.StartLine then + os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore + | ConstraintSolverTypesNotInEqualityRelation(denv, (TType_measure _ as t1), (TType_measure _ as t2), m, m2, _) -> // REVIEW: consider if we need to show _cxs (the type parameter constraints) let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv t1 t2 diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi index e943d7be69a..def2488b9b2 100644 --- a/src/fsharp/ConstraintSolver.fsi +++ b/src/fsharp/ConstraintSolver.fsi @@ -81,6 +81,7 @@ exception ConstraintSolverInfiniteTypes of ContextInfo * Display exception ConstraintSolverTypesNotInEqualityRelation of DisplayEnv * TType * TType * range * range * ContextInfo exception ConstraintSolverTypesNotInSubsumptionRelation of DisplayEnv * TType * TType * range * range exception ConstraintSolverMissingConstraint of DisplayEnv * Typar * TyparConstraint * range * range +exception ConstraintSolverNullnessWarning of DisplayEnv * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverError of string * range * range exception ConstraintSolverRelatedInformation of string option * range * exn exception ErrorFromApplyingDefault of TcGlobals * DisplayEnv * Typar * TType * exn * range From 3e93242f574b13562fae30a6021a1eceb22bfa5f Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 12 Oct 2018 14:46:05 +0100 Subject: [PATCH 003/137] nullness on TType_app, in progress --- .../FSharp.Compiler.Private/FSComp.fs | 4 +- .../FSharp.Compiler.Private/FSComp.resx | 4 +- src/fsharp/ConstraintSolver.fs | 85 +++++--- src/fsharp/IlxGen.fs | 7 +- src/fsharp/NameResolution.fs | 2 +- src/fsharp/Optimizer.fs | 2 +- src/fsharp/PostInferenceChecks.fs | 2 +- src/fsharp/TastOps.fs | 190 +++++++++--------- src/fsharp/TastOps.fsi | 1 + src/fsharp/symbols/Symbols.fs | 18 +- src/fsharp/tast.fs | 27 ++- 11 files changed, 187 insertions(+), 155 deletions(-) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index f6fc5a409ea..23e20f9e770 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -3190,10 +3190,10 @@ type internal SR private() = /// This operation accesses a mutable top-level value defined in another assembly in an unsupported way. The value cannot be accessed through its address. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...', and if necessary assigning the value back after the completion of the operation /// (Originally from ..\FSComp.txt:1042) static member tastInvalidAddressOfMutableAcrossAssemblyBoundary() = (1188, GetStringFunc("tastInvalidAddressOfMutableAcrossAssemblyBoundary",",,,") ) - /// Type parameters must be placed directly adjacent to the type name, e.g. \"type C<'T>\", not type \"C <'T>\" + /// Remove spaces between the type name and type parameter, e.g. \"type C<'T>\", not type \"C <'T>\". Type parameters must be placed directly adjacent to the type name. /// (Originally from ..\FSComp.txt:1043) static member parsNonAdjacentTypars() = (1189, GetStringFunc("parsNonAdjacentTypars",",,,") ) - /// Type arguments must be placed directly adjacent to the type name, e.g. \"C<'T>\", not \"C <'T>\" + /// Remove spaces between the type name and type parameter, e.g. \"C<'T>\", not \"C <'T>\". Type parameters must be placed directly adjacent to the type name. /// (Originally from ..\FSComp.txt:1044) static member parsNonAdjacentTyargs() = (1190, GetStringFunc("parsNonAdjacentTyargs",",,,") ) /// The use of the type syntax 'int C' and 'C ' is not permitted here. Consider adjusting this type to be written in the form 'C' diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index be8589241b4..edc9a7bff8f 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -3193,10 +3193,10 @@ This operation accesses a mutable top-level value defined in another assembly in an unsupported way. The value cannot be accessed through its address. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...', and if necessary assigning the value back after the completion of the operation - Type parameters must be placed directly adjacent to the type name, e.g. \"type C<'T>\", not type \"C <'T>\" + Remove spaces between the type name and type parameter, e.g. \"type C<'T>\", not type \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - Type arguments must be placed directly adjacent to the type name, e.g. \"C<'T>\", not \"C <'T>\" + Remove spaces between the type name and type parameter, e.g. \"C<'T>\", not \"C <'T>\". Type parameters must be placed directly adjacent to the type name. The use of the type syntax 'int C' and 'C <int>' is not permitted here. Consider adjusting this type to be written in the form 'C<int>' diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 13aabd29745..82a09b5705d 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -83,7 +83,7 @@ let NewErrorMeasure () = Measure.Var (NewErrorMeasureVar ()) let NewByRefKindInferenceType (g: TcGlobals) m = let tp = NewTypar (TyparKind.Type, TyparRigidity.Flexible, Typar(compgenId, HeadTypeStaticReq, true), false, TyparDynamicReq.No, [], false, false) if g.byrefkind_InOut_tcr.CanDeref then - tp.SetConstraints [TyparConstraint.DefaultsTo(10, TType_app(g.byrefkind_InOut_tcr, []), m)] + tp.SetConstraints [TyparConstraint.DefaultsTo(10, TType_app(g.byrefkind_InOut_tcr, [], KnownNonNull), m)] mkTyparTy tp let NewInferenceTypes l = l |> List.map (fun _ -> NewInferenceType ()) @@ -227,7 +227,7 @@ let MakeConstraintSolverEnv contextInfo css m denv = let rec occursCheck g un ty = match stripTyEqns g ty with | TType_ucase(_, l) - | TType_app (_, l) + | TType_app (_, l, _) | TType_tuple (_, l) -> List.exists (occursCheck g un) l | TType_fun (d, r, _nullness) -> occursCheck g un d || occursCheck g un r | TType_var r -> typarEq un r @@ -576,7 +576,7 @@ let SimplifyMeasure g vars ms = let rec SimplifyMeasuresInType g resultFirst ((generalizable, generalized) as param) ty = match stripTyparEqns ty with | TType_ucase(_, l) - | TType_app (_, l) + | TType_app (_, l, _) | TType_tuple (_, l) -> SimplifyMeasuresInTypes g param l | TType_fun (d, r, _nullness) -> if resultFirst then SimplifyMeasuresInTypes g param [r;d] else SimplifyMeasuresInTypes g param [d;r] @@ -613,7 +613,7 @@ let rec SimplifyMeasuresInConstraints g param cs = let rec GetMeasureVarGcdInType v ty = match stripTyparEqns ty with | TType_ucase(_, l) - | TType_app (_, l) + | TType_app (_, l, _) | TType_tuple (_, l) -> GetMeasureVarGcdInTypes v l | TType_fun (d, r, _nullness) -> GcdRational (GetMeasureVarGcdInType v d) (GetMeasureVarGcdInType v r) @@ -786,16 +786,16 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) nul trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) CompleteD | _, Nullness.Variable nv2 when not nv2.IsSolved -> - trace.Exec (fun () -> nv2.Set nullness2) (fun () -> nv2.Unset()) + trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) CompleteD | Nullness.Variable nv1, _ -> SolveNullnessEquiv csenv m2 trace nv1.Solution nullness2 | _, Nullness.Variable nv2 -> SolveNullnessEquiv csenv m2 trace nullness1 nv2.Solution | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with - | Oblivious, _ -> CompleteD - | _, Oblivious -> CompleteD - | WithNull, WithNull -> CompleteD - | WithoutNull, WithoutNull -> CompleteD + | NullnessInfo.Oblivious, _ -> CompleteD + | _, NullnessInfo.Oblivious -> CompleteD + | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD + | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD | _, _ -> WarnD(ConstraintSolverNullnessWarning(csenv.DisplayEnv, n1, n2, csenv.m, m2)) and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) nullness1 nullness2 = @@ -812,12 +812,12 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona | _, Nullness.Variable nv2 -> SolveNullnessEquiv csenv m2 trace nullness1 nv2.Solution | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with - | Oblivious, _ -> CompleteD - | _, Oblivious -> CompleteD - | WithNull, WithNull -> CompleteD - | WithoutNull, WithoutNull -> CompleteD - | WithNull, WithoutNull -> CompleteD - | WithoutNull, WithNull -> + | NullnessInfo.Oblivious, _ -> CompleteD + | _, NullnessInfo.Oblivious -> CompleteD + | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD + | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD + | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD + | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> WarnD(ConstraintSolverNullnessWarning(csenv.DisplayEnv, n1, n2, csenv.m, m2)) /// Add the constraint "ty1 = ty2" to the constraint problem. @@ -850,21 +850,34 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra | _, TType_var r when (r.Rigidity <> TyparRigidity.Rigid) && not csenv.MatchingOnly -> SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 // Catch float<_>=float<1>, float32<_>=float32<1> and decimal<_>=decimal<1> - | (_, TType_app (tc2, [ms])) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty1 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms])) - -> SolveTypeEqualsType csenv ndeep m2 trace None ms (TType_measure Measure.One) - | (TType_app (tc2, [ms]), _) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty2 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms])) - -> SolveTypeEqualsType csenv ndeep m2 trace None ms (TType_measure Measure.One) + | (_, TType_app (tc2, [ms2], nullness2)) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty1 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms2])) -> + SolveTypeEqualsType csenv ndeep m2 trace None (TType_measure Measure.One) ms2 ++ (fun () -> + SolveNullnessSubsumesNullness csenv m2 trace (nullnessOfTy g sty1) nullness2 + ) + + | (TType_app (tc1, [ms1], nullness1), _) when (tc1.IsMeasureableReprTycon && typeEquiv csenv.g sty2 (reduceTyconRefMeasureableOrProvided csenv.g tc1 [ms1])) -> + SolveTypeEqualsType csenv ndeep m2 trace None ms1 (TType_measure Measure.One) ++ (fun () -> + SolveNullnessSubsumesNullness csenv m2 trace nullness1 (nullnessOfTy g sty2) + ) + + | TType_app (tc1, l1, nullness1), TType_app (tc2, l2, nullness2) when tyconRefEq g tc1 tc2 -> + SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 ++ (fun () -> + SolveNullnessEquiv csenv m2 trace nullness1 nullness2 + ) + + | TType_app _, TType_app _ -> localAbortD - | TType_app (tc1, l1) , TType_app (tc2, l2) when tyconRefEq g tc1 tc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 - | TType_app (_, _) , TType_app (_, _) -> localAbortD | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> if evalTupInfoIsStruct tupInfo1 <> evalTupInfoIsStruct tupInfo2 then ErrorD (ConstraintSolverError(FSComp.SR.tcTupleStructMismatch(), csenv.m, m2)) else SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 + | TType_fun (d1, r1, nullness1) , TType_fun (d2, r2, nullness2) -> SolveFunTypeEqn csenv ndeep m2 trace None d1 d2 r1 r2 ++ (fun () -> SolveNullnessEquiv csenv m2 trace nullness1 nullness2 ) + | TType_measure ms1 , TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 + | TType_forall(tps1, rty1), TType_forall(tps2, rty2) -> if tps1.Length <> tps2.Length then localAbortD else let aenv = aenv.BindEquivTypars tps1 tps2 @@ -873,6 +886,7 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra SolveTypeEqualsTypeKeepAbbrevs csenv ndeep m2 trace rty1 rty2 | TType_ucase (uc1, l1) , TType_ucase (uc2, l2) when g.unionCaseRefEq uc1 uc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 + | _ -> localAbortD @@ -943,25 +957,32 @@ and SolveTypeSubsumesType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalT | TType_measure ms1, TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 // Enforce the identities float=float<1>, float32=float32<1> and decimal=decimal<1> - | (_, TType_app (tc2, [ms])) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty1 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms])) - -> SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ms (TType_measure Measure.One) - | (TType_app (tc2, [ms]), _) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty2 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms])) - -> SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ms (TType_measure Measure.One) + | (_, TType_app (tc2, [ms2], nullness2)) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty1 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms2])) -> + SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ms2 (TType_measure Measure.One) ++ (fun () -> + SolveNullnessSubsumesNullness csenv m2 trace sty1.Nullness nullness2 + ) + + | (TType_app (tc1, [ms1], nullness1), _) when (tc1.IsMeasureableReprTycon && typeEquiv csenv.g sty2 (reduceTyconRefMeasureableOrProvided csenv.g tc1 [ms1])) -> + SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ms1 (TType_measure Measure.One) ++ (fun () -> + SolveNullnessSubsumesNullness csenv m2 trace nullness1 sty2.Nullness + ) // Special subsumption rule for byref tags - | TType_app (tc1, l1) , TType_app (tc2, l2) when tyconRefEq g tc1 tc2 && g.byref2_tcr.CanDeref && tyconRefEq g g.byref2_tcr tc1 -> + | TType_app (tc1, l1, _nullness1) , TType_app (tc2, l2, _nullness2) when tyconRefEq g tc1 tc2 && g.byref2_tcr.CanDeref && tyconRefEq g g.byref2_tcr tc1 -> match l1, l2 with | [ h1; tag1 ], [ h2; tag2 ] -> SolveTypeEqualsType csenv ndeep m2 trace None h1 h2 ++ (fun () -> match stripTyEqnsA csenv.g canShortcut tag1, stripTyEqnsA csenv.g canShortcut tag2 with - | TType_app(tagc1, []), TType_app(tagc2, []) + | TType_app(tagc1, [], _), TType_app(tagc2, [], _) when (tyconRefEq g tagc2 g.byrefkind_InOut_tcr && (tyconRefEq g tagc1 g.byrefkind_In_tcr || tyconRefEq g tagc1 g.byrefkind_Out_tcr) ) -> CompleteD | _ -> SolveTypeEqualsType csenv ndeep m2 trace cxsln tag1 tag2) | _ -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 - | TType_app (tc1, l1) , TType_app (tc2, l2) when tyconRefEq g tc1 tc2 -> - SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 + | TType_app (tc1, l1, nullness1) , TType_app (tc2, l2, nullness2) when tyconRefEq g tc1 tc2 -> + SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 ++ (fun () -> + SolveNullnessSubsumesNullness csenv m2 trace nullness1 nullness2 + ) | TType_ucase (uc1, l1) , TType_ucase (uc2, l2) when g.unionCaseRefEq uc1 uc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 @@ -1744,9 +1765,9 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio | Nullness.Variable nv -> SolveNullnessSupportsNull csenv ndeep m2 trace nv.Solution | Nullness.Known n1 -> match n1 with - | Oblivious -> CompleteD - | WithNull -> CompleteD - | WithoutNull -> WarnD(ConstraintSolverNullnessWarning(denv, n1, WithoutNull, m, m2)) + | NullnessInfo.Oblivious -> CompleteD + | NullnessInfo.WithNull -> CompleteD + | NullnessInfo.WithoutNull -> WarnD(ConstraintSolverNullnessWarning(denv, n1, NullnessInfo.WithoutNull, m, m2)) and SolveTypeSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let g = csenv.g diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs index 9faaed9e38c..b4bd878bd1d 100644 --- a/src/fsharp/IlxGen.fs +++ b/src/fsharp/IlxGen.fs @@ -106,7 +106,7 @@ let mainMethName = CompilerGeneratedName "main" type AttributeDecoder(namedArgs) = let nameMap = namedArgs |> List.map (fun (AttribNamedArg(s,_,_,c)) -> s,c) |> NameMap.ofList let findConst x = match NameMap.tryFind x nameMap with | Some(AttribExpr(_,Expr.Const(c,_,_))) -> Some c | _ -> None - let findAppTr x = match NameMap.tryFind x nameMap with | Some(AttribExpr(_,Expr.App(_,_,[TType_app(tr,_)],_,_))) -> Some tr | _ -> None + let findAppTr x = match NameMap.tryFind x nameMap with | Some(AttribExpr(_,Expr.App(_,_,[TType_app(tr,_,_)],_,_))) -> Some tr | _ -> None member self.FindInt16 x dflt = match findConst x with | Some(Const.Int16 x) -> x | _ -> dflt member self.FindInt32 x dflt = match findConst x with | Some(Const.Int32 x) -> x | _ -> dflt @@ -433,8 +433,7 @@ and GenTypeAux amap m (tyenv: TypeReprEnv) voidOK ptrsOK ty = ignore voidOK #endif match stripTyEqnsAndMeasureEqns g ty with - | TType_app (tcref, tinst) -> GenNamedTyAppAux amap m tyenv ptrsOK tcref tinst - + | TType_app (tcref, tinst, _nullness) -> GenNamedTyAppAux amap m tyenv ptrsOK tcref tinst | TType_tuple (tupInfo, args) -> GenTypeAux amap m tyenv VoidNotOK ptrsOK (mkCompiledTupleTy g (evalTupInfoIsStruct tupInfo) args) @@ -5472,7 +5471,7 @@ and GenBindingRhs cenv cgbuf eenv sp (vspec:Val) e = (match StorageForVal vspec.Range vspec eenv with Local _ -> true | _ -> false) && (isLocalTypeFunc || (match ttype with - TType_var(typar) -> match typar.Solution with Some(TType_app(t,_))-> t.IsStructOrEnumTycon | _ -> false + TType_var(typar) -> match typar.Solution with Some(TType_app(t,_,_))-> t.IsStructOrEnumTycon | _ -> false | _ -> false)) ) -> // type lambda with erased type arguments that is stored as local variable (not method or property)- inline body diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs index 28e6830c8eb..87efa346952 100644 --- a/src/fsharp/NameResolution.fs +++ b/src/fsharp/NameResolution.fs @@ -116,7 +116,7 @@ let ActivePatternElemsOfModuleOrNamespace (modref:ModuleOrNamespaceRef) : NameMa /// When reporting symbols, we care about abbreviations, e.g. 'int' and 'int32' count as two separate symbols let (|AbbrevOrAppTy|_|) (ty: TType) = match stripTyparEqns ty with - | TType_app (tcref,_) -> Some tcref + | TType_app (tcref, _, _) -> Some tcref | _ -> None [] diff --git a/src/fsharp/Optimizer.fs b/src/fsharp/Optimizer.fs index 043e9e4747f..a6937f36fea 100644 --- a/src/fsharp/Optimizer.fs +++ b/src/fsharp/Optimizer.fs @@ -1745,7 +1745,7 @@ let TryDetectQueryQuoteAndRun cenv (expr:Expr) = let resultExprAfterConvertToResultTy = match reqdResultInfo, exprIsEnumerableInfo with | Some _, Some _ | None, None -> resultExpr // the expression is a QuerySource, the result is a QuerySource, nothing to do - | Some resultElemTy, None -> mkCallGetQuerySourceAsEnumerable cenv.g expr.Range resultElemTy (TType_app(cenv.g.tcref_System_Collections_IEnumerable, [])) resultExpr + | Some resultElemTy, None -> mkCallGetQuerySourceAsEnumerable cenv.g expr.Range resultElemTy (TType_app(cenv.g.tcref_System_Collections_IEnumerable, [], KnownNonNull)) resultExpr | None, Some (resultElemTy, qTy) -> mkCallNewQuerySource cenv.g expr.Range resultElemTy qTy resultExpr Some resultExprAfterConvertToResultTy | None -> diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index 7cea12eeaff..dc572c36f0c 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -330,7 +330,7 @@ let rec CheckTypeDeep ((visitTy,visitTyconRefOpt,visitAppTyOpt,visitTraitSolutio tps |> List.iter (fun tp -> tp.Constraints |> List.iter (CheckTypeConstraintDeep f g env)) | TType_measure _ -> () - | TType_app (tcref,tinst) -> + | TType_app (tcref,tinst,_nullness) -> match visitTyconRefOpt with | Some visitTyconRef -> visitTyconRef isInner tcref | None -> () diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index 5c599d482bf..e7835d3fc4c 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -164,9 +164,9 @@ let rec remapTypeAux (tyenv : Remap) (ty:TType) = let ty = stripTyparEqns ty match ty with | TType_var tp as ty -> instTyparRef tyenv.tpinst ty tp - | TType_app (tcr, tinst) as ty -> + | TType_app (tcr, tinst, nullness) as ty -> match tyenv.tyconRefRemap.TryFind tcr with - | Some tcr' -> TType_app (tcr', remapTypesAux tyenv tinst) + | Some tcr' -> TType_app (tcr', remapTypesAux tyenv tinst, nullness) | None -> match tinst with | [] -> ty // optimization to avoid re-allocation of TType_app node in the common case @@ -174,7 +174,7 @@ let rec remapTypeAux (tyenv : Remap) (ty:TType) = // avoid reallocation on idempotent let tinst' = remapTypesAux tyenv tinst if tinst === tinst' then ty else - TType_app (tcr, tinst') + TType_app (tcr, tinst', nullness) | TType_ucase (UCRef(tcr, n), tinst) -> match tyenv.tyconRefRemap.TryFind tcr with @@ -560,23 +560,28 @@ let tryNormalizeMeasureInType g ty = // Some basic type builders //--------------------------------------------------------------------------- +let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) +let KnownNull = Nullness.Known NullnessInfo.WithNull +let KnownNonNull = Nullness.Known NullnessInfo.WithoutNull +let AssumeNonNull = KnownNonNull + let mkNativePtrTy (g:TcGlobals) ty = assert g.nativeptr_tcr.CanDeref // this should always be available, but check anyway - TType_app (g.nativeptr_tcr, [ty]) + TType_app (g.nativeptr_tcr, [ty], KnownNonNull) let mkByrefTy (g:TcGlobals) ty = assert g.byref_tcr.CanDeref // this should always be available, but check anyway - TType_app (g.byref_tcr, [ty]) + TType_app (g.byref_tcr, [ty], KnownNonNull) let mkInByrefTy (g:TcGlobals) ty = if g.inref_tcr.CanDeref then // If not using sufficient FSharp.Core, then inref = byref, see RFC FS-1053.md - TType_app (g.inref_tcr, [ty]) + TType_app (g.inref_tcr, [ty], KnownNonNull) else mkByrefTy g ty let mkOutByrefTy (g:TcGlobals) ty = if g.outref_tcr.CanDeref then // If not using sufficient FSharp.Core, then outref = byref, see RFC FS-1053.md - TType_app (g.outref_tcr, [ty]) + TType_app (g.outref_tcr, [ty], KnownNonNull) else mkByrefTy g ty @@ -588,24 +593,24 @@ let mkByrefTyWithFlag g readonly ty = let mkByref2Ty (g:TcGlobals) ty1 ty2 = assert g.byref2_tcr.CanDeref // check we are using sufficient FSharp.Core, caller should check this - TType_app (g.byref2_tcr, [ty1; ty2]) + TType_app (g.byref2_tcr, [ty1; ty2], KnownNonNull) let mkVoidPtrTy (g:TcGlobals) = assert g.voidptr_tcr.CanDeref // check we are using sufficient FSharp.Core , caller should check this - TType_app (g.voidptr_tcr, []) + TType_app (g.voidptr_tcr, [], KnownNonNull) let mkByrefTyWithInference (g:TcGlobals) ty1 ty2 = if g.byref2_tcr.CanDeref then // If not using sufficient FSharp.Core, then inref = byref, see RFC FS-1053.md - TType_app (g.byref2_tcr, [ty1; ty2]) + TType_app (g.byref2_tcr, [ty1; ty2], KnownNonNull) else - TType_app (g.byref_tcr, [ty1]) + TType_app (g.byref_tcr, [ty1], KnownNonNull) let mkArrayTy (g:TcGlobals) rank ty m = if rank < 1 || rank > 32 then errorR(Error(FSComp.SR.tastopsMaxArrayThirtyTwo(rank), m)) - TType_app (g.il_arr_tcr_map.[3], [ty]) + TType_app (g.il_arr_tcr_map.[3], [ty], KnownNonNull) else - TType_app (g.il_arr_tcr_map.[rank - 1], [ty]) + TType_app (g.il_arr_tcr_map.[rank - 1], [ty], KnownNonNull) //-------------------------------------------------------------------------- // Tuple compilation (types) @@ -647,16 +652,16 @@ let mkCompiledTupleTyconRef (g:TcGlobals) isStruct n = let rec mkCompiledTupleTy g isStruct tupElemTys = let n = List.length tupElemTys if n < maxTuple then - TType_app (mkCompiledTupleTyconRef g isStruct n, tupElemTys) + TType_app (mkCompiledTupleTyconRef g isStruct n, tupElemTys, KnownNonNull) else let tysA, tysB = List.splitAfter goodTupleFields tupElemTys - TType_app ((if isStruct then g.struct_tuple8_tcr else g.ref_tuple8_tcr), tysA@[mkCompiledTupleTy g isStruct tysB]) + TType_app ((if isStruct then g.struct_tuple8_tcr else g.ref_tuple8_tcr), tysA@[mkCompiledTupleTy g isStruct tysB], KnownNonNull) /// Convert from F# tuple types to .NET tuple types, but only the outermost level let mkOuterCompiledTupleTy g isStruct tupElemTys = let n = List.length tupElemTys if n < maxTuple then - TType_app (mkCompiledTupleTyconRef g isStruct n, tupElemTys) + TType_app (mkCompiledTupleTyconRef g isStruct n, tupElemTys, KnownNonNull) else let tysA, tysB = List.splitAfter goodTupleFields tupElemTys let tcref = (if isStruct then g.struct_tuple8_tcr else g.ref_tuple8_tcr) @@ -664,10 +669,10 @@ let mkOuterCompiledTupleTy g isStruct tupElemTys = // as a regular F# tuple type. match tysB with | [ tyB ] -> - let marker = TType_app (mkCompiledTupleTyconRef g isStruct 1, [tyB]) - TType_app (tcref, tysA@[marker]) + let marker = TType_app (mkCompiledTupleTyconRef g isStruct 1, [tyB], KnownNonNull) + TType_app (tcref, tysA@[marker], KnownNonNull) | _ -> - TType_app (tcref, tysA@[TType_tuple (TupInfo.Const isStruct, tysB)]) + TType_app (tcref, tysA@[TType_tuple (TupInfo.Const isStruct, tysB)], KnownNonNull) //--------------------------------------------------------------------------- // Remove inference equations and abbreviations from types @@ -706,7 +711,7 @@ let reduceTyconRefMeasureableOrProvided (g:TcGlobals) (tcref:TyconRef) tyargs = let rec stripTyEqnsA g canShortcut ty = let ty = stripTyparEqnsAux canShortcut ty match ty with - | TType_app (tcref, tinst) -> + | TType_app (tcref, tinst, _nullness) -> // TODO: what happens to this nullness? Currently it is lost. Noted in RFC let tycon = tcref.Deref match tycon.TypeAbbrev with | Some abbrevTy -> @@ -718,7 +723,7 @@ let rec stripTyEqnsA g canShortcut ty = // Add the equation byref<'T> = byref<'T, ByRefKinds.InOut> for when using sufficient FSharp.Core // See RFC FS-1053.md if tyconRefEq g tcref g.byref_tcr && g.byref2_tcr.CanDeref && g.byrefkind_InOut_tcr.CanDeref then - mkByref2Ty g tinst.[0] (TType_app(g.byrefkind_InOut_tcr, [])) + mkByref2Ty g tinst.[0] (TType_app(g.byrefkind_InOut_tcr, [], KnownNonNull)) // Add the equation double<1> = double for units of measure. elif tycon.IsMeasureableReprTycon && List.forall (isDimensionless g) tinst then @@ -740,7 +745,7 @@ let evalTupInfoIsStruct aexpr = let rec stripTyEqnsAndErase eraseFuncAndTuple (g:TcGlobals) ty = let ty = stripTyEqns g ty match ty with - | TType_app (tcref, args) -> + | TType_app (tcref, args, _nullness) -> // TODO: what happens to this nullness? Currently it is lost. Noted in RFC let tycon = tcref.Deref if tycon.IsErased then stripTyEqnsAndErase eraseFuncAndTuple g (reduceTyconMeasureableOrProvided g tycon args) @@ -748,7 +753,7 @@ let rec stripTyEqnsAndErase eraseFuncAndTuple (g:TcGlobals) ty = stripTyEqnsAndErase eraseFuncAndTuple g g.nativeint_ty else ty - | TType_fun(a, b, _nullness) when eraseFuncAndTuple -> TType_app(g.fastFunc_tcr, [ a; b] (* , nullness *) ) + | TType_fun(a, b, nullness) when eraseFuncAndTuple -> TType_app(g.fastFunc_tcr, [ a; b], nullness) | TType_tuple(tupInfo, l) when eraseFuncAndTuple -> mkCompiledTupleTy g (evalTupInfoIsStruct tupInfo) l | ty -> ty @@ -783,12 +788,12 @@ let isForallTy g ty = ty |> stripTyEqns g |> (function TType_forall _ -> tru let isAnyTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple _ -> true | _ -> false) let isRefTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple (tupInfo, _) -> not (evalTupInfoIsStruct tupInfo) | _ -> false) let isStructTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple (tupInfo, _) -> evalTupInfoIsStruct tupInfo | _ -> false) -let isUnionTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _) -> tcr.IsUnionTycon | _ -> false) -let isReprHiddenTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _) -> tcr.IsHiddenReprTycon | _ -> false) -let isFSharpObjModelTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _) -> tcr.IsFSharpObjectModelTycon | _ -> false) -let isRecdTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _) -> tcr.IsRecordTycon | _ -> false) -let isFSharpStructOrEnumTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _) -> tcr.IsFSharpStructOrEnumTycon | _ -> false) -let isFSharpEnumTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _) -> tcr.IsFSharpEnumTycon | _ -> false) +let isUnionTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _, _) -> tcr.IsUnionTycon | _ -> false) +let isReprHiddenTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _, _) -> tcr.IsHiddenReprTycon | _ -> false) +let isFSharpObjModelTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _, _) -> tcr.IsFSharpObjectModelTycon | _ -> false) +let isRecdTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _, _) -> tcr.IsRecordTycon | _ -> false) +let isFSharpStructOrEnumTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _, _) -> tcr.IsFSharpStructOrEnumTycon | _ -> false) +let isFSharpEnumTy g ty = ty |> stripTyEqns g |> (function TType_app(tcr, _, _) -> tcr.IsFSharpEnumTycon | _ -> false) let isTyparTy g ty = ty |> stripTyEqns g |> (function TType_var _ -> true | _ -> false) let isAnyParTy g ty = ty |> stripTyEqns g |> (function TType_var _ -> true | TType_measure unt -> isUnitParMeasure g unt | _ -> false) let isMeasureTy g ty = ty |> stripTyEqns g |> (function TType_measure _ -> true | _ -> false) @@ -796,34 +801,35 @@ let isMeasureTy g ty = ty |> stripTyEqns g |> (function TType_measure _ -> tr let isProvenUnionCaseTy ty = match ty with TType_ucase _ -> true | _ -> false -let mkAppTy tcref tyargs = TType_app(tcref, tyargs) +let mkAppTy tcref tyargs = TType_app(tcref, tyargs, KnownNonNull) // TODO let mkProvenUnionCaseTy ucref tyargs = TType_ucase(ucref, tyargs) let isAppTy g ty = ty |> stripTyEqns g |> (function TType_app _ -> true | _ -> false) -let tryAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst) -> ValueSome (tcref, tinst) | _ -> ValueNone) -let destAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst) -> tcref, tinst | _ -> failwith "destAppTy") -let tcrefOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tcref | _ -> failwith "tcrefOfAppTy") -let argsOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(_, tinst) -> tinst | _ -> []) +let tryAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> ValueSome (tcref, tinst) | _ -> ValueNone) +let destAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> tcref, tinst | _ -> failwith "destAppTy") +let tcrefOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tcref | _ -> failwith "tcrefOfAppTy") +let nullnessOfTy g ty = ty |> stripTyEqns g |> (function TType_app(_, _, nullness) | TType_fun (_, _, nullness) -> nullness | _ -> failwith "nullnessOfTy") +let argsOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(_, tinst, _) -> tinst | _ -> []) let tryDestTyparTy g ty = ty |> stripTyEqns g |> (function TType_var v -> ValueSome v | _ -> ValueNone) let tryDestFunTy g ty = ty |> stripTyEqns g |> (function TType_fun (tyv, tau, _nullness) -> ValueSome(tyv, tau) | _ -> ValueNone) -let tryDestAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> ValueSome tcref | _ -> ValueNone) +let tryDestAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> ValueSome tcref | _ -> ValueNone) let tryAnyParTy g ty = ty |> stripTyEqns g |> (function TType_var v -> ValueSome v | TType_measure unt when isUnitParMeasure g unt -> ValueSome(destUnitParMeasure g unt) | _ -> ValueNone) let tryAnyParTyOption g ty = ty |> stripTyEqns g |> (function TType_var v -> Some v | TType_measure unt when isUnitParMeasure g unt -> Some(destUnitParMeasure g unt) | _ -> None) -let (|AppTy|_|) g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst) -> Some (tcref, tinst) | _ -> None) +let (|AppTy|_|) g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> Some (tcref, tinst) | _ -> None) let (|RefTupleTy|_|) g ty = ty |> stripTyEqns g |> (function TType_tuple(tupInfo, tys) when not (evalTupInfoIsStruct tupInfo) -> Some tys | _ -> None) let (|FunTy|_|) g ty = ty |> stripTyEqns g |> (function TType_fun(dty, rty, _nullness) -> Some (dty, rty) | _ -> None) let tryNiceEntityRefOfTy ty = let ty = stripTyparEqnsAux false ty match ty with - | TType_app (tcref, _) -> ValueSome tcref + | TType_app (tcref, _, _) -> ValueSome tcref | TType_measure (Measure.Con tcref) -> ValueSome tcref | _ -> ValueNone let tryNiceEntityRefOfTyOption ty = let ty = stripTyparEqnsAux false ty match ty with - | TType_app (tcref, _) -> Some tcref + | TType_app (tcref, _, _) -> Some tcref | TType_measure (Measure.Con tcref) -> Some tcref | _ -> None @@ -957,7 +963,7 @@ and typeAEquivAux erasureFlag g aenv ty1 ty2 = match aenv.EquivTypars.TryFind tp1 with | Some v -> typeEquivAux erasureFlag g v ty2 | None -> false - | TType_app (tc1, b1) , TType_app (tc2, b2) -> + | TType_app (tc1, b1, _nullness1) , TType_app (tc2, b2, _nullness2) -> tcrefAEquiv g aenv tc1 tc2 && typesAEquivAux erasureFlag g aenv b1 b2 | TType_ucase (UCRef(tc1, n1), b1) , TType_ucase (UCRef(tc2, n2), b2) -> @@ -1007,7 +1013,7 @@ let measureEquiv g m1 m2 = measureAEquiv g TypeEquivEnv.Empty m1 m2 let isErasedType g ty = match stripTyEqns g ty with #if !NO_EXTENSIONTYPING - | TType_app (tcref, _) -> tcref.IsProvidedErasedTycon + | TType_app (tcref, _, _) -> tcref.IsProvidedErasedTycon #endif | _ -> false @@ -1020,11 +1026,15 @@ let rec getErasedTypes g ty = getErasedTypes g rty | TType_var tp -> if tp.IsErased then [ty] else [] - | TType_app (_, b) | TType_ucase(_, b) | TType_tuple (_, b) -> + | TType_app (_, b, nullness) -> + match nullness.Evaluate() with + | NullnessInfo.WithNull -> [ty] + | _ -> List.foldBack (fun ty tys -> getErasedTypes g ty @ tys) b [] + | TType_ucase(_, b) | TType_tuple (_, b) -> List.foldBack (fun ty tys -> getErasedTypes g ty @ tys) b [] | TType_fun (dty, rty, nullness) -> match nullness.Evaluate() with - | WithNull -> [ty] + | NullnessInfo.WithNull -> [ty] | _ -> getErasedTypes g dty @ getErasedTypes g rty | TType_measure _ -> [ty] @@ -1054,10 +1064,6 @@ let unionCaseRefOrder = // Make some common types //--------------------------------------------------------------------------- -let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) -let KnownNull = Nullness.Known WithNull -let KnownNonNull = Nullness.Known WithoutNull -let AssumeNonNull = KnownNonNull let mkFunTy d r = TType_fun (d, r, NewNullnessVar()) let (-->) d r = mkFunTy d r let mkForallTy d r = TType_forall (d, r) @@ -1596,36 +1602,36 @@ let tyconRefEqOpt g tcOpt tc = | None -> false | Some tc2 -> tyconRefEq g tc2 tc -let isStringTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tyconRefEq g tcref g.system_String_tcref | _ -> false) -let isListTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tyconRefEq g tcref g.list_tcr_canon | _ -> false) -let isArrayTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> isArrayTyconRef g tcref | _ -> false) -let isArray1DTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tyconRefEq g tcref g.il_arr_tcr_map.[0] | _ -> false) -let isUnitTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tyconRefEq g g.unit_tcr_canon tcref | _ -> false) -let isObjTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tyconRefEq g g.system_Object_tcref tcref | _ -> false) -let isVoidTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tyconRefEq g g.system_Void_tcref tcref | _ -> false) -let isILAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tcref.IsILTycon | _ -> false) -let isNativePtrTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tyconRefEq g g.nativeptr_tcr tcref | _ -> false) +let isStringTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tyconRefEq g tcref g.system_String_tcref | _ -> false) +let isListTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tyconRefEq g tcref g.list_tcr_canon | _ -> false) +let isArrayTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> isArrayTyconRef g tcref | _ -> false) +let isArray1DTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tyconRefEq g tcref g.il_arr_tcr_map.[0] | _ -> false) +let isUnitTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tyconRefEq g g.unit_tcr_canon tcref | _ -> false) +let isObjTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tyconRefEq g g.system_Object_tcref tcref | _ -> false) +let isVoidTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tyconRefEq g g.system_Void_tcref tcref | _ -> false) +let isILAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tcref.IsILTycon | _ -> false) +let isNativePtrTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tyconRefEq g g.nativeptr_tcr tcref | _ -> false) let isByrefTy g ty = ty |> stripTyEqns g |> (function - | TType_app(tcref, _) when g.byref2_tcr.CanDeref -> tyconRefEq g g.byref2_tcr tcref - | TType_app(tcref, _) -> tyconRefEq g g.byref_tcr tcref + | TType_app(tcref, _, _) when g.byref2_tcr.CanDeref -> tyconRefEq g g.byref2_tcr tcref + | TType_app(tcref, _, _) -> tyconRefEq g g.byref_tcr tcref | _ -> false) -let isInByrefTag g ty = ty |> stripTyEqns g |> (function TType_app(tcref, []) -> tyconRefEq g g.byrefkind_In_tcr tcref | _ -> false) +let isInByrefTag g ty = ty |> stripTyEqns g |> (function TType_app(tcref, [], _) -> tyconRefEq g g.byrefkind_In_tcr tcref | _ -> false) let isInByrefTy g ty = ty |> stripTyEqns g |> (function - | TType_app(tcref, [_; tag]) when g.byref2_tcr.CanDeref -> tyconRefEq g g.byref2_tcr tcref && isInByrefTag g tag + | TType_app(tcref, [_; tag], _) when g.byref2_tcr.CanDeref -> tyconRefEq g g.byref2_tcr tcref && isInByrefTag g tag | _ -> false) -let isOutByrefTag g ty = ty |> stripTyEqns g |> (function TType_app(tcref, []) -> tyconRefEq g g.byrefkind_Out_tcr tcref | _ -> false) +let isOutByrefTag g ty = ty |> stripTyEqns g |> (function TType_app(tcref, [], _) -> tyconRefEq g g.byrefkind_Out_tcr tcref | _ -> false) let isOutByrefTy g ty = ty |> stripTyEqns g |> (function - | TType_app(tcref, [_; tag]) when g.byref2_tcr.CanDeref -> tyconRefEq g g.byref2_tcr tcref && isOutByrefTag g tag + | TType_app(tcref, [_; tag], _) when g.byref2_tcr.CanDeref -> tyconRefEq g g.byref2_tcr tcref && isOutByrefTag g tag | _ -> false) #if !NO_EXTENSIONTYPING -let extensionInfoOfTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _) -> tcref.TypeReprInfo | _ -> TNoRepr) +let extensionInfoOfTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tcref.TypeReprInfo | _ -> TNoRepr) #endif type TypeDefMetadata = @@ -2050,7 +2056,7 @@ and accFreeTyparRef opts (tp:Typar) acc = and accFreeInType opts ty acc = match stripTyparEqns ty with | TType_tuple (tupInfo, l) -> accFreeInTypes opts l (accFreeInTupInfo opts tupInfo acc) - | TType_app (tc, tinst) -> + | TType_app (tc, tinst, _nullness) -> let acc = accFreeTycon opts tc acc match tinst with | [] -> acc // optimization to avoid unneeded call @@ -2144,7 +2150,7 @@ and accFreeInTypeLeftToRight g cxFlag thruFlag acc ty = | TType_tuple (tupInfo, l) -> let acc = accFreeInTupInfoLeftToRight g cxFlag thruFlag acc tupInfo accFreeInTypesLeftToRight g cxFlag thruFlag acc l - | TType_app (_, tinst) -> accFreeInTypesLeftToRight g cxFlag thruFlag acc tinst + | TType_app (_, tinst, _nullness) -> accFreeInTypesLeftToRight g cxFlag thruFlag acc tinst | TType_ucase (_, tinst) -> accFreeInTypesLeftToRight g cxFlag thruFlag acc tinst | TType_fun (d, r, _nullness) -> accFreeInTypeLeftToRight g cxFlag thruFlag (accFreeInTypeLeftToRight g cxFlag thruFlag acc d ) r | TType_var r -> accFreeTyparRefLeftToRight g cxFlag thruFlag acc r @@ -2334,9 +2340,9 @@ let generalTyconRefInst (tc:TyconRef) = generalizeTypars tc.TyparsNoRange let generalizeTyconRef tc = let tinst = generalTyconRefInst tc - tinst, TType_app(tc, tinst) + tinst, TType_app(tc, tinst, KnownNonNull) // TODO: check me -let generalizedTyconRef tc = TType_app(tc, generalTyconRefInst tc) +let generalizedTyconRef tc = TType_app(tc, generalTyconRefInst tc, KnownNonNull) let isTTyparSupportsStaticMethod = function TyparConstraint.MayResolveMember _ -> true | _ -> false let isTTyparCoercesToType = function TyparConstraint.CoercesTo _ -> true | _ -> false @@ -2533,7 +2539,7 @@ module SimplifyTypes = let z = f z ty match ty with | TType_forall (_, body) -> foldTypeButNotConstraints f z body - | TType_app (_, tinst) -> List.fold (foldTypeButNotConstraints f) z tinst + | TType_app (_, tinst, _nullness) -> List.fold (foldTypeButNotConstraints f) z tinst | TType_ucase (_, tinst) -> List.fold (foldTypeButNotConstraints f) z tinst | TType_tuple (_, tys) -> List.fold (foldTypeButNotConstraints f) z tys | TType_fun (s, t, _nullness) -> foldTypeButNotConstraints f (foldTypeButNotConstraints f z s) t @@ -2976,7 +2982,7 @@ let isSpanLikeTyconRef g m tcref = not (isByrefTyconRef g tcref) let isByrefLikeTy g m ty = - ty |> stripTyEqns g |> (function TType_app(tcref, _) -> isByrefLikeTyconRef g m tcref | _ -> false) + ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> isByrefLikeTyconRef g m tcref | _ -> false) let isSpanLikeTy g m ty = isByrefLikeTy g m ty && @@ -2988,8 +2994,8 @@ let isSpanLikeTy g m ty = let destByrefTy g ty = match ty |> stripTyEqns g with - | TType_app(tcref, [x; _]) when g.byref2_tcr.CanDeref && tyconRefEq g g.byref2_tcr tcref -> x // Check sufficient FSharp.Core - | TType_app(tcref, [x]) when tyconRefEq g g.byref_tcr tcref -> x // all others + | TType_app(tcref, [x; _], _) when g.byref2_tcr.CanDeref && tyconRefEq g g.byref2_tcr tcref -> x // Check sufficient FSharp.Core + | TType_app(tcref, [x], _) when tyconRefEq g g.byref_tcr tcref -> x // all others | _ -> failwith "destByrefTy: not a byref type" let (|ByrefTy|_|) g ty = @@ -2998,7 +3004,7 @@ let (|ByrefTy|_|) g ty = let destNativePtrTy g ty = match ty |> stripTyEqns g with - | TType_app(tcref, [x]) when tyconRefEq g g.nativeptr_tcr tcref -> x + | TType_app(tcref, [x], _) when tyconRefEq g g.nativeptr_tcr tcref -> x | _ -> failwith "destNativePtrTy: not a native ptr type" let isRefCellTy g ty = @@ -3008,7 +3014,7 @@ let isRefCellTy g ty = let destRefCellTy g ty = match ty |> stripTyEqns g with - | TType_app(tcref, [x]) when tyconRefEq g g.refcell_tcr_canon tcref -> x + | TType_app(tcref, [x], _) when tyconRefEq g g.refcell_tcr_canon tcref -> x | _ -> failwith "destRefCellTy: not a ref type" let StripSelfRefCell(g:TcGlobals, baseOrThisInfo:ValBaseOrThisInfo, tau: TType) : TType = @@ -3016,15 +3022,15 @@ let StripSelfRefCell(g:TcGlobals, baseOrThisInfo:ValBaseOrThisInfo, tau: TType) then destRefCellTy g tau else tau -let mkRefCellTy (g:TcGlobals) ty = TType_app(g.refcell_tcr_nice, [ty]) +let mkRefCellTy (g:TcGlobals) ty = TType_app(g.refcell_tcr_nice, [ty], KnownNonNull) -let mkLazyTy (g:TcGlobals) ty = TType_app(g.lazy_tcr_nice, [ty]) +let mkLazyTy (g:TcGlobals) ty = TType_app(g.lazy_tcr_nice, [ty], KnownNonNull) -let mkPrintfFormatTy (g:TcGlobals) aty bty cty dty ety = TType_app(g.format_tcr, [aty;bty;cty;dty; ety]) +let mkPrintfFormatTy (g:TcGlobals) aty bty cty dty ety = TType_app(g.format_tcr, [aty;bty;cty;dty; ety], KnownNonNull) -let mkOptionTy (g:TcGlobals) ty = TType_app (g.option_tcr_nice, [ty]) +let mkOptionTy (g:TcGlobals) ty = TType_app (g.option_tcr_nice, [ty], KnownNonNull) -let mkListTy (g:TcGlobals) ty = TType_app (g.list_tcr_nice, [ty]) +let mkListTy (g:TcGlobals) ty = TType_app (g.list_tcr_nice, [ty], KnownNonNull) let isOptionTy (g:TcGlobals) ty = match tryDestAppTy g ty with @@ -3214,7 +3220,7 @@ module DebugPrint = begin | TType_forall (typars, rty) -> (leftL (tagText "!") ^^ layoutTyparDecls typars --- auxTypeL env rty) |> wrap | TType_ucase (UCRef(tcref, _), tinst) - | TType_app (tcref, tinst) -> + | TType_app (tcref, tinst, _) -> let prefix = tcref.IsPrefixDisplay let tcL = layoutTyconRef tcref auxTyparsL env tcL prefix tinst @@ -3222,9 +3228,9 @@ module DebugPrint = begin | TType_fun (f, x, nullness) -> let core = ((auxTypeAtomL env f ^^ wordL (tagText "->")) --- auxTypeL env x) |> wrap match nullness.Evaluate() with - | WithNull -> core ^^ wordL (tagText "| null") - | WithoutNull -> core - | Oblivious -> core ^^ wordL (tagText "| lol") + | NullnessInfo.WithNull -> core ^^ wordL (tagText "| null") + | NullnessInfo.WithoutNull -> core + | NullnessInfo.Oblivious -> core ^^ wordL (tagText "| lol") | TType_var typar -> auxTyparWrapL env isAtomic typar | TType_measure unt -> #if DEBUG @@ -5392,8 +5398,8 @@ let ComputeFieldName tycon f = let isQuotedExprTy g ty = match tryAppTy g ty with ValueSome (tcref, _) -> tyconRefEq g tcref g.expr_tcr | _ -> false let destQuotedExprTy g ty = match tryAppTy g ty with ValueSome (_, [ty]) -> ty | _ -> failwith "destQuotedExprTy" -let mkQuotedExprTy (g:TcGlobals) ty = TType_app(g.expr_tcr, [ty]) -let mkRawQuotedExprTy (g:TcGlobals) = TType_app(g.raw_expr_tcr, []) +let mkQuotedExprTy (g:TcGlobals) ty = TType_app(g.expr_tcr, [ty], KnownNonNull) +let mkRawQuotedExprTy (g:TcGlobals) = TType_app(g.raw_expr_tcr, [], KnownNonNull) let mkAnyTupledTy (g:TcGlobals) tupInfo tys = match tys with @@ -5405,7 +5411,7 @@ let mkRefTupledTy g tys = mkAnyTupledTy g tupInfoRef tys let mkRefTupledVarsTy g vs = mkRefTupledTy g (typesOfVals vs) let mkMethodTy g argtys rty = mkIteratedFunTy (List.map (mkRefTupledTy g) argtys) rty -let mkArrayType (g:TcGlobals) ty = TType_app (g.array_tcr_nice, [ty]) +let mkArrayType (g:TcGlobals) ty = TType_app (g.array_tcr_nice, [ty], KnownNonNull) let mkByteArrayTy (g:TcGlobals) = mkArrayType g g.byte_ty @@ -6194,9 +6200,9 @@ let destIDelegateEventType g ty = | [ty1] -> ty1 | _ -> failwith "destIDelegateEventType: internal error" else failwith "destIDelegateEventType: not an IDelegateEvent type" -let mkIEventType (g:TcGlobals) ty1 ty2 = TType_app (g.fslib_IEvent2_tcr, [ty1;ty2]) -let mkIObservableType (g:TcGlobals) ty1 = TType_app (g.tcref_IObservable, [ty1]) -let mkIObserverType (g:TcGlobals) ty1 = TType_app (g.tcref_IObserver, [ty1]) +let mkIEventType (g:TcGlobals) ty1 ty2 = TType_app (g.fslib_IEvent2_tcr, [ty1;ty2], KnownNonNull) +let mkIObservableType (g:TcGlobals) ty1 = TType_app (g.tcref_IObservable, [ty1], KnownNonNull) +let mkIObserverType (g:TcGlobals) ty1 = TType_app (g.tcref_IObserver, [ty1], KnownNonNull) let mkRefCellContentsRef (g:TcGlobals) = mkRecdFieldRef g.refcell_tcr_canon "contents" @@ -7331,7 +7337,7 @@ let rec typeEnc g (gtpsType, gtpsMethod) ty = | _ -> failwith "impossible: rankOfArrayTyconRef: unsupported array rank" typeEnc g (gtpsType, gtpsMethod) (List.head tinst) + arraySuffix | TType_ucase (UCRef(tcref, _), tinst) - | TType_app (tcref, tinst) -> + | TType_app (tcref, tinst, _) -> if tyconRefEq g g.byref_tcr tcref then typeEnc g (gtpsType, gtpsMethod) (List.head tinst) + "@" elif tyconRefEq g tcref g.nativeptr_tcr then @@ -7340,7 +7346,7 @@ let rec typeEnc g (gtpsType, gtpsMethod) ty = let tyName = let ty = stripTyEqnsAndMeasureEqns g ty match ty with - | TType_app (tcref, _tinst) -> + | TType_app (tcref, _tinst, _nullness) -> // Generic type names are (name + "`" + digits) where name does not contain "`". // In XML doc, when used in type instances, these do not use the ticks. let path = Array.toList (fullMangledPathToTyconRef tcref) @ [tcref.CompiledName] @@ -8290,15 +8296,15 @@ let rec mkCompiledTuple g isStruct (argtys, args, m) = | [ty8], [arg8] -> match ty8 with // if it's already been nested or ended, pass it through - | TType_app(tn, _) when (isCompiledTupleTyconRef g tn) -> + | TType_app(tn, _, _) when (isCompiledTupleTyconRef g tn) -> ty8, arg8 | _ -> - let ty8enc = TType_app((if isStruct then g.struct_tuple1_tcr else g.ref_tuple1_tcr), [ty8]) + let ty8enc = TType_app((if isStruct then g.struct_tuple1_tcr else g.ref_tuple1_tcr), [ty8], KnownNonNull) let v8enc = Expr.Op (TOp.Tuple (TupInfo.Const isStruct), [ty8], [arg8], m) ty8enc, v8enc | _ -> let a, b, c, d = mkCompiledTuple g isStruct (argtysB, argsB, m) - let ty8plus = TType_app(a, b) + let ty8plus = TType_app(a, b, KnownNonNull) let v8plus = Expr.Op (TOp.Tuple(TupInfo.Const isStruct), b, c, d) ty8plus, v8plus let argtysAB = argtysA @ [ty8] diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index f8930605af6..f4cbe87f5df 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -474,6 +474,7 @@ val destTyparTy : TcGlobals -> TType -> Typar val destAnyParTy : TcGlobals -> TType -> Typar val destMeasureTy : TcGlobals -> TType -> Measure val tryDestForallTy : TcGlobals -> TType -> Typars * TType +val nullnessOfTy : TcGlobals -> TType -> Nullness val isFunTy : TcGlobals -> TType -> bool val isForallTy : TcGlobals -> TType -> bool diff --git a/src/fsharp/symbols/Symbols.fs b/src/fsharp/symbols/Symbols.fs index 7e1a92075b7..a619e460c02 100644 --- a/src/fsharp/symbols/Symbols.fs +++ b/src/fsharp/symbols/Symbols.fs @@ -665,7 +665,7 @@ and FSharpEntity(cenv: SymbolEnv, entity:EntityRef) = let (TILObjectReprData(_scoref, _enc, tdef)) = entity.ILTyconInfo let formalTypars = entity.Typars(range.Zero) let formalTypeInst = generalizeTypars formalTypars - let ty = TType_app(entity, formalTypeInst) + let ty = TType_app(entity, formalTypeInst, KnownNonNull) let formalTypeInfo = ILTypeInfo.FromType cenv.g ty tdef.Fields.AsList |> List.map (fun tdef -> let ilFieldInfo = ILFieldInfo(formalTypeInfo, tdef) @@ -1982,7 +1982,7 @@ and FSharpType(cenv, ty:TType) = let isUnresolved() = ErrorLogger.protectAssemblyExploration true <| fun () -> match stripTyparEqns ty with - | TType_app (tcref, _) -> FSharpEntity(cenv, tcref).IsUnresolved + | TType_app (tcref, _, _) -> FSharpEntity(cenv, tcref).IsUnresolved | TType_measure (Measure.Con tcref) -> FSharpEntity(cenv, tcref).IsUnresolved | TType_measure (Measure.Prod _) -> FSharpEntity(cenv, cenv.g.measureproduct_tcr).IsUnresolved | TType_measure Measure.One -> FSharpEntity(cenv, cenv.g.measureone_tcr).IsUnresolved @@ -2022,7 +2022,7 @@ and FSharpType(cenv, ty:TType) = member __.TypeDefinition = protect <| fun () -> match stripTyparEqns ty with - | TType_app (tcref, _) -> FSharpEntity(cenv, tcref) + | TType_app (tcref, _, _) -> FSharpEntity(cenv, tcref) | TType_measure (Measure.Con tcref) -> FSharpEntity(cenv, tcref) | TType_measure (Measure.Prod _) -> FSharpEntity(cenv, cenv.g.measureproduct_tcr) | TType_measure Measure.One -> FSharpEntity(cenv, cenv.g.measureone_tcr) @@ -2032,23 +2032,23 @@ and FSharpType(cenv, ty:TType) = member __.HasNullAnnotation = protect <| fun () -> match stripTyparEqns ty with - | TType_fun(_, _, nullness) -> match nullness.Evaluate() with WithNull -> true | _ -> false - | TType_app (_, _) -> false + | TType_app (_, _, nullness) + | TType_fun(_, _, nullness) -> match nullness.Evaluate() with NullnessInfo.WithNull -> true | _ -> false | TType_tuple (_, _) -> false | _ -> false member __.IsNullOblivious = protect <| fun () -> match stripTyparEqns ty with - | TType_fun(_, _, nullness) -> match nullness.Evaluate() with Oblivious -> true | _ -> false - | TType_app (_, _) -> false + | TType_app (_, _, nullness) + | TType_fun(_, _, nullness) -> match nullness.Evaluate() with NullnessInfo.Oblivious -> true | _ -> false | TType_tuple (_, _) -> false | _ -> false member __.GenericArguments = protect <| fun () -> match stripTyparEqns ty with - | TType_app (_, tyargs) + | TType_app (_, tyargs, _) | TType_tuple (_, tyargs) -> (tyargs |> List.map (fun ty -> FSharpType(cenv, ty)) |> makeReadOnlyCollection) | TType_fun(d, r, _nullness) -> [| FSharpType(cenv, d); FSharpType(cenv, r) |] |> makeReadOnlyCollection | TType_measure (Measure.Con _) -> [| |] |> makeReadOnlyCollection @@ -2128,7 +2128,7 @@ and FSharpType(cenv, ty:TType) = match ty with | TType_forall _ -> 10000 | TType_var tp -> 10100 + int32 tp.Stamp - | TType_app (tc1, b1) -> 10200 + int32 tc1.Stamp + List.sumBy hashType b1 + | TType_app (tc1, b1, _) -> 10200 + int32 tc1.Stamp + List.sumBy hashType b1 | TType_ucase _ -> 10300 // shouldn't occur in symbols | TType_tuple (_, l1) -> 10400 + List.sumBy hashType l1 | TType_fun (dty, rty, _nullness) -> 10500 + hashType dty + hashType rty diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index a13370772cb..6cdfbe913aa 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -3900,18 +3900,20 @@ and and Nullness = | Known of NullnessInfo | Variable of NullnessVar + member n.Evaluate() = match n with | Known info -> info | Variable v -> v.Evaluate() - override n.ToString() = match n.Evaluate() with WithNull -> " | null" | WithoutNull -> "" | Oblivious -> " lol" + + override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> " | null" | NullnessInfo.WithoutNull -> "" | NullnessInfo.Oblivious -> " lol" and NullnessVar = { mutable solution: Nullness option } member nv.Evaluate() = match nv.solution with - | None -> WithoutNull + | None -> NullnessInfo.WithoutNull | Some soln -> soln.Evaluate() member nv.IsSolved = nv.solution.IsSome @@ -3928,12 +3930,14 @@ and NullnessVar = assert nv.IsSolved nv.solution.Value -and NullnessInfo = - // we know that there is an extra null value in the type +and + [] + NullnessInfo = + /// we know that there is an extra null value in the type | WithNull - // we know that there is no extra null value in the type + /// we know that there is no extra null value in the type | WithoutNull - // we know we don't care + /// we know we don't care | Oblivious and @@ -3946,17 +3950,17 @@ and /// Indicates the type is a universal type, only used for types of values and members | TType_forall of Typars * TType - /// TType_app(tyconRef, typeInstantiation). + /// TType_app(tyconRef, typeInstantiation, nullness). /// /// Indicates the type is built from a named type and a number of type arguments - | TType_app of TyconRef * TypeInst + | TType_app of TyconRef * TypeInst * Nullness /// TType_tuple(elementTypes). /// /// Indicates the type is a tuple type. elementTypes must be of length 2 or greater. | TType_tuple of TupInfo * TTypes - /// TType_fun(domainType,rangeType). + /// TType_fun(domainType, rangeType, nullness). /// /// Indicates the type is a function type | TType_fun of TType * TType * Nullness @@ -3974,12 +3978,13 @@ and /// Indicates the type is a unit-of-measure expression being used as an argument to a type or member | TType_measure of Measure + /// For now, used only as a discriminant in error message. /// See https://github.com/Microsoft/visualfsharp/issues/2561 member x.GetAssemblyName() = match x with | TType_forall (_tps, ty) -> ty.GetAssemblyName() - | TType_app (tcref, _tinst) -> tcref.CompilationPath.ILScopeRef.QualifiedName + | TType_app (tcref, _tinst, _) -> tcref.CompilationPath.ILScopeRef.QualifiedName | TType_tuple (_tupInfo, _tinst) -> "" | TType_fun _ -> "" | TType_measure _ms -> "" @@ -3994,7 +3999,7 @@ and override x.ToString() = match x with | TType_forall (_tps,ty) -> "forall ... " + ty.ToString() - | TType_app (tcref, tinst) -> tcref.DisplayName + (match tinst with [] -> "" | tys -> "<" + String.concat "," (List.map string tys) + ">") + | TType_app (tcref, tinst, nullness) -> tcref.DisplayName + (match tinst with [] -> "" | tys -> "<" + String.concat "," (List.map string tys) + ">") + nullness.ToString() | TType_tuple (tupInfo, tinst) -> (match tupInfo with | TupInfo.Const false -> "" From 17566b26e7465c175d2ea19652158c670c6dbd33 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 16 Oct 2018 18:46:34 +0100 Subject: [PATCH 004/137] nullability prototype - add TType_app, error messages and scrub predicates --- .../FSharp.Compiler.Private/FSComp.fs | 4 ++ .../FSharp.Compiler.Private/FSComp.resx | 3 + src/fsharp/CompileOps.fs | 28 ++++++-- src/fsharp/ConstraintSolver.fs | 51 ++++++++------ src/fsharp/ConstraintSolver.fsi | 3 +- src/fsharp/FSComp.txt | 3 + src/fsharp/FSStrings.resx | 6 ++ src/fsharp/InfoReader.fs | 6 +- src/fsharp/MethodCalls.fs | 4 +- src/fsharp/NameResolution.fs | 2 +- src/fsharp/NicePrint.fs | 30 ++++---- src/fsharp/QuotationTranslator.fs | 4 +- src/fsharp/SignatureConformance.fs | 4 +- src/fsharp/TastOps.fs | 69 ++++++++++++++----- src/fsharp/TastOps.fsi | 14 ++-- src/fsharp/TastPickle.fs | 11 +-- src/fsharp/TcGlobals.fs | 56 +++++++-------- src/fsharp/TypeChecker.fs | 39 +++++++---- src/fsharp/TypeRelations.fs | 12 ++-- src/fsharp/ast.fs | 5 ++ src/fsharp/import.fs | 21 +++--- src/fsharp/infos.fs | 8 ++- src/fsharp/lexhelp.fs | 1 + src/fsharp/pars.fsy | 13 ++++ src/fsharp/service/ServiceDeclarationLists.fs | 6 +- src/fsharp/service/ServiceLexing.fs | 1 + src/fsharp/service/service.fs | 18 ++--- src/fsharp/symbols/Exprs.fs | 4 +- src/fsharp/symbols/SymbolHelpers.fs | 14 ++-- src/fsharp/tast.fs | 8 ++- src/fsharp/xlf/FSComp.txt.cs.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.de.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.en.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.es.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.fr.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.it.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.ja.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.ko.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.pl.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.ru.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.tr.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 5 ++ src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 5 ++ 44 files changed, 355 insertions(+), 163 deletions(-) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index 23e20f9e770..2889929d85e 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -4357,6 +4357,9 @@ type internal SR private() = /// This type does not inherit Attribute, it will not work correctly with other .NET languages. /// (Originally from ..\FSComp.txt:1443) static member tcTypeDoesNotInheritAttribute() = (3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,") ) + /// The type '%s' never has 'null' as a value. To specify a nullable value type use Nullable<%s> + /// (Originally from ..\FSComp.txt:1444) + static member tcTypeDoesNotHaveAnyNull(a0 : System.String, a1 : System.String) = (3243, GetStringFunc("tcTypeDoesNotHaveAnyNull",",,,%s,,,%s,,,") a0 a1) /// Call this method once to validate that all known resources are valid; throws if not static member RunStartupValidation() = @@ -5774,4 +5777,5 @@ type internal SR private() = ignore(GetString("chkNoSpanLikeValueFromExpression")) ignore(GetString("tastCantTakeAddressOfExpression")) ignore(GetString("tcTypeDoesNotInheritAttribute")) + ignore(GetString("tcTypeDoesNotHaveAnyNull")) () diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index edc9a7bff8f..ac375312ad1 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -4360,4 +4360,7 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + \ No newline at end of file diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 4668758946b..5b48fcaa84d 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -194,7 +194,8 @@ let GetRangeOfDiagnostic(err:PhasedDiagnostic) = | ConstraintSolverTupleDiffLengths(_, _, _, m, _) | ConstraintSolverInfiniteTypes(_, _, _, _, m, _) | ConstraintSolverMissingConstraint(_, _, _, m, _) - | ConstraintSolverNullnessWarning(_, _, _, m, _) + | ConstraintSolverNullnessWarningWithTypes(_, _, _, _, _, m, _) + | ConstraintSolverNullnessWarningWithType(_, _, _, m, _) | ConstraintSolverTypesNotInEqualityRelation(_, _, _, m, _, _) | ConstraintSolverError(_, m, _) | ConstraintSolverTypesNotInSubsumptionRelation(_, _, _, m, _) @@ -372,6 +373,8 @@ let GetDiagnosticNumber(err:PhasedDiagnostic) = | :? TypeProviderError as e -> e.Number #endif | ErrorsFromAddingSubsumptionConstraint (_, _, _, _, _, ContextInfo.DowncastUsedInsteadOfUpcast _, _) -> fst (FSComp.SR.considerUpcast("", "")) + | ConstraintSolverNullnessWarningWithTypes _ -> 3244 + | ConstraintSolverNullnessWarningWithType _ -> 3245 | _ -> 193 GetFromException err.Exception @@ -443,6 +446,8 @@ let ConstraintSolverTupleDiffLengthsE() = DeclareResourceString("ConstraintSolve let ConstraintSolverInfiniteTypesE() = DeclareResourceString("ConstraintSolverInfiniteTypes", "%s%s") let ConstraintSolverMissingConstraintE() = DeclareResourceString("ConstraintSolverMissingConstraint", "%s") let ConstraintSolverTypesNotInEqualityRelation1E() = DeclareResourceString("ConstraintSolverTypesNotInEqualityRelation1", "%s%s") +let ConstraintSolverNullnessWarningWithTypesE() = DeclareResourceString("ConstraintSolverNullnessWarningWithTypes", "%s%s%s") +let ConstraintSolverNullnessWarningWithTypeE() = DeclareResourceString("ConstraintSolverNullnessWarningWithType", "%s") let ConstraintSolverTypesNotInEqualityRelation2E() = DeclareResourceString("ConstraintSolverTypesNotInEqualityRelation2", "%s%s") let ConstraintSolverTypesNotInSubsumptionRelationE() = DeclareResourceString("ConstraintSolverTypesNotInSubsumptionRelation", "%s%s%s") let ErrorFromAddingTypeEquation1E() = DeclareResourceString("ErrorFromAddingTypeEquation1", "%s%s%s") @@ -632,16 +637,25 @@ let OutputPhasedErrorR (os:StringBuilder) (err:PhasedDiagnostic) = if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore - | ConstraintSolverNullnessWarning(_denv, nullness, nullness2, m, m2) -> + | ConstraintSolverNullnessWarningWithTypes(denv, ty1, ty2, nullness, nullness2, m, m2) -> + let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv ty1 ty2 let msg = // TODO: Put this in FSComp.SR. match nullness, nullness2 with - | WithNull, WithoutNull -> "Expected the type to have null." - | WithoutNull, WithNull -> "Expected the type to not have null." + | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> "Expected the type to have null." + | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> "Expected the type to not have null." | _ -> String.Empty - os.Append(msg) |> ignore + os.Append(ConstraintSolverNullnessWarningWithTypesE().Format t1 t2 msg) |> ignore + + if m.StartLine <> m2.StartLine then + os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore + + | ConstraintSolverNullnessWarningWithType(denv, ty, _nullness, m, m2) -> + + let t = NicePrint.minimalStringOfType denv ty + os.Append(ConstraintSolverNullnessWarningWithTypeE().Format (t)) |> ignore if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore @@ -1259,7 +1273,7 @@ let OutputPhasedErrorR (os:StringBuilder) (err:PhasedDiagnostic) = // we need to check if unit was used as a type argument let rec hasUnitTType_app (types: TType list) = match types with - | TType_app (maybeUnit, []) :: ts -> + | TType_app (maybeUnit, [], _) :: ts -> match maybeUnit.TypeAbbrev with | Some ttype when Tastops.isUnitTy g ttype -> true | _ -> hasUnitTType_app ts @@ -1267,7 +1281,7 @@ let OutputPhasedErrorR (os:StringBuilder) (err:PhasedDiagnostic) = | [] -> false match minfoVirt.ApparentEnclosingType with - | TType_app (t, types) when t.IsFSharpInterfaceTycon && hasUnitTType_app types -> + | TType_app (t, types, _) when t.IsFSharpInterfaceTycon && hasUnitTType_app types -> // match abstract member with 'unit' passed as generic argument os.Append(OverrideDoesntOverride4E().Format sig1) |> ignore | _ -> diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 82a09b5705d..73f03fc1689 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -156,7 +156,8 @@ exception ConstraintSolverInfiniteTypes of ContextInfo * DisplayEnv * TType * TT exception ConstraintSolverTypesNotInEqualityRelation of DisplayEnv * TType * TType * range * range * ContextInfo exception ConstraintSolverTypesNotInSubsumptionRelation of DisplayEnv * TType * TType * range * range exception ConstraintSolverMissingConstraint of DisplayEnv * Tast.Typar * Tast.TyparConstraint * range * range -exception ConstraintSolverNullnessWarning of DisplayEnv * NullnessInfo * NullnessInfo * range * range +exception ConstraintSolverNullnessWarningWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range +exception ConstraintSolverNullnessWarningWithType of DisplayEnv * TType * NullnessInfo * range * range exception ConstraintSolverError of string * range * range exception ConstraintSolverRelatedInformation of string option * range * exn @@ -778,7 +779,7 @@ and solveTypMeetsTyparConstraints (csenv:ConstraintSolverEnv) ndeep m2 trace ty SolveMemberConstraint csenv false false ndeep m2 trace traitInfo ++ (fun _ -> CompleteD) )))) -and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) nullness1 nullness2 = +and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 ty2 nullness1 nullness2 = match nullness1, nullness2 with | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> CompleteD @@ -788,17 +789,19 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) nul | _, Nullness.Variable nv2 when not nv2.IsSolved -> trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) CompleteD - | Nullness.Variable nv1, _ -> SolveNullnessEquiv csenv m2 trace nv1.Solution nullness2 - | _, Nullness.Variable nv2 -> SolveNullnessEquiv csenv m2 trace nullness1 nv2.Solution + | Nullness.Variable nv1, _ -> SolveNullnessEquiv csenv m2 trace ty1 ty2 nv1.Solution nullness2 + | _, Nullness.Variable nv2 -> SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nv2.Solution | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with | NullnessInfo.Oblivious, _ -> CompleteD | _, NullnessInfo.Oblivious -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD - | _, _ -> WarnD(ConstraintSolverNullnessWarning(csenv.DisplayEnv, n1, n2, csenv.m, m2)) + | _, _ -> + printfn "generating warning: %A %A %A %A" n1 n2 csenv.m m2 + WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) -and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) nullness1 nullness2 = +and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 ty2 nullness1 nullness2 = match nullness1, nullness2 with | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> CompleteD @@ -808,8 +811,8 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona | _, Nullness.Variable nv2 when not nv2.IsSolved -> trace.Exec (fun () -> nv2.Set nullness2) (fun () -> nv2.Unset()) CompleteD - | Nullness.Variable nv1, _ -> SolveNullnessEquiv csenv m2 trace nv1.Solution nullness2 - | _, Nullness.Variable nv2 -> SolveNullnessEquiv csenv m2 trace nullness1 nv2.Solution + | Nullness.Variable nv1, _ -> SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nv1.Solution nullness2 + | _, Nullness.Variable nv2 -> SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nv2.Solution | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with | NullnessInfo.Oblivious, _ -> CompleteD @@ -818,7 +821,7 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> - WarnD(ConstraintSolverNullnessWarning(csenv.DisplayEnv, n1, n2, csenv.m, m2)) + WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) /// Add the constraint "ty1 = ty2" to the constraint problem. /// Propagate all effects of adding this constraint, e.g. to solve type variables @@ -852,17 +855,17 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra // Catch float<_>=float<1>, float32<_>=float32<1> and decimal<_>=decimal<1> | (_, TType_app (tc2, [ms2], nullness2)) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty1 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms2])) -> SolveTypeEqualsType csenv ndeep m2 trace None (TType_measure Measure.One) ms2 ++ (fun () -> - SolveNullnessSubsumesNullness csenv m2 trace (nullnessOfTy g sty1) nullness2 + SolveNullnessEquiv csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullness2 ) | (TType_app (tc1, [ms1], nullness1), _) when (tc1.IsMeasureableReprTycon && typeEquiv csenv.g sty2 (reduceTyconRefMeasureableOrProvided csenv.g tc1 [ms1])) -> SolveTypeEqualsType csenv ndeep m2 trace None ms1 (TType_measure Measure.One) ++ (fun () -> - SolveNullnessSubsumesNullness csenv m2 trace nullness1 (nullnessOfTy g sty2) + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 (nullnessOfTy g sty2) ) | TType_app (tc1, l1, nullness1), TType_app (tc2, l2, nullness2) when tyconRefEq g tc1 tc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 ++ (fun () -> - SolveNullnessEquiv csenv m2 trace nullness1 nullness2 + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 ) | TType_app _, TType_app _ -> localAbortD @@ -873,7 +876,7 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra | TType_fun (d1, r1, nullness1) , TType_fun (d2, r2, nullness2) -> SolveFunTypeEqn csenv ndeep m2 trace None d1 d2 r1 r2 ++ (fun () -> - SolveNullnessEquiv csenv m2 trace nullness1 nullness2 + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 ) | TType_measure ms1 , TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 @@ -952,19 +955,19 @@ and SolveTypeSubsumesType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalT | TType_fun (d1, r1, nullness1) , TType_fun (d2, r2, nullness2) -> (* nb. can unify since no variance *) SolveFunTypeEqn csenv ndeep m2 trace cxsln d1 d2 r1 r2 ++ (fun () -> - SolveNullnessSubsumesNullness csenv m2 trace nullness1 nullness2 + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nullness2 ) | TType_measure ms1, TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 // Enforce the identities float=float<1>, float32=float32<1> and decimal=decimal<1> | (_, TType_app (tc2, [ms2], nullness2)) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty1 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms2])) -> SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ms2 (TType_measure Measure.One) ++ (fun () -> - SolveNullnessSubsumesNullness csenv m2 trace sty1.Nullness nullness2 + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullness2 ) | (TType_app (tc1, [ms1], nullness1), _) when (tc1.IsMeasureableReprTycon && typeEquiv csenv.g sty2 (reduceTyconRefMeasureableOrProvided csenv.g tc1 [ms1])) -> SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ms1 (TType_measure Measure.One) ++ (fun () -> - SolveNullnessSubsumesNullness csenv m2 trace nullness1 sty2.Nullness + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 (nullnessOfTy g sty2) ) // Special subsumption rule for byref tags @@ -981,7 +984,7 @@ and SolveTypeSubsumesType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalT | TType_app (tc1, l1, nullness1) , TType_app (tc2, l2, nullness2) when tyconRefEq g tc1 tc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 ++ (fun () -> - SolveNullnessSubsumesNullness csenv m2 trace nullness1 nullness2 + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nullness2 ) | TType_ucase (uc1, l1) , TType_ucase (uc2, l2) when g.unionCaseRefEq uc1 uc2 -> @@ -1755,19 +1758,19 @@ and AddConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace tp newConstraint = CompleteD))) -and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) nullness = +and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) ty nullness = let m = csenv.m let denv = csenv.DisplayEnv match nullness with | Nullness.Variable nv1 when not nv1.IsSolved -> trace.Exec (fun () -> nv1.Set KnownNull) (fun () -> nv1.Unset()) CompleteD - | Nullness.Variable nv -> SolveNullnessSupportsNull csenv ndeep m2 trace nv.Solution + | Nullness.Variable nv -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nv.Solution | Nullness.Known n1 -> match n1 with | NullnessInfo.Oblivious -> CompleteD | NullnessInfo.WithNull -> CompleteD - | NullnessInfo.WithoutNull -> WarnD(ConstraintSolverNullnessWarning(denv, n1, NullnessInfo.WithoutNull, m, m2)) + | NullnessInfo.WithoutNull -> WarnD(ConstraintSolverNullnessWarningWithType(denv, ty, n1, m, m2)) and SolveTypeSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let g = csenv.g @@ -1777,9 +1780,13 @@ and SolveTypeSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = | ValueSome destTypar -> AddConstraint csenv ndeep m2 trace destTypar (TyparConstraint.SupportsNull m) | ValueNone -> - if TypeSatisfiesNullConstraint g m ty then CompleteD else + if TypeNullIsExtraValueNew g m ty then CompleteD else + match stripTyparEqns ty with + | TType_fun (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness + | TType_app (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness + | _ -> + if TypeNullIsExtraValueOld g m ty then CompleteD else match stripTyparEqns ty with - | TType_fun (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace nullness | NullableTy g _ -> ErrorD (ConstraintSolverError(FSComp.SR.csNullableTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) | _ -> diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi index def2488b9b2..ef0d5134a64 100644 --- a/src/fsharp/ConstraintSolver.fsi +++ b/src/fsharp/ConstraintSolver.fsi @@ -81,7 +81,8 @@ exception ConstraintSolverInfiniteTypes of ContextInfo * Display exception ConstraintSolverTypesNotInEqualityRelation of DisplayEnv * TType * TType * range * range * ContextInfo exception ConstraintSolverTypesNotInSubsumptionRelation of DisplayEnv * TType * TType * range * range exception ConstraintSolverMissingConstraint of DisplayEnv * Typar * TyparConstraint * range * range -exception ConstraintSolverNullnessWarning of DisplayEnv * NullnessInfo * NullnessInfo * range * range +exception ConstraintSolverNullnessWarningWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range +exception ConstraintSolverNullnessWarningWithType of DisplayEnv * TType * NullnessInfo * range * range exception ConstraintSolverError of string * range * range exception ConstraintSolverRelatedInformation of string option * range * exn exception ErrorFromApplyingDefault of TcGlobals * DisplayEnv * Typar * TType * exn * range diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index b8b72353118..091bcc16183 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -1441,3 +1441,6 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl 3236,chkNoSpanLikeValueFromExpression,"A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope." 3237,tastCantTakeAddressOfExpression,"Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address." 3242,tcTypeDoesNotInheritAttribute,"This type does not inherit Attribute, it will not work correctly with other .NET languages." +3243,tcTypeDoesNotHaveAnyNull,"The type '%s' never has 'null' as a value. To specify a nullable value type use Nullable<%s>" +#3244 reserved for ConstraintSolverNullnessWarningWithTypes +#3245 reserved for ConstraintSolverNullnessWarningWithType diff --git a/src/fsharp/FSStrings.resx b/src/fsharp/FSStrings.resx index 5a99d5e9e74..4279b472cd0 100644 --- a/src/fsharp/FSStrings.resx +++ b/src/fsharp/FSStrings.resx @@ -129,6 +129,12 @@ A type parameter is missing a constraint '{0}' + + Nullness warning: The types {0} and {1} do not have compatible nullability. {2}' + + + Nullness warning: The type {0} does not support nullness.' + The unit of measure '{0}' does not match the unit of measure '{1}' diff --git a/src/fsharp/InfoReader.fs b/src/fsharp/InfoReader.fs index e04485887e1..e23673d94ee 100644 --- a/src/fsharp/InfoReader.fs +++ b/src/fsharp/InfoReader.fs @@ -344,7 +344,7 @@ type InfoReader(g: TcGlobals, amap: Import.ImportMap) = // a decent hash function for these. canMemoize=(fun (_flags,(_:range),ty) -> match stripTyEqns g ty with - | TType_app(tcref,[]) -> tcref.TypeContents.tcaug_closed + | TType_app(tcref,[],_nullness) -> tcref.TypeContents.tcaug_closed // TODO NULLNESS: consider whether ignoring _nullness is valid here | _ -> false), keyComparer= @@ -353,13 +353,13 @@ type InfoReader(g: TcGlobals, amap: Import.ImportMap) = // Ignoring the ranges - that's OK. flagsEq.Equals(flags1,flags2) && match stripTyEqns g typ1, stripTyEqns g typ2 with - | TType_app(tcref1,[]),TType_app(tcref2,[]) -> tyconRefEq g tcref1 tcref2 + | TType_app(tcref1,[],_nullness1),TType_app(tcref2,[],_nullness2) -> tyconRefEq g tcref1 tcref2 // TODO NULLNESS: consider whether ignoring _nullness is valid here | _ -> false member x.GetHashCode((flags,_,ty)) = // Ignoring the ranges - that's OK. flagsEq.GetHashCode flags + (match stripTyEqns g ty with - | TType_app(tcref,[]) -> hash tcref.LogicalName + | TType_app(tcref,[],_nullness1) -> hash tcref.LogicalName // TODO NULLNESS: consider whether ignoring _nullness is valid here | _ -> 0) }) diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs index fa812694fd0..536fc7ff7dd 100644 --- a/src/fsharp/MethodCalls.fs +++ b/src/fsharp/MethodCalls.fs @@ -333,11 +333,11 @@ type CalledMeth<'T> | [pinfo] when pinfo.HasSetter && not pinfo.IsIndexer -> let pminfo = pinfo.SetterMethod let pminst = match minfo with - | MethInfo.FSMeth(_, TType.TType_app(_, types), _, _) -> types + | MethInfo.FSMeth(_, TType_app(_, types, _), _, _) -> types | _ -> freshenMethInfo m pminfo let pminst = match tyargsOpt with - | Some(TType.TType_app(_, types)) -> types + | Some(TType_app(_, types, _)) -> types | _ -> pminst Choice1Of2(AssignedItemSetter(id, AssignedPropSetter(pinfo, pminfo, pminst), e)) | _ -> diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs index 87efa346952..d327f2a62e3 100644 --- a/src/fsharp/NameResolution.fs +++ b/src/fsharp/NameResolution.fs @@ -849,7 +849,7 @@ let AddDeclaredTyparsToNameEnv check nenv typars = /// a fresh set of inference type variables for the type parameters of the union type. let FreshenTycon (ncenv: NameResolver) m (tcref:TyconRef) = let tinst = ncenv.InstantiationGenerator m (tcref.Typars m) - let improvedTy = ncenv.g.decompileType tcref tinst + let improvedTy = ncenv.g.decompileType tcref tinst KnownNonNull improvedTy /// Convert a reference to a union case into a UnionCaseInfo that includes diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs index a2a8e832456..f6410d6072a 100755 --- a/src/fsharp/NicePrint.fs +++ b/src/fsharp/NicePrint.fs @@ -906,30 +906,40 @@ module private PrintTypes = | [arg] -> layoutTypeWithInfoAndPrec denv env 2 arg ^^ tcL | args -> bracketIfL (prec <= 1) (bracketL (layoutTypesWithInfoAndPrec denv env 2 (sepL (tagPunctuation ",")) args) --- tcL) + and layoutNullness part2 (nullness: Nullness) = + match nullness.Evaluate() with + | NullnessInfo.WithNull -> part2 ^^ rightL (tagText "?") + | NullnessInfo.WithoutNull -> part2 + | NullnessInfo.Oblivious -> part2 ^^ wordL (tagText "obliv") + /// Layout a type, taking precedence into account to insert brackets where needed and layoutTypeWithInfoAndPrec denv env prec ty = match stripTyparEqns ty with // Always prefer to format 'byref' as 'inref' - | ty when isInByrefTy denv.g ty && (match ty with TType_app (tc, _) when denv.g.inref_tcr.CanDeref && tyconRefEq denv.g tc denv.g.byref2_tcr -> true | _ -> false) -> + | ty when isInByrefTy denv.g ty && (match ty with TType_app (tc, _, _) when denv.g.inref_tcr.CanDeref && tyconRefEq denv.g tc denv.g.byref2_tcr -> true | _ -> false) -> layoutTypeWithInfoAndPrec denv env prec (mkInByrefTy denv.g (destByrefTy denv.g ty)) // Always prefer to format 'byref' as 'outref' - | ty when isOutByrefTy denv.g ty && (match ty with TType_app (tc, _) when denv.g.outref_tcr.CanDeref && tyconRefEq denv.g tc denv.g.byref2_tcr -> true | _ -> false) -> + | ty when isOutByrefTy denv.g ty && (match ty with TType_app (tc, _, _) when denv.g.outref_tcr.CanDeref && tyconRefEq denv.g tc denv.g.byref2_tcr -> true | _ -> false) -> layoutTypeWithInfoAndPrec denv env prec (mkOutByrefTy denv.g (destByrefTy denv.g ty)) // Always prefer to format 'byref' as 'byref' - | ty when isByrefTy denv.g ty && (match ty with TType_app (tc, _) when denv.g.byref_tcr.CanDeref && tyconRefEq denv.g tc denv.g.byref2_tcr -> true | _ -> false) -> + | ty when isByrefTy denv.g ty && (match ty with TType_app (tc, _, _) when denv.g.byref_tcr.CanDeref && tyconRefEq denv.g tc denv.g.byref2_tcr -> true | _ -> false) -> layoutTypeWithInfoAndPrec denv env prec (mkByrefTy denv.g (destByrefTy denv.g ty)) // Always prefer 'float' to 'float<1>' - | TType_app (tc,args) when tc.IsMeasureableReprTycon && List.forall (isDimensionless denv.g) args -> - layoutTypeWithInfoAndPrec denv env prec (reduceTyconRefMeasureableOrProvided denv.g tc args) + | TType_app (tc,args,nullness) when tc.IsMeasureableReprTycon && List.forall (isDimensionless denv.g) args -> + let part1 = layoutTypeWithInfoAndPrec denv env prec (reduceTyconRefMeasureableOrProvided denv.g tc args) + let part2 = layoutNullness part1 nullness + part2 // Layout a type application - | TType_app (tc,args) -> - layoutTypeAppWithInfoAndPrec denv env (layoutTyconRef denv tc) prec tc.IsPrefixDisplay args + | TType_app (tc,args, nullness) -> + let part1 = layoutTypeAppWithInfoAndPrec denv env (layoutTyconRef denv tc) prec tc.IsPrefixDisplay args + let part2 = layoutNullness part1 nullness + part2 | TType_ucase (UCRef(tc,_),args) -> layoutTypeAppWithInfoAndPrec denv env (layoutTyconRef denv tc) prec tc.IsPrefixDisplay args @@ -956,11 +966,7 @@ module private PrintTypes = | TType_fun (dty,rty,nullness) -> let part1 = soFarL --- (layoutTypeWithInfoAndPrec denv env 4 dty ^^ wordL (tagPunctuation "->")) let part2 = loop part1 rty - let part3 = - match nullness.Evaluate() with - | WithNull -> part2 ^^ wordL (tagText "| null") - | WithoutNull -> part2 - | Oblivious -> part2 ^^ wordL (tagText "| lol") + let part3 = layoutNullness part2 nullness part3 | rty -> soFarL --- layoutTypeWithInfoAndPrec denv env 5 rty bracketIfL (prec <= 4) (loop emptyL ty) diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs index df37e450828..06c3bf4d064 100644 --- a/src/fsharp/QuotationTranslator.fs +++ b/src/fsharp/QuotationTranslator.fs @@ -793,11 +793,11 @@ and FilterMeasureTyargs tys = and ConvType cenv env m ty = match stripTyEqnsAndMeasureEqns cenv.g ty with - | TType_app(tcref,[tyarg]) when isArrayTyconRef cenv.g tcref -> + | TType_app(tcref,[tyarg],_) when isArrayTyconRef cenv.g tcref -> QP.mkArrayTy(rankOfArrayTyconRef cenv.g tcref,ConvType cenv env m tyarg) | TType_ucase(UCRef(tcref,_),tyargs) // Note: we erase union case 'types' when converting to quotations - | TType_app(tcref,tyargs) -> + | TType_app(tcref,tyargs,_) -> #if !NO_EXTENSIONTYPING match TryElimErasableTyconRef cenv m tcref with | Some baseTy -> ConvType cenv env m baseTy diff --git a/src/fsharp/SignatureConformance.fs b/src/fsharp/SignatureConformance.fs index 8b0981451ef..10a8db8b843 100644 --- a/src/fsharp/SignatureConformance.fs +++ b/src/fsharp/SignatureConformance.fs @@ -193,8 +193,8 @@ type Checker(g, amap, denv, remapInfo: SignatureRepackageInfo, checkingSig) = elif fNull && not aNull then errorR(Error(FSComp.SR.DefinitionsInSigAndImplNotCompatibleSignatureSaysNull(implTycon.TypeOrMeasureKind.ToString(),implTycon.DisplayName),m)) - let aNull2 = TypeNullIsExtraValue g m (generalizedTyconRef (mkLocalTyconRef implTycon)) - let fNull2 = TypeNullIsExtraValue g m (generalizedTyconRef (mkLocalTyconRef implTycon)) + let aNull2 = TypeNullIsExtraValueOld g m (generalizedTyconRef (mkLocalTyconRef implTycon)) + let fNull2 = TypeNullIsExtraValueOld g m (generalizedTyconRef (mkLocalTyconRef implTycon)) if aNull2 && not fNull2 then errorR(Error(FSComp.SR.DefinitionsInSigAndImplNotCompatibleImplementationSaysNull2(implTycon.TypeOrMeasureKind.ToString(),implTycon.DisplayName),m)) elif fNull2 && not aNull2 then diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index e7835d3fc4c..e03a1af9062 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -560,11 +560,6 @@ let tryNormalizeMeasureInType g ty = // Some basic type builders //--------------------------------------------------------------------------- -let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) -let KnownNull = Nullness.Known NullnessInfo.WithNull -let KnownNonNull = Nullness.Known NullnessInfo.WithoutNull -let AssumeNonNull = KnownNonNull - let mkNativePtrTy (g:TcGlobals) ty = assert g.nativeptr_tcr.CanDeref // this should always be available, but check anyway TType_app (g.nativeptr_tcr, [ty], KnownNonNull) @@ -708,14 +703,37 @@ let reduceTyconMeasureableOrProvided (g:TcGlobals) (tycon:Tycon) tyargs = let reduceTyconRefMeasureableOrProvided (g:TcGlobals) (tcref:TyconRef) tyargs = reduceTyconMeasureableOrProvided g tcref.Deref tyargs +let tryAddNullToTy (ty:TType) = + let ty = stripTyparEqns ty + match ty with + | TType_var _ -> None + | TType_app (tcr, tinst, _nullness) -> Some (TType_app (tcr, tinst, KnownNull)) + | TType_ucase _ -> None + | TType_tuple _ -> None + | TType_fun (d, r, _nullness) -> Some (TType_fun (d, r, KnownNull)) + | TType_forall _ -> None + | TType_measure _ -> None + +// TODO NULLNESS: Assess for completeness +let applyNullness nullness (ty:TType) = + match nullness with + | NullnessInfo.WithoutNull + | NullnessInfo.Oblivious -> ty + | NullnessInfo.WithNull -> + match tryAddNullToTy ty with + | None -> ty + | Some ty -> ty + let rec stripTyEqnsA g canShortcut ty = let ty = stripTyparEqnsAux canShortcut ty match ty with - | TType_app (tcref, tinst, _nullness) -> // TODO: what happens to this nullness? Currently it is lost. Noted in RFC + | TType_app (tcref, tinst, nullness) -> let tycon = tcref.Deref match tycon.TypeAbbrev with | Some abbrevTy -> - stripTyEqnsA g canShortcut (applyTyconAbbrev abbrevTy tycon tinst) + let reducedTy = applyTyconAbbrev abbrevTy tycon tinst + let reducedTy2 = applyNullness (nullness.Evaluate()) reducedTy + stripTyEqnsA g canShortcut reducedTy2 | None -> // This is the point where we get to add additional coditional normalizing equations // into the type system. Such power! @@ -727,7 +745,9 @@ let rec stripTyEqnsA g canShortcut ty = // Add the equation double<1> = double for units of measure. elif tycon.IsMeasureableReprTycon && List.forall (isDimensionless g) tinst then - stripTyEqnsA g canShortcut (reduceTyconMeasureableOrProvided g tycon tinst) + let reducedTy = reduceTyconMeasureableOrProvided g tycon tinst + let reducedTy2 = applyNullness (nullness.Evaluate()) reducedTy + stripTyEqnsA g canShortcut reducedTy2 else ty | ty -> ty @@ -745,10 +765,12 @@ let evalTupInfoIsStruct aexpr = let rec stripTyEqnsAndErase eraseFuncAndTuple (g:TcGlobals) ty = let ty = stripTyEqns g ty match ty with - | TType_app (tcref, args, _nullness) -> // TODO: what happens to this nullness? Currently it is lost. Noted in RFC + | TType_app (tcref, args, nullness) -> // TODO: what happens to this nullness? Currently it is lost. Noted in RFC let tycon = tcref.Deref if tycon.IsErased then - stripTyEqnsAndErase eraseFuncAndTuple g (reduceTyconMeasureableOrProvided g tycon args) + let reducedTy = reduceTyconMeasureableOrProvided g tycon args + let reducedTy2 = applyNullness (nullness.Evaluate()) reducedTy + stripTyEqnsAndErase eraseFuncAndTuple g reducedTy2 elif tyconRefEq g tcref g.nativeptr_tcr && eraseFuncAndTuple then stripTyEqnsAndErase eraseFuncAndTuple g g.nativeint_ty else @@ -7475,15 +7497,26 @@ let IsUnionTypeWithNullAsTrueValue (g:TcGlobals) (tycon:Tycon) = let TyconCompilesInstanceMembersAsStatic g tycon = IsUnionTypeWithNullAsTrueValue g tycon let TcrefCompilesInstanceMembersAsStatic g (tcref: TyconRef) = TyconCompilesInstanceMembersAsStatic g tcref.Deref +// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this let TypeNullNever g ty = let underlyingTy = stripTyEqnsAndMeasureEqns g ty (isStructTy g underlyingTy) || (isByrefTy g underlyingTy) - +/// Indicates if the type admits the use of 'null' as a value +// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this +let TypeNullIsExtraValueNew g m ty = + if isILReferenceTy g ty then + false + elif TypeNullNever g ty then + false + else + // Putting AllowNullLiteralAttribute(true) on an F# type means 'null' can be used with that type + match tryDestAppTy g ty with ValueSome tcref -> TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true | _ -> false /// Indicates if the type admits the use of 'null' as a value -let TypeNullIsExtraValue g m ty = +// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this +let TypeNullIsExtraValueOld g m ty = if isILReferenceTy g ty || isDelegateTy g ty then // Putting AllowNullLiteralAttribute(false) on an IL or provided type means 'null' can't be used with that type not (match tryDestAppTy g ty with ValueSome tcref -> TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some false | _ -> false) @@ -7493,22 +7526,24 @@ let TypeNullIsExtraValue g m ty = // Putting AllowNullLiteralAttribute(true) on an F# type means 'null' can be used with that type match tryDestAppTy g ty with ValueSome tcref -> TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true | _ -> false +// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this let TypeNullIsTrueValue g ty = (match tryDestAppTy g ty with | ValueSome tcref -> IsUnionTypeWithNullAsTrueValue g tcref.Deref | _ -> false) || (isUnitTy g ty) +/// Indicates if unbox(null) is actively rejected at runtime. See nullability RFC. This applies to types that don't have null +/// as a valid runtime representation under old compatiblity rules. +// +// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this let TypeNullNotLiked g m ty = - not (TypeNullIsExtraValue g m ty) + not (TypeNullIsExtraValueOld g m ty) && not (TypeNullIsTrueValue g ty) && not (TypeNullNever g ty) -let TypeSatisfiesNullConstraint g m ty = - TypeNullIsExtraValue g m ty - let rec TypeHasDefaultValue g m ty = let ty = stripTyEqnsAndMeasureEqns g ty - TypeSatisfiesNullConstraint g m ty + TypeNullIsExtraValueOld g m ty // consider, should this be TypeNullIsExtraValueNew || (isStructTy g ty && // Is it an F# struct type? (if isFSharpStructTy g ty then diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index f4cbe87f5df..f73fe671213 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -46,11 +46,6 @@ val stripTyEqnsWrtErasure: Erasure -> TcGlobals -> TType -> TType // Build common types //------------------------------------------------------------------------- -val KnownNull : Nullness -val KnownNonNull : Nullness -val AssumeNonNull : Nullness -val NewNullnessVar : unit -> Nullness - /// Build a function type val mkFunTy : TType -> TType -> TType @@ -84,6 +79,9 @@ val stripExpr : Expr -> Expr val valsOfBinds : Bindings -> Vals val (|ExprValWithPossibleTypeInst|_|) : Expr -> (ValRef * ValUseFlag * TType list * range) option +/// Ensure that a type admits nullness +val tryAddNullToTy: TType -> TType option + //------------------------------------------------------------------------- // Build decision trees imperatively //------------------------------------------------------------------------- @@ -1137,12 +1135,10 @@ val ModuleNameIsMangled : TcGlobals -> Attribs -> bool val CompileAsEvent : TcGlobals -> Attribs -> bool -val TypeNullIsExtraValue : TcGlobals -> range -> TType -> bool -val TypeNullIsTrueValue : TcGlobals -> TType -> bool -val TypeNullNotLiked : TcGlobals -> range -> TType -> bool +val TypeNullIsExtraValueNew : TcGlobals -> range -> TType -> bool +val TypeNullIsExtraValueOld : TcGlobals -> range -> TType -> bool val TypeNullNever : TcGlobals -> TType -> bool -val TypeSatisfiesNullConstraint : TcGlobals -> range -> TType -> bool val TypeHasDefaultValue : TcGlobals -> range -> TType -> bool val isAbstractTycon : Tycon -> bool diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index 1fc79cf195a..6429f638462 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -689,7 +689,7 @@ let p_nleref x st = p_int (encode_nleref st.occus st.ostrings st.onlerefs st.osc // Simple types are types like "int", represented as TType(Ref_nonlocal(...,"int"),[]). // A huge number of these occur in pickled F# data, so make them unique. -let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a),[]) +let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], ObliviousToNull) let lookup_simpletyp st simpleTyTab x = lookup_uniq st simpleTyTab x let u_encoded_simpletyp st = u_int st let u_simpletyp st = lookup_uniq st st.isimpletys (u_int st) @@ -1571,8 +1571,9 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> p_byte 8 st; p_tys l st else p_byte 0 st; p_tys l st - | TType_app(ERefNonLocal nleref,[]) -> p_byte 1 st; p_simpletyp nleref st - | TType_app (tc,tinst) -> p_byte 2 st; p_tup2 (p_tcref "typ") p_tys (tc,tinst) st + // TODO - nullness + | TType_app(ERefNonLocal nleref,[], _nullness) -> p_byte 1 st; p_simpletyp nleref st + | TType_app (tc,tinst, _nullness) -> p_byte 2 st; p_tup2 (p_tcref "typ") p_tys (tc,tinst) st | TType_fun (d,r,_nullness) -> p_byte 3 st // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value @@ -1592,8 +1593,8 @@ let _ = fill_u_ty (fun st -> match tag with | 0 -> let l = u_tys st in TType_tuple (tupInfoRef, l) | 1 -> u_simpletyp st - | 2 -> let tc = u_tcref st in let tinst = u_tys st in TType_app (tc,tinst) - | 3 -> let d = u_ty st in let r = u_ty st in TType_fun (d,r, AssumeNonNull) + | 2 -> let tc = u_tcref st in let tinst = u_tys st in TType_app (tc, tinst, ObliviousToNull) + | 3 -> let d = u_ty st in let r = u_ty st in TType_fun (d,r, ObliviousToNull) | 4 -> let r = u_tpref st in r.AsType | 5 -> let tps = u_tyar_specs st in let r = u_ty st in TType_forall (tps,r) | 6 -> let unt = u_measure_expr st in TType_measure unt diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 706729abf7f..28ced1a8604 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -83,7 +83,7 @@ module FSharpLib = // Access the initial environment: helpers to build references //------------------------------------------------------------------------- -let private mkNonGenericTy tcref = TType_app(tcref, []) +let private mkNonGenericTy tcref = TType_app(tcref, [], AssumeNonNull) let mkNonLocalTyconRef2 ccu path n = mkNonLocalTyconRef (mkNonLocalEntityRef ccu path) n @@ -345,9 +345,9 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) (* local helpers to build value infos *) - let mkNullableTy ty = TType_app(v_nullable_tcr, [ty]) - let mkByrefTy ty = TType_app(v_byref_tcr, [ty]) - let mkNativePtrTy ty = TType_app(v_nativeptr_tcr, [ty]) + let mkNullableTy ty = TType_app(v_nullable_tcr, [ty], KnownNonNull) + let mkByrefTy ty = TType_app(v_byref_tcr, [ty], KnownNonNull) + let mkNativePtrTy ty = TType_app(v_nativeptr_tcr, [ty], KnownNonNull) let mkFunTy d r = TType_fun (d, r, NewNullnessVar()) let (-->) d r = mkFunTy d r let mkIteratedFunTy dl r = List.foldBack mkFunTy dl r @@ -384,22 +384,22 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let mk_compare_withc_sig ty = [[v_IComparer_ty];[ty]; [ty]], v_int_ty let mk_equality_withc_sig ty = [[v_IEqualityComparer_ty];[ty];[ty]], v_bool_ty let mk_hash_withc_sig ty = [[v_IEqualityComparer_ty]; [ty]], v_int_ty - let mkListTy ty = TType_app(v_list_tcr_nice, [ty]) - let mkSeqTy ty1 = TType_app(v_seq_tcr, [ty1]) - let mkRefCellTy ty = TType_app(v_refcell_tcr_canon, [ty]) - let mkQuerySourceTy ty1 ty2 = TType_app(v_querySource_tcr, [ty1; ty2]) + let mkListTy ty = TType_app(v_list_tcr_nice, [ty], KnownNonNull) + let mkSeqTy ty1 = TType_app(v_seq_tcr, [ty1], KnownNonNull) + let mkRefCellTy ty = TType_app(v_refcell_tcr_canon, [ty], KnownNonNull) + let mkQuerySourceTy ty1 ty2 = TType_app(v_querySource_tcr, [ty1; ty2], KnownNonNull) let v_tcref_System_Collections_IEnumerable = findSysTyconRef sysCollections "IEnumerable"; let mkArrayType rank (ty : TType) : TType = assert (rank >= 1 && rank <= 32) - TType_app(v_il_arr_tcr_map.[rank - 1], [ty]) - let mkLazyTy ty = TType_app(lazy_tcr, [ty]) + TType_app(v_il_arr_tcr_map.[rank - 1], [ty], KnownNonNull) + let mkLazyTy ty = TType_app(lazy_tcr, [ty], KnownNonNull) - let mkPrintfFormatTy aty bty cty dty ety = TType_app(v_format_tcr, [aty;bty;cty;dty; ety]) - let mk_format4_ty aty bty cty dty = TType_app(v_format4_tcr, [aty;bty;cty;dty]) - let mkQuotedExprTy aty = TType_app(v_expr_tcr, [aty]) - let mkRawQuotedExprTy = TType_app(v_raw_expr_tcr, []) - let mkQueryBuilderTy = TType_app(v_query_builder_tcref, []) - let mkLinqExpressionTy aty = TType_app(v_linqExpression_tcr, [aty]) + let mkPrintfFormatTy aty bty cty dty ety = TType_app(v_format_tcr, [aty;bty;cty;dty; ety], KnownNonNull) + let mk_format4_ty aty bty cty dty = TType_app(v_format4_tcr, [aty;bty;cty;dty], KnownNonNull) + let mkQuotedExprTy aty = TType_app(v_expr_tcr, [aty], KnownNonNull) + let mkRawQuotedExprTy = TType_app(v_raw_expr_tcr, [], KnownNonNull) + let mkQueryBuilderTy = TType_app(v_query_builder_tcref, [], KnownNonNull) + let mkLinqExpressionTy aty = TType_app(v_linqExpression_tcr, [aty], KnownNonNull) let v_cons_ucref = mkUnionCaseRef v_list_tcr_canon "op_ColonColon" let v_nil_ucref = mkUnionCaseRef v_list_tcr_canon "op_Nil" @@ -511,8 +511,8 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d match l with | [t1;t2;t3;t4;t5;t6;t7;marker] -> match marker with - | TType_app(tcref, [t8]) when tyconRefEq tcref v_ref_tuple1_tcr -> mkRawRefTupleTy [t1;t2;t3;t4;t5;t6;t7;t8] |> Some - | TType_app(tcref, [t8]) when tyconRefEq tcref v_struct_tuple1_tcr -> mkRawStructTupleTy [t1;t2;t3;t4;t5;t6;t7;t8] |> Some + | TType_app(tcref, [t8], _nullness) when tyconRefEq tcref v_ref_tuple1_tcr -> mkRawRefTupleTy [t1;t2;t3;t4;t5;t6;t7;t8] |> Some + | TType_app(tcref, [t8], _nullness) when tyconRefEq tcref v_struct_tuple1_tcr -> mkRawStructTupleTy [t1;t2;t3;t4;t5;t6;t7;t8] |> Some | TType_tuple (_structness2, t8plus) -> TType_tuple (tupInfo, [t1;t2;t3;t4;t5;t6;t7] @ t8plus) |> Some | _ -> None | [] -> None @@ -528,7 +528,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let decodeTupleTyIfPossible tcref tupInfo l = match tryDecodeTupleTy tupInfo l with | Some ty -> ty - | None -> TType_app(tcref, l) + | None -> TType_app(tcref, l, KnownNonNull) let mk_MFCore_attrib nm : BuiltinAttribInfo = AttribInfo(mkILTyRef(IlxSettings.ilxFsharpCoreLibScopeRef (), FSharpLib.Core + "." + nm), mk_MFCore_tcref fslibCcu nm) @@ -690,7 +690,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let v_seq_generated_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "EnumerateWhile" , None , None , [varb], ([[v_unit_ty --> v_bool_ty]; [mkSeqTy varbTy]], mkSeqTy varbTy)) let v_seq_finally_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "EnumerateThenFinally" , None , None , [varb], ([[mkSeqTy varbTy]; [v_unit_ty --> v_unit_ty]], mkSeqTy varbTy)) let v_seq_of_functions_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "EnumerateFromFunctions" , None , None , [vara;varb], ([[v_unit_ty --> varaTy]; [varaTy --> v_bool_ty]; [varaTy --> varbTy]], mkSeqTy varbTy)) - let v_create_event_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "CreateEvent" , None , None , [vara;varb], ([[varaTy --> v_unit_ty]; [varaTy --> v_unit_ty]; [(v_obj_ty --> (varbTy --> v_unit_ty)) --> varaTy]], TType_app (v_fslib_IEvent2_tcr, [varaTy;varbTy]))) + let v_create_event_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "CreateEvent" , None , None , [vara;varb], ([[varaTy --> v_unit_ty]; [varaTy --> v_unit_ty]; [(v_obj_ty --> (varbTy --> v_unit_ty)) --> varaTy]], TType_app (v_fslib_IEvent2_tcr, [varaTy;varbTy], KnownNonNull))) let v_seq_to_array_info = makeIntrinsicValRef(fslib_MFSeqModule_nleref, "toArray" , None , Some "ToArray", [varb], ([[mkSeqTy varbTy]], mkArrayType 1 varbTy)) let v_seq_to_list_info = makeIntrinsicValRef(fslib_MFSeqModule_nleref, "toList" , None , Some "ToList" , [varb], ([[mkSeqTy varbTy]], mkListTy varbTy)) let v_seq_map_info = makeIntrinsicValRef(fslib_MFSeqModule_nleref, "map" , None , Some "Map" , [vara;varb], ([[varaTy --> varbTy]; [mkSeqTy varaTy]], mkSeqTy varbTy)) @@ -844,7 +844,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let entries = betterEntries let t = Dictionary.newWithSize entries.Length for nm, tcref, builder in entries do - t.Add(nm, fun tcref2 tinst2 -> if tyconRefEq tcref tcref2 then builder tinst2 else TType_app (tcref2, tinst2)) + t.Add(nm, fun tcref2 tinst2 nullness -> if tyconRefEq tcref tcref2 then builder tinst2 else TType_app (tcref2, tinst2, nullness)) betterTypeDict1 <- t t | t -> t @@ -866,30 +866,30 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d /// For logical purposes equate some F# types with .NET types, e.g. TType_tuple == System.Tuple/ValueTuple. /// Doing this normalization is a fairly performance critical piece of code as it is frequently invoked /// in the process of converting .NET metadata to F# internal compiler data structures (see import.fs). - let decompileTy (tcref: EntityRef) tinst = + let decompileTy (tcref: EntityRef) tinst nullness = if compilingFslib then // No need to decompile when compiling FSharp.Core.dll - TType_app (tcref, tinst) + TType_app (tcref, tinst, nullness) else let dict = getDecompileTypeDict() let mutable builder = Unchecked.defaultof<_> if dict.TryGetValue(tcref.Stamp, &builder) then builder tinst - else TType_app (tcref, tinst) + else TType_app (tcref, tinst, nullness) /// For cosmetic purposes "improve" some .NET types, e.g. Int32 --> int32. /// Doing this normalization is a fairly performance critical piece of code as it is frequently invoked /// in the process of converting .NET metadata to F# internal compiler data structures (see import.fs). - let improveTy (tcref: EntityRef) tinst = + let improveTy (tcref: EntityRef) tinst nullness= if compilingFslib then let dict = getBetterTypeDict1() let mutable builder = Unchecked.defaultof<_> - if dict.TryGetValue(tcref.LogicalName, &builder) then builder tcref tinst - else TType_app (tcref, tinst) + if dict.TryGetValue(tcref.LogicalName, &builder) then builder tcref tinst nullness + else TType_app (tcref, tinst, nullness) else let dict = getBetterTypeDict2() let mutable builder = Unchecked.defaultof<_> if dict.TryGetValue(tcref.Stamp, &builder) then builder tinst - else TType_app (tcref, tinst) + else TType_app (tcref, tinst, nullness) override x.ToString() = "" diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index 84d2b8fbe77..0529c7ae857 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -1393,7 +1393,7 @@ let MakeAndPublishVal cenv env (altActualParent, inSig, declKind, vrec, (ValSche if Tastops.MemberIsExplicitImpl cenv.g memberInfo then let slotSig = List.head memberInfo.ImplementedSlotSigs match slotSig.ImplementedType with - | TType_app (tyconref, _) -> Some tyconref.Accessibility + | TType_app (tyconref, _, _nullness) -> Some tyconref.Accessibility | _ -> None else None @@ -1867,7 +1867,9 @@ let FreshenTyconRef m rigid (tcref:TyconRef) declaredTyconTypars = tps |> List.iter (fun tp -> tp.SetRigidity rigid) let renaming, tinst = FixupNewTypars m [] [] tpsorig tps - (TType_app(tcref, List.map mkTyparTy tpsorig), tps, renaming, TType_app(tcref, tinst)) + let origObjTy = TType_app(tcref, List.map mkTyparTy tpsorig, KnownNonNull) + let freshTy = TType_app(tcref, tinst, KnownNonNull) + (origObjTy, tps, renaming, freshTy) let FreshenPossibleForallTy g m rigid ty = let tpsorig, tau = tryDestForallTy g ty @@ -1881,7 +1883,7 @@ let FreshenPossibleForallTy g m rigid ty = let infoOfTyconRef m (tcref:TyconRef) = let tps, renaming, tinst = FreshenTypeInst m (tcref.Typars m) - tps, renaming, tinst, TType_app (tcref, tinst) + tps, renaming, tinst, TType_app (tcref, tinst, AssumeNonNull) /// Given a abstract method, which may be a generic method, freshen the type in preparation @@ -2193,7 +2195,7 @@ module GeneralizationHelpers = match tp.Constraints |> List.partition (function (TyparConstraint.CoercesTo _) -> true | _ -> false) with | [TyparConstraint.CoercesTo(cxty, _)], others -> // Throw away null constraints if they are implied - if others |> List.exists (function (TyparConstraint.SupportsNull(_)) -> not (TypeSatisfiesNullConstraint cenv.g m cxty) | _ -> true) + if others |> List.exists (function (TyparConstraint.SupportsNull(_)) -> not (TypeNullIsExtraValueOld cenv.g m cxty) | _ -> true) then None else Some cxty | _ -> None @@ -4646,6 +4648,19 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped errorR(Error(FSComp.SR.parsInvalidLiteralInType(), m)) NewErrorType (), tpenv + | SynType.WithNull(innerTy, m) -> + let innerTyC, tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv innerTy + if TypeNullNever cenv.g innerTyC then + let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC + errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString, tyString), m)) + match tryAddNullToTy innerTyC with + | None -> + let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC + errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString, tyString), m)) + innerTyC, tpenv + | Some innerTyNull -> + AddCxTypeMustSupportNull env.DisplayEnv cenv.css m NoTrace innerTyNull + innerTyNull, tpenv | SynType.MeasurePower(ty, exponent, m) -> match optKind with @@ -4959,7 +4974,7 @@ and TcTypeApp cenv newOk checkCxs occ env tpenv m tcref pathTypeArgs (synArgTys: List.iter2 (UnifyTypes cenv env m) tinst actualArgTys // Try to decode System.Tuple --> F~ tuple types etc. - let ty = cenv.g.decompileType tcref actualArgTys + let ty = cenv.g.decompileType tcref actualArgTys KnownNonNull ty, tpenv @@ -4983,7 +4998,7 @@ and TcNestedTypeApplication cenv newOk checkCxs occ env tpenv mWholeTypeApp ty t let ty = convertToTypeWithMetadataIfPossible cenv.g ty if not (isAppTy cenv.g ty) then error(Error(FSComp.SR.tcTypeHasNoNestedTypes(), mWholeTypeApp)) match ty with - | TType_app(tcref, tinst) -> + | TType_app(tcref, tinst, _nullness) -> let pathTypeArgs = List.truncate (max (tinst.Length - tcref.Typars(mWholeTypeApp).Length) 0) tinst TcTypeApp cenv newOk checkCxs occ env tpenv mWholeTypeApp tcref pathTypeArgs tyargs | _ -> error(InternalError("TcNestedTypeApplication: expected type application", mWholeTypeApp)) @@ -8636,7 +8651,7 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del (currentIndex <> SEEN_NAMED_ARGUMENT) && (currentIndex < numArgTys) && match stripTyEqns cenv.g argTys.[currentIndex] with - | TType_app(tcref, _) -> tyconRefEq cenv.g cenv.g.bool_tcr tcref || tyconRefEq cenv.g cenv.g.system_Bool_tcref tcref + | TType_app(tcref, _, _) -> tyconRefEq cenv.g cenv.g.bool_tcr tcref || tyconRefEq cenv.g cenv.g.system_Bool_tcref tcref | TType_var(_) -> true | _ -> false @@ -15302,8 +15317,8 @@ module EstablishTypeDefinitionCores = let allowNullLiteralAttributeCheck() = if hasAllowNullLiteralAttr then - tycon.TypeContents.tcaug_super |> Option.iter (fun ty -> if not (TypeNullIsExtraValue cenv.g m ty) then errorR (Error(FSComp.SR.tcAllowNullTypesMayOnlyInheritFromAllowNullTypes(), m))) - tycon.ImmediateInterfaceTypesOfFSharpTycon |> List.iter (fun ty -> if not (TypeNullIsExtraValue cenv.g m ty) then errorR (Error(FSComp.SR.tcAllowNullTypesMayOnlyInheritFromAllowNullTypes(), m))) + tycon.TypeContents.tcaug_super |> Option.iter (fun ty -> if not (TypeNullIsExtraValueOld cenv.g m ty) then errorR (Error(FSComp.SR.tcAllowNullTypesMayOnlyInheritFromAllowNullTypes(), m))) + tycon.ImmediateInterfaceTypesOfFSharpTycon |> List.iter (fun ty -> if not (TypeNullIsExtraValueOld cenv.g m ty) then errorR (Error(FSComp.SR.tcAllowNullTypesMayOnlyInheritFromAllowNullTypes(), m))) let structLayoutAttributeCheck(allowed) = @@ -15628,7 +15643,7 @@ module EstablishTypeDefinitionCores = match stripTyparEqns ty with | TType_tuple (_, l) -> accInAbbrevTypes l acc | TType_ucase (UCRef(tc, _), tinst) - | TType_app (tc, tinst) -> + | TType_app (tc, tinst, _) -> let tycon2 = tc.Deref let acc = accInAbbrevTypes tinst acc // Record immediate recursive references @@ -15738,7 +15753,7 @@ module EstablishTypeDefinitionCores = and accStructFieldType structTycon structTyInst fspec fieldTy (doneTypes, acc) = let fieldTy = stripTyparEqns fieldTy match fieldTy with - | TType_app (tcref2 , tinst2) when tcref2.IsStructOrEnumTycon -> + | TType_app (tcref2, tinst2, _nullness) when tcref2.IsStructOrEnumTycon -> // The field is a struct. // An edge (tycon, tycon2) should be recorded, unless it is the "static self-typed field" case. let tycon2 = tcref2.Deref @@ -15758,7 +15773,7 @@ module EstablishTypeDefinitionCores = else let acc = insertEdgeToTycon tycon2 acc // collect edge (tycon, tycon2), if tycon2 is initial. accStructInstanceFields fieldTy tycon2 tinst2 (doneTypes, acc) // recurse through struct field looking for more edges - | TType_app (tcref2 , tinst2) when tcref2.IsTypeAbbrev -> + | TType_app (tcref2, tinst2, _nullness) when tcref2.IsTypeAbbrev -> // The field is a type abbreviation. Expand and repeat. accStructFieldType structTycon structTyInst fspec (reduceTyconRefAbbrev tcref2 tinst2) (doneTypes, acc) | _ -> diff --git a/src/fsharp/TypeRelations.fs b/src/fsharp/TypeRelations.fs index 929ea14fee8..5f4634b8dad 100755 --- a/src/fsharp/TypeRelations.fs +++ b/src/fsharp/TypeRelations.fs @@ -35,14 +35,14 @@ let rec TypeDefinitelySubsumesTypeNoCoercion ndeep g amap m ty1 ty2 = let ty1 = stripTyEqns g ty1 let ty2 = stripTyEqns g ty2 match ty1,ty2 with - | TType_app (tc1,l1) ,TType_app (tc2,l2) when tyconRefEq g tc1 tc2 -> + | TType_app (tc1,l1, _nullness1) ,TType_app (tc2,l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this List.lengthsEqAndForall2 (typeEquiv g) l1 l2 | TType_ucase (tc1,l1) ,TType_ucase (tc2,l2) when g.unionCaseRefEq tc1 tc2 -> List.lengthsEqAndForall2 (typeEquiv g) l1 l2 | TType_tuple (tupInfo1,l1) ,TType_tuple (tupInfo2,l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (typeEquiv g) l1 l2 - | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> + | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this typeEquiv g d1 d2 && typeEquiv g r1 r2 | TType_measure measure1, TType_measure measure2 -> measureEquiv g measure1 measure2 @@ -73,12 +73,12 @@ let rec TypesFeasiblyEquiv ndeep g amap m ty1 ty2 = // QUERY: should these be false for non-equal rigid typars? warn-if-not-rigid typars? | TType_var _ , _ | _, TType_var _ -> true - | TType_app (tc1,l1) ,TType_app (tc2,l2) when tyconRefEq g tc1 tc2 -> + | TType_app (tc1,l1, _nullness1) ,TType_app (tc2,l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 | TType_tuple (tupInfo1, l1) ,TType_tuple (tupInfo2, l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 - | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> + | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this (TypesFeasiblyEquiv ndeep g amap m) d1 d2 && (TypesFeasiblyEquiv ndeep g amap m) r1 r2 | TType_measure _, TType_measure _ -> true @@ -95,12 +95,12 @@ let rec TypeFeasiblySubsumesType ndeep g amap m ty1 canCoerce ty2 = // QUERY: should these be false for non-equal rigid typars? warn-if-not-rigid typars? | TType_var _ , _ | _, TType_var _ -> true - | TType_app (tc1,l1) ,TType_app (tc2,l2) when tyconRefEq g tc1 tc2 -> + | TType_app (tc1,l1, _nullness1) ,TType_app (tc2,l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 | TType_tuple (tupInfo1,l1) ,TType_tuple (tupInfo2,l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 - | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> + | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this (TypesFeasiblyEquiv ndeep g amap m) d1 d2 && (TypesFeasiblyEquiv ndeep g amap m) r1 r2 | TType_measure _, TType_measure _ -> true diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs index 59dddd88122..2f454d08034 100644 --- a/src/fsharp/ast.fs +++ b/src/fsharp/ast.fs @@ -458,6 +458,10 @@ and | StaticConstantExpr of expr:SynExpr * range:range /// F# syntax : ident=1 etc., used in static parameters to type providers | StaticConstantNamed of expr:SynType * SynType * range:range + + /// F# syntax : type | null + | WithNull of SynType * range:range + /// Get the syntactic range of source code covered by this construct. member x.Range = match x with @@ -475,6 +479,7 @@ and | SynType.StaticConstantNamed (range=m) | SynType.HashConstraint (range=m) | SynType.MeasureDivide (range=m) + | SynType.WithNull (range=m) | SynType.MeasurePower (range=m) -> m | SynType.LongIdent(lidwd) -> lidwd.Range diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs index c5b1041a970..8079cc337a3 100644 --- a/src/fsharp/import.fs +++ b/src/fsharp/import.fs @@ -149,8 +149,8 @@ let CanImportILTypeRef (env:ImportMap) m (tref:ILTypeRef) = /// /// Prefer the F# abbreviation for some built-in types, e.g. 'string' rather than /// 'System.String', since we prefer the F# abbreviation to the .NET equivalents. -let ImportTyconRefApp (env:ImportMap) tcref tyargs = - env.g.improveType tcref tyargs +let ImportTyconRefApp (env:ImportMap) tcref tyargs nullness = + env.g.improveType tcref tyargs nullness /// Import an IL type as an F# type. let rec ImportILType (env:ImportMap) m tinst ty = @@ -166,7 +166,8 @@ let rec ImportILType (env:ImportMap) m tinst ty = | ILType.Boxed tspec | ILType.Value tspec -> let tcref = ImportILTypeRef env m tspec.TypeRef let inst = tspec.GenericArgs |> List.map (ImportILType env m tinst) - ImportTyconRefApp env tcref inst + let nullness = ObliviousToNull // TODO: give this the right setting + ImportTyconRefApp env tcref inst nullness | ILType.Modified(_,tref,ILType.Byref ty) when tref.Name = "System.Runtime.InteropServices.InAttribute" -> mkInByrefTy env.g (ImportILType env m tinst ty) | ILType.Byref ty -> mkByrefTy env.g (ImportILType env m tinst ty) @@ -298,11 +299,11 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: if tp.Kind = TyparKind.Measure then let rec conv ty = match ty with - | TType_app (tcref,[t1;t2]) when tyconRefEq g tcref g.measureproduct_tcr -> Measure.Prod (conv t1, conv t2) - | TType_app (tcref,[t1]) when tyconRefEq g tcref g.measureinverse_tcr -> Measure.Inv (conv t1) - | TType_app (tcref,[]) when tyconRefEq g tcref g.measureone_tcr -> Measure.One - | TType_app (tcref,[]) when tcref.TypeOrMeasureKind = TyparKind.Measure -> Measure.Con tcref - | TType_app (tcref,_) -> + | TType_app (tcref,[t1;t2],_) when tyconRefEq g tcref g.measureproduct_tcr -> Measure.Prod (conv t1, conv t2) + | TType_app (tcref,[t1],_) when tyconRefEq g tcref g.measureinverse_tcr -> Measure.Inv (conv t1) + | TType_app (tcref,[],_) when tyconRefEq g tcref g.measureone_tcr -> Measure.One + | TType_app (tcref,[],_) when tcref.TypeOrMeasureKind = TyparKind.Measure -> Measure.Con tcref + | TType_app (tcref,_,_) -> errorR(Error(FSComp.SR.impInvalidMeasureArgument1(tcref.CompiledName, tp.Name),m)) Measure.One | _ -> @@ -313,7 +314,9 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: else genericArg) - ImportTyconRefApp env tcref genericArgs + let nullness = ObliviousToNull + + ImportTyconRefApp env tcref genericArgs nullness /// Import a provided method reference as an Abstract IL method reference diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs index 2a7d82d8afd..13a4789fb9b 100755 --- a/src/fsharp/infos.fs +++ b/src/fsharp/infos.fs @@ -93,7 +93,7 @@ let GetSuperTypeOfType g amap m ty = None /// Make a type for System.Collections.Generic.IList -let mkSystemCollectionsGenericIListTy (g: TcGlobals) ty = TType_app(g.tcref_System_Collections_Generic_IList,[ty]) +let mkSystemCollectionsGenericIListTy (g: TcGlobals) ty = TType_app(g.tcref_System_Collections_Generic_IList,[ty],AssumeNonNull) [] /// Indicates whether we can skip interface types that lie outside the reference set @@ -123,6 +123,7 @@ let rec GetImmediateInterfacesOfType skipUnref g amap m ty = #if !NO_EXTENSIONTYPING | ProvidedTypeMetadata info -> [ for ity in info.ProvidedType.PApplyArray((fun st -> st.GetInterfaces()), "GetInterfaces", m) do + // TODO NULLNESS: the nullness of ty should propagate to each of these yield Import.ImportProvidedType amap m ity ] #endif | ILTypeMetadata (TILObjectReprData(scoref,_,tdef)) -> @@ -134,6 +135,7 @@ let rec GetImmediateInterfacesOfType skipUnref g amap m ty = // succeeded with more reported. There are pathological corner cases where this // doesn't apply: e.g. for mscorlib interfaces like IComparable, but we can always // assume those are present. + // TODO NULLNESS: the nullness of ty should propagate to each of these tdef.Implements |> List.choose (fun ity -> if skipUnref = SkipUnrefInterfaces.No || CanImportILType scoref amap m ity then Some (ImportILType scoref amap m tinst ity) @@ -1500,7 +1502,7 @@ type MethInfo = let formalRetTy, formalParams = match x with | ILMeth(_,ilminfo,_) -> - let ftinfo = ILTypeInfo.FromType g (TType_app(tcref,formalEnclosingTyparTys)) + let ftinfo = ILTypeInfo.FromType g (TType_app(tcref,formalEnclosingTyparTys,AssumeNonNull)) // TODO NULLNESS - is this the right assumption? let formalRetTy = ImportReturnTypeFromMetaData amap m ilminfo.RawMetadata.Return.Type ftinfo.ILScopeRef ftinfo.TypeInstOfRawMetadata formalMethTyparTys let formalParams = [ [ for p in ilminfo.RawMetadata.Parameters do @@ -1752,7 +1754,7 @@ type RecdFieldInfo = member x.FieldType = actualTyOfRecdFieldRef x.RecdFieldRef x.TypeInst /// Get the enclosing (declaring) type of the field in an F#-declared record, class or struct type - member x.DeclaringType = TType_app (x.RecdFieldRef.TyconRef,x.TypeInst) + member x.DeclaringType = TType_app (x.RecdFieldRef.TyconRef,x.TypeInst, AssumeNonNull) // TODO NULLNESS - is this the right assumption? override x.ToString() = x.TyconRef.ToString() + "::" + x.Name diff --git a/src/fsharp/lexhelp.fs b/src/fsharp/lexhelp.fs index b7603baf15f..8a544642101 100644 --- a/src/fsharp/lexhelp.fs +++ b/src/fsharp/lexhelp.fs @@ -284,6 +284,7 @@ module Keywords = FSHARP, "__token_ODO" ,ODO FSHARP, "__token_OLET" ,OLET(true) FSHARP, "__token_constraint",CONSTRAINT + FSHARP, "__hacknull",HACKNULL ] (*------- reserved keywords which are ml-compatibility ids *) @ List.map (fun s -> (FSHARP,s,RESERVED)) diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy index 9ca12c58e5f..56dbc1a91ff 100644 --- a/src/fsharp/pars.fsy +++ b/src/fsharp/pars.fsy @@ -203,6 +203,7 @@ let rangeOfLongIdent(lid:LongIdent) = %token GREATER_RBRACK STRUCT SIG %token STATIC MEMBER CLASS ABSTRACT OVERRIDE DEFAULT CONSTRUCTOR INHERIT %token EXTERN VOID PUBLIC PRIVATE INTERNAL GLOBAL +%token HACKNULL /* for parser 'escape hatch' out of expression context without consuming the 'recover' token */ %token TYPE_COMING_SOON TYPE_IS_HERE MODULE_COMING_SOON MODULE_IS_HERE @@ -4371,6 +4372,18 @@ appTypeConPower: { $1 } appType: + | appType BAR NULL + { SynType.WithNull($1,lhs parseState) } + + | appType HACKNULL + { SynType.WithNull($1,lhs parseState) } + + | appType QMARK + { SynType.WithNull($1,lhs parseState) } + + | appType OR NULL + { SynType.WithNull($1,lhs parseState) } + | appType arrayTypeSuffix { SynType.Array($2,$1,lhs parseState) } diff --git a/src/fsharp/service/ServiceDeclarationLists.fs b/src/fsharp/service/ServiceDeclarationLists.fs index fc87de946d1..69b39bff513 100644 --- a/src/fsharp/service/ServiceDeclarationLists.fs +++ b/src/fsharp/service/ServiceDeclarationLists.fs @@ -571,10 +571,10 @@ type FSharpDeclarationListInfo(declarations: FSharpDeclarationListItem[], isForT items |> List.map (fun x -> match x.Item with - | Item.Types (_,(TType_app(tcref,_) :: _)) -> { x with MinorPriority = 1 + tcref.TyparsNoRange.Length } + | Item.Types (_,(TType_app(tcref,_,_) :: _)) -> { x with MinorPriority = 1 + tcref.TyparsNoRange.Length } // Put delegate ctors after types, sorted by #typars. RemoveDuplicateItems will remove FakeInterfaceCtor and DelegateCtor if an earlier type is also reported with this name - | Item.FakeInterfaceCtor (TType_app(tcref,_)) - | Item.DelegateCtor (TType_app(tcref,_)) -> { x with MinorPriority = 1000 + tcref.TyparsNoRange.Length } + | Item.FakeInterfaceCtor (TType_app(tcref,_,_)) + | Item.DelegateCtor (TType_app(tcref,_,_)) -> { x with MinorPriority = 1000 + tcref.TyparsNoRange.Length } // Put type ctors after types, sorted by #typars. RemoveDuplicateItems will remove DefaultStructCtors if a type is also reported with this name | Item.CtorGroup (_, (cinfo :: _)) -> { x with MinorPriority = 1000 + 10 * cinfo.DeclaringTyconRef.TyparsNoRange.Length } | Item.MethodGroup(_, minfo :: _, _) -> { x with IsOwnMember = tyconRefOptEq x.Type minfo.DeclaringTyconRef } diff --git a/src/fsharp/service/ServiceLexing.fs b/src/fsharp/service/ServiceLexing.fs index abf3cde1c70..6a7a5460d3b 100755 --- a/src/fsharp/service/ServiceLexing.fs +++ b/src/fsharp/service/ServiceLexing.fs @@ -266,6 +266,7 @@ module internal TokenClassifications = | IF | THEN | ELSE | DO | DONE | LET(_) | IN (*| NAMESPACE*) | CONST | HIGH_PRECEDENCE_PAREN_APP | FIXED | HIGH_PRECEDENCE_BRACK_APP + | HACKNULL | TYPE_COMING_SOON | TYPE_IS_HERE | MODULE_COMING_SOON | MODULE_IS_HERE -> (FSharpTokenColorKind.Keyword,FSharpTokenCharKind.Keyword,FSharpTokenTriggerClass.None) diff --git a/src/fsharp/service/service.fs b/src/fsharp/service/service.fs index be7157ddde7..620153fce79 100644 --- a/src/fsharp/service/service.fs +++ b/src/fsharp/service/service.fs @@ -965,10 +965,10 @@ type TypeCheckInfo items |> List.sortBy (fun d -> let n = match d.Item with - | Item.Types (_,(TType_app(tcref,_) :: _)) -> 1 + tcref.TyparsNoRange.Length + | Item.Types (_,(TType_app(tcref,_,_) :: _)) -> 1 + tcref.TyparsNoRange.Length // Put delegate ctors after types, sorted by #typars. RemoveDuplicateItems will remove FakeInterfaceCtor and DelegateCtor if an earlier type is also reported with this name - | Item.FakeInterfaceCtor (TType_app(tcref,_)) - | Item.DelegateCtor (TType_app(tcref,_)) -> 1000 + tcref.TyparsNoRange.Length + | Item.FakeInterfaceCtor (TType_app(tcref,_,_)) + | Item.DelegateCtor (TType_app(tcref,_,_)) -> 1000 + tcref.TyparsNoRange.Length // Put type ctors after types, sorted by #typars. RemoveDuplicateItems will remove DefaultStructCtors if a type is also reported with this name | Item.CtorGroup (_, (cinfo :: _)) -> 1000 + 10 * cinfo.DeclaringTyconRef.TyparsNoRange.Length | _ -> 0 @@ -982,11 +982,11 @@ type TypeCheckInfo let items = items |> List.groupBy (fun d -> match d.Item with - | Item.Types (_,(TType_app(tcref,_) :: _)) + | Item.Types (_,(TType_app(tcref,_,_) :: _)) | Item.ExnCase tcref -> tcref.LogicalName | Item.UnqualifiedType(tcref :: _) - | Item.FakeInterfaceCtor (TType_app(tcref,_)) - | Item.DelegateCtor (TType_app(tcref,_)) -> tcref.CompiledName + | Item.FakeInterfaceCtor (TType_app(tcref,_,_)) + | Item.DelegateCtor (TType_app(tcref,_,_)) -> tcref.CompiledName | Item.CtorGroup (_, (cinfo :: _)) -> cinfo.ApparentEnclosingTyconRef.CompiledName | _ -> d.Item.DisplayName) @@ -1210,7 +1210,7 @@ type TypeCheckInfo //Item.Value(vref) None - | Item.Types (_, TType_app (tr, _) :: _) when tr.IsLocalRef && tr.IsTypeAbbrev -> None + | Item.Types (_, TType_app (tr, _, _) :: _) when tr.IsLocalRef && tr.IsTypeAbbrev -> None | Item.Types (_, [ AppTy g (tr, _) ]) when not tr.IsLocalRef -> match tr.TypeReprInfo, tr.PublicPath with @@ -1284,7 +1284,7 @@ type TypeCheckInfo let (|OptionalArgumentAttribute|_|) ttype = match ttype with - | TType.TType_app(tref, _) when tref.Stamp = g.attrib_OptionalArgumentAttribute.TyconRef.Stamp -> Some() + | TType.TType_app(tref, _, _) when tref.Stamp = g.attrib_OptionalArgumentAttribute.TyconRef.Stamp -> Some() | _ -> None let (|KeywordIntrinsicValue|_|) (vref: ValRef) = @@ -1370,7 +1370,7 @@ type TypeCheckInfo Some (m, SemanticClassificationType.Interface) | CNR(_, Item.Types(_, types), LegitTypeOccurence, _, _, _, m) when types |> List.exists (isStructTy g) -> Some (m, SemanticClassificationType.ValueType) - | CNR(_, Item.Types(_, TType_app(tyconRef, TType_measure _ :: _) :: _), LegitTypeOccurence, _, _, _, m) when isStructTyconRef tyconRef -> + | CNR(_, Item.Types(_, TType_app(tyconRef, (TType_measure _ :: _), _) :: _), LegitTypeOccurence, _, _, _, m) when isStructTyconRef tyconRef -> Some (m, SemanticClassificationType.ValueType) | CNR(_, Item.Types(_, types), LegitTypeOccurence, _, _, _, m) when types |> List.exists isDisposableTy -> Some (m, SemanticClassificationType.Disposable) diff --git a/src/fsharp/symbols/Exprs.fs b/src/fsharp/symbols/Exprs.fs index f6213ef2ff6..8de58e61cfc 100644 --- a/src/fsharp/symbols/Exprs.fs +++ b/src/fsharp/symbols/Exprs.fs @@ -271,7 +271,7 @@ module FSharpExprConvert = let (|TTypeConvOp|_|) (cenv:SymbolEnv) ty = let g = cenv.g match ty with - | TType_app (tcref,_) -> + | TType_app (tcref,_, _) -> match tcref with | _ when tyconRefEq g tcref g.sbyte_tcr -> Some mkCallToSByteOperator | _ when tyconRefEq g tcref g.byte_tcr -> Some mkCallToByteOperator @@ -698,7 +698,7 @@ module FSharpExprConvert = let op2 = convertOp2 cenv.g m ty2 op1 ConvExprPrim cenv env op2 - | TOp.ILAsm([ ILConvertOp convertOp ], [TType_app (tcref,_)]), _, [arg] -> + | TOp.ILAsm([ ILConvertOp convertOp ], [TType_app (tcref,_, _)]), _, [arg] -> let ty = tyOfExpr cenv.g arg let op = if tyconRefEq cenv.g tcref cenv.g.char_tcr diff --git a/src/fsharp/symbols/SymbolHelpers.fs b/src/fsharp/symbols/SymbolHelpers.fs index aa3ecc7cab5..b3842e6d643 100644 --- a/src/fsharp/symbols/SymbolHelpers.fs +++ b/src/fsharp/symbols/SymbolHelpers.fs @@ -474,7 +474,7 @@ module internal SymbolHelpers = // Generalize to get a formal signature let formalTypars = tcref.Typars(m) let formalTypeInst = generalizeTypars formalTypars - let ty = TType_app(tcref, formalTypeInst) + let ty = TType_app(tcref, formalTypeInst, ObliviousToNull) if isILAppTy g ty then let formalTypeInfo = ILTypeInfo.FromType g ty Some(nlref.Ccu.FileName, formalTypars, formalTypeInfo) @@ -609,7 +609,7 @@ module internal SymbolHelpers = | Item.RecdField rfinfo -> mkXmlComment (GetXmlDocSigOfRecdFieldInfo rfinfo) | Item.NewDef _ -> FSharpXmlDoc.None | Item.ILField finfo -> mkXmlComment (GetXmlDocSigOfILFieldInfo infoReader m finfo) - | Item.Types(_, ((TType_app(tcref, _)) :: _)) -> mkXmlComment (GetXmlDocSigOfEntityRef infoReader m tcref) + | Item.Types(_, ((TType_app(tcref, _, _)) :: _)) -> mkXmlComment (GetXmlDocSigOfEntityRef infoReader m tcref) | Item.CustomOperation (_, _, Some minfo) -> mkXmlComment (GetXmlDocSigOfMethInfo infoReader m minfo) | Item.TypeVar _ -> FSharpXmlDoc.None | Item.ModuleOrNamespaces(modref :: _) -> mkXmlComment (GetXmlDocSigOfEntityRef infoReader m modref) @@ -762,8 +762,8 @@ module internal SymbolHelpers = | Item.UnqualifiedType(tcRefs1), Item.UnqualifiedType(tcRefs2) -> List.zip tcRefs1 tcRefs2 |> List.forall (fun (tcRef1, tcRef2) -> tyconRefEq g tcRef1 tcRef2) - | Item.Types(_, [TType.TType_app(tcRef1, _)]), Item.UnqualifiedType([tcRef2]) -> tyconRefEq g tcRef1 tcRef2 - | Item.UnqualifiedType([tcRef1]), Item.Types(_, [TType.TType_app(tcRef2, _)]) -> tyconRefEq g tcRef1 tcRef2 + | Item.Types(_, [TType.TType_app(tcRef1, _, _)]), Item.UnqualifiedType([tcRef2]) -> tyconRefEq g tcRef1 tcRef2 + | Item.UnqualifiedType([tcRef1]), Item.Types(_, [TType.TType_app(tcRef2, _, _)]) -> tyconRefEq g tcRef1 tcRef2 | _ -> false) member x.GetHashCode item = @@ -934,7 +934,7 @@ module internal SymbolHelpers = | Item.MethodGroup(_, minfo :: _, _) -> GetXmlCommentForMethInfoItem infoReader m item minfo - | Item.Types(_, ((TType_app(tcref, _)):: _)) -> + | Item.Types(_, ((TType_app(tcref, _, _)):: _)) -> GetXmlCommentForItemAux (if tyconRefUsesLocalXmlDoc g.compilingFslib tcref || tcref.XmlDoc.NonEmpty then Some tcref.XmlDoc else None) infoReader m item | Item.ModuleOrNamespaces((modref :: _) as modrefs) -> @@ -973,7 +973,7 @@ module internal SymbolHelpers = let g = infoReader.g let amap = infoReader.amap match item with - | Item.Types(_, ((TType_app(tcref, _)):: _)) + | Item.Types(_, ((TType_app(tcref, _, _)):: _)) | Item.UnqualifiedType(tcref :: _) -> let ty = generalizedTyconRef tcref Infos.ExistsHeadTypeInEntireHierarchy g amap range0 ty g.tcref_System_Attribute @@ -1158,7 +1158,7 @@ module internal SymbolHelpers = FSharpStructuredToolTipElement.Single(layout, xml) // Types. - | Item.Types(_, ((TType_app(tcref, _)):: _)) + | Item.Types(_, ((TType_app(tcref, _, _)):: _)) | Item.UnqualifiedType (tcref :: _) -> let denv = { denv with shortTypeNames = true } let layout = NicePrint.layoutTycon denv infoReader AccessibleFromSomewhere m (* width *) tcref.Deref diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 6cdfbe913aa..18b43dd768f 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -3906,7 +3906,7 @@ and Nullness = | Known info -> info | Variable v -> v.Evaluate() - override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> " | null" | NullnessInfo.WithoutNull -> "" | NullnessInfo.Oblivious -> " lol" + override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.Oblivious -> " lol" and NullnessVar = { mutable solution: Nullness option } @@ -5819,3 +5819,9 @@ let FSharpOptimizationDataResourceName2 = "FSharpOptimizationInfo." let FSharpSignatureDataResourceName2 = "FSharpSignatureInfo." +let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) + +let ObliviousToNull = Nullness.Known NullnessInfo.Oblivious +let KnownNull = Nullness.Known NullnessInfo.WithNull +let KnownNonNull = Nullness.Known NullnessInfo.WithoutNull +let AssumeNonNull = KnownNonNull diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index 05d6ee76c54..13755bff398 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index fdce970796c..48c27ea3843 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.en.xlf b/src/fsharp/xlf/FSComp.txt.en.xlf index c56232af4bd..e627891aa7a 100644 --- a/src/fsharp/xlf/FSComp.txt.en.xlf +++ b/src/fsharp/xlf/FSComp.txt.en.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index c6a73702da9..3f6e078322f 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index f78d170be49..7739224266d 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 5a499b9e702..fad47881303 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index 782c0613974..9debd8cf5da 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index e00fdb729bd..d5c6caa254a 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index c07c9316f30..9d5e8faaf53 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 8956263b4da..738e8609706 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index b658c0ec23f..017bbbe6884 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index ae8e758dfd0..61589452f0e 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index e3273d74087..83fe5364c54 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index 835390456ac..e2ec8633403 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -7067,6 +7067,11 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. + + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + \ No newline at end of file From 7daf0297fdbb5cdb7984bdcf23ddfe2531265348 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 16 Oct 2018 19:00:27 +0100 Subject: [PATCH 005/137] nullness fixes --- src/fsharp/CompileOps.fs | 14 ++++---------- src/fsharp/FSStrings.resx | 4 ++-- src/fsharp/xlf/FSStrings.cs.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.de.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.en.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.es.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.fr.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.it.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.ja.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.ko.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.pl.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.pt-BR.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.ru.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.tr.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.zh-Hans.xlf | 10 ++++++++++ src/fsharp/xlf/FSStrings.zh-Hant.xlf | 10 ++++++++++ 16 files changed, 146 insertions(+), 12 deletions(-) diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 5b48fcaa84d..8024e9c5a2a 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -446,7 +446,7 @@ let ConstraintSolverTupleDiffLengthsE() = DeclareResourceString("ConstraintSolve let ConstraintSolverInfiniteTypesE() = DeclareResourceString("ConstraintSolverInfiniteTypes", "%s%s") let ConstraintSolverMissingConstraintE() = DeclareResourceString("ConstraintSolverMissingConstraint", "%s") let ConstraintSolverTypesNotInEqualityRelation1E() = DeclareResourceString("ConstraintSolverTypesNotInEqualityRelation1", "%s%s") -let ConstraintSolverNullnessWarningWithTypesE() = DeclareResourceString("ConstraintSolverNullnessWarningWithTypes", "%s%s%s") +let ConstraintSolverNullnessWarningWithTypesE() = DeclareResourceString("ConstraintSolverNullnessWarningWithTypes", "%s%s") let ConstraintSolverNullnessWarningWithTypeE() = DeclareResourceString("ConstraintSolverNullnessWarningWithType", "%s") let ConstraintSolverTypesNotInEqualityRelation2E() = DeclareResourceString("ConstraintSolverTypesNotInEqualityRelation2", "%s%s") let ConstraintSolverTypesNotInSubsumptionRelationE() = DeclareResourceString("ConstraintSolverTypesNotInSubsumptionRelation", "%s%s%s") @@ -637,17 +637,11 @@ let OutputPhasedErrorR (os:StringBuilder) (err:PhasedDiagnostic) = if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore - | ConstraintSolverNullnessWarningWithTypes(denv, ty1, ty2, nullness, nullness2, m, m2) -> + | ConstraintSolverNullnessWarningWithTypes(denv, ty1, ty2, _nullness, _nullness2, m, m2) -> let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv ty1 ty2 - let msg = - // TODO: Put this in FSComp.SR. - match nullness, nullness2 with - | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> "Expected the type to have null." - | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> "Expected the type to not have null." - | _ -> String.Empty - - os.Append(ConstraintSolverNullnessWarningWithTypesE().Format t1 t2 msg) |> ignore + + os.Append(ConstraintSolverNullnessWarningWithTypesE().Format t1 t2) |> ignore if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore diff --git a/src/fsharp/FSStrings.resx b/src/fsharp/FSStrings.resx index 4279b472cd0..c2d4c288913 100644 --- a/src/fsharp/FSStrings.resx +++ b/src/fsharp/FSStrings.resx @@ -130,10 +130,10 @@ A type parameter is missing a constraint '{0}' - Nullness warning: The types {0} and {1} do not have compatible nullability. {2}' + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The type {0} does not support nullness.' + Nullness warning: The type '{0}' does not support nullness. The unit of measure '{0}' does not match the unit of measure '{1}' diff --git a/src/fsharp/xlf/FSStrings.cs.xlf b/src/fsharp/xlf/FSStrings.cs.xlf index dd20d2c3294..85df6314254 100644 --- a/src/fsharp/xlf/FSStrings.cs.xlf +++ b/src/fsharp/xlf/FSStrings.cs.xlf @@ -1617,6 +1617,16 @@ Vnitřní chyba: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.de.xlf b/src/fsharp/xlf/FSStrings.de.xlf index 11c588c25a1..535775c20c9 100644 --- a/src/fsharp/xlf/FSStrings.de.xlf +++ b/src/fsharp/xlf/FSStrings.de.xlf @@ -1617,6 +1617,16 @@ Interner Fehler: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.en.xlf b/src/fsharp/xlf/FSStrings.en.xlf index c7f55180a55..5bb4d7cc941 100644 --- a/src/fsharp/xlf/FSStrings.en.xlf +++ b/src/fsharp/xlf/FSStrings.en.xlf @@ -1617,6 +1617,16 @@ internal error: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.es.xlf b/src/fsharp/xlf/FSStrings.es.xlf index a64fb622684..48b340161fb 100644 --- a/src/fsharp/xlf/FSStrings.es.xlf +++ b/src/fsharp/xlf/FSStrings.es.xlf @@ -1617,6 +1617,16 @@ error interno: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.fr.xlf b/src/fsharp/xlf/FSStrings.fr.xlf index a56bd5baadd..7ff2af814e3 100644 --- a/src/fsharp/xlf/FSStrings.fr.xlf +++ b/src/fsharp/xlf/FSStrings.fr.xlf @@ -1617,6 +1617,16 @@ erreur interne : {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.it.xlf b/src/fsharp/xlf/FSStrings.it.xlf index b8a0c2aa385..722116dd3e7 100644 --- a/src/fsharp/xlf/FSStrings.it.xlf +++ b/src/fsharp/xlf/FSStrings.it.xlf @@ -1617,6 +1617,16 @@ errore interno: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ja.xlf b/src/fsharp/xlf/FSStrings.ja.xlf index e2bc61160be..d52573c01fa 100644 --- a/src/fsharp/xlf/FSStrings.ja.xlf +++ b/src/fsharp/xlf/FSStrings.ja.xlf @@ -1617,6 +1617,16 @@ 内部エラー: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ko.xlf b/src/fsharp/xlf/FSStrings.ko.xlf index 8f398f713c4..f807a267341 100644 --- a/src/fsharp/xlf/FSStrings.ko.xlf +++ b/src/fsharp/xlf/FSStrings.ko.xlf @@ -1617,6 +1617,16 @@ 내부 오류: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.pl.xlf b/src/fsharp/xlf/FSStrings.pl.xlf index b634fb8ab9d..b113738d3c6 100644 --- a/src/fsharp/xlf/FSStrings.pl.xlf +++ b/src/fsharp/xlf/FSStrings.pl.xlf @@ -1617,6 +1617,16 @@ błąd wewnętrzny: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.pt-BR.xlf b/src/fsharp/xlf/FSStrings.pt-BR.xlf index 0d185ea82f5..c2bd4489806 100644 --- a/src/fsharp/xlf/FSStrings.pt-BR.xlf +++ b/src/fsharp/xlf/FSStrings.pt-BR.xlf @@ -1617,6 +1617,16 @@ erro interno: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ru.xlf b/src/fsharp/xlf/FSStrings.ru.xlf index ebae0bf0ec3..216dd7ff060 100644 --- a/src/fsharp/xlf/FSStrings.ru.xlf +++ b/src/fsharp/xlf/FSStrings.ru.xlf @@ -1617,6 +1617,16 @@ внутренняя ошибка: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.tr.xlf b/src/fsharp/xlf/FSStrings.tr.xlf index bc70825fa2c..9f455ddbcb1 100644 --- a/src/fsharp/xlf/FSStrings.tr.xlf +++ b/src/fsharp/xlf/FSStrings.tr.xlf @@ -1617,6 +1617,16 @@ iç hata: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.zh-Hans.xlf b/src/fsharp/xlf/FSStrings.zh-Hans.xlf index 12be2851596..81b4477e1c6 100644 --- a/src/fsharp/xlf/FSStrings.zh-Hans.xlf +++ b/src/fsharp/xlf/FSStrings.zh-Hans.xlf @@ -1617,6 +1617,16 @@ 内部错误: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.zh-Hant.xlf b/src/fsharp/xlf/FSStrings.zh-Hant.xlf index 81cad28dd59..af7b3962fb1 100644 --- a/src/fsharp/xlf/FSStrings.zh-Hant.xlf +++ b/src/fsharp/xlf/FSStrings.zh-Hant.xlf @@ -1617,6 +1617,16 @@ 內部錯誤: {0} + + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + + + + Nullness warning: The type '{0}' does not support nullness. + Nullness warning: The type '{0}' does not support nullness. + + \ No newline at end of file From 016d5b01a47baa0c0b1bb7c749a9832c64acee06 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 19 Oct 2018 13:59:42 +0100 Subject: [PATCH 006/137] remove | null --- .../FSharp.Compiler.Private/FSComp.fs | 2 +- src/fsharp/pars.fsy | 3 --- src/fsharp/xlf/FSComp.txt.cs.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.de.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.en.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.es.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.fr.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.it.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.ja.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.ko.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.pl.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.ru.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.tr.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 19 +++++++++++++++++-- src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 19 +++++++++++++++++-- 16 files changed, 239 insertions(+), 32 deletions(-) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index 72f59872a9e..f92fc725e57 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -4367,7 +4367,7 @@ type internal SR private() = /// (Originally from ..\FSComp.txt:1446) static member tcTypeDoesNotInheritAttribute() = (3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,") ) /// The type '%s' never has 'null' as a value. To specify a nullable value type use Nullable<%s> - /// (Originally from ..\FSComp.txt:1444) + /// (Originally from ..\FSComp.txt:1447) static member tcTypeDoesNotHaveAnyNull(a0 : System.String, a1 : System.String) = (3243, GetStringFunc("tcTypeDoesNotHaveAnyNull",",,,%s,,,%s,,,") a0 a1) /// Call this method once to validate that all known resources are valid; throws if not diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy index 56dbc1a91ff..f72b2926cb2 100644 --- a/src/fsharp/pars.fsy +++ b/src/fsharp/pars.fsy @@ -4372,9 +4372,6 @@ appTypeConPower: { $1 } appType: - | appType BAR NULL - { SynType.WithNull($1,lhs parseState) } - | appType HACKNULL { SynType.WithNull($1,lhs parseState) } diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index 13755bff398..ba18cb1447f 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - Výjimka nebo případ typu union {0} nemá pole s názvem {1}. + The union case '{0}' does not have a field named '{1}'. + Výjimka nebo případ typu union {0} nemá pole s názvem {1}. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index 48c27ea3843..fe13cbcf756 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - Union-Fall/Ausnahme '{0}' verfügt nicht über ein Feld mit dem Namen '{1}'. + The union case '{0}' does not have a field named '{1}'. + Union-Fall/Ausnahme '{0}' verfügt nicht über ein Feld mit dem Namen '{1}'. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.en.xlf b/src/fsharp/xlf/FSComp.txt.en.xlf index e627891aa7a..70d58e0b3e4 100644 --- a/src/fsharp/xlf/FSComp.txt.en.xlf +++ b/src/fsharp/xlf/FSComp.txt.en.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - Union case/exception '{0}' does not have field named '{1}'. + The union case '{0}' does not have a field named '{1}'. + The union case '{0}' does not have a field named '{1}'. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index 3f6e078322f..b43e4500937 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - La excepción o el caso de unión '{0}' no tiene un campo denominado '{1}'. + The union case '{0}' does not have a field named '{1}'. + La excepción o el caso de unión '{0}' no tiene un campo denominado '{1}'. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index 7739224266d..0390ea98f16 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - Le cas ou l'exception d'union '{0}' ne possède pas de champ nommé '{1}'. + The union case '{0}' does not have a field named '{1}'. + Le cas ou l'exception d'union '{0}' ne possède pas de champ nommé '{1}'. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index fad47881303..5f3b18a56d6 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - Il case di unione/eccezione '{0}' non contiene il campo denominato '{1}'. + The union case '{0}' does not have a field named '{1}'. + Il case di unione/eccezione '{0}' non contiene il campo denominato '{1}'. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index 9debd8cf5da..202068aafb5 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - 共用体ケース/例外 '{0}' には、'{1}' という名前のフィールドがありません。 + The union case '{0}' does not have a field named '{1}'. + 共用体ケース/例外 '{0}' には、'{1}' という名前のフィールドがありません。 @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index d5c6caa254a..dbc18fa92c7 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - 공용 구조체 케이스/예외 '{0}'에 이름이 '{1}'인 필드가 없습니다. + The union case '{0}' does not have a field named '{1}'. + 공용 구조체 케이스/예외 '{0}'에 이름이 '{1}'인 필드가 없습니다. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index 9d5e8faaf53..d5f79ea3d1f 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - Przypadek unii/wyjątek „{0}” nie ma pola o nazwie „{1}”. + The union case '{0}' does not have a field named '{1}'. + Przypadek unii/wyjątek „{0}” nie ma pola o nazwie „{1}”. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 738e8609706..00b3cc60f10 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - O caso união/exceção '{0}' não possui um campo chamado '{1}'. + The union case '{0}' does not have a field named '{1}'. + O caso união/exceção '{0}' não possui um campo chamado '{1}'. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index 017bbbe6884..3b8cc784699 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - Ветвь объединения/исключение "{0}" не содержит поля с именем "{1}". + The union case '{0}' does not have a field named '{1}'. + Ветвь объединения/исключение "{0}" не содержит поля с именем "{1}". @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index 61589452f0e..c397103417e 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - {0}' birleşim durumu/özel durumunda '{1}' adlı alan yok. + The union case '{0}' does not have a field named '{1}'. + {0}' birleşim durumu/özel durumunda '{1}' adlı alan yok. @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index 83fe5364c54..2cc1078cd28 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - 联合用例/异常“{0}”没有名为“{1}”的字段。 + The union case '{0}' does not have a field named '{1}'. + 联合用例/异常“{0}”没有名为“{1}”的字段。 @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index e2ec8633403..41ac5e7b2eb 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -6328,8 +6328,8 @@ - Union case/exception '{0}' does not have field named '{1}'. - 等位/例外狀況 '{0}' 沒有名為 '{1}' 的欄位。 + The union case '{0}' does not have a field named '{1}'. + 等位/例外狀況 '{0}' 沒有名為 '{1}' 的欄位。 @@ -7072,6 +7072,21 @@ The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + + The exception '{0}' does not have a field named '{1}'. + The exception '{0}' does not have a field named '{1}'. + + + + Active patterns do not have fields. This syntax is invalid. + Active patterns do not have fields. This syntax is invalid. + + + + The constructor does not have a field named '{0}'. + The constructor does not have a field named '{0}'. + + \ No newline at end of file From 9e615766870be6baca51243a29d79b7526dab049 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 19 Oct 2018 16:39:07 +0100 Subject: [PATCH 007/137] /test:AssumeNullOnImport --- src/fsharp/CompileOps.fs | 5 +++- src/fsharp/CompileOps.fsi | 2 ++ src/fsharp/CompileOptions.fs | 1 + src/fsharp/ConstraintSolver.fs | 1 - src/fsharp/FSharp.Core/prim-types.fs | 25 ++++++++++++++++++ src/fsharp/FSharp.Core/prim-types.fsi | 35 +++++++++++++++++++++++++ src/fsharp/TastOps.fs | 37 +++++++++++++++------------ src/fsharp/TastOps.fsi | 2 ++ src/fsharp/TcGlobals.fs | 3 ++- src/fsharp/import.fs | 4 +-- 10 files changed, 93 insertions(+), 22 deletions(-) diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 8024e9c5a2a..8c0ca6d5ba5 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -2250,6 +2250,7 @@ type TcConfigBuilder = mutable embedResources : string list mutable errorSeverityOptions: FSharpErrorSeverityOptions mutable mlCompatibility: bool + mutable assumeNullOnImport: bool mutable checkOverflow: bool mutable showReferenceResolutions:bool mutable outputFile : string option @@ -2410,6 +2411,7 @@ type TcConfigBuilder = subsystemVersion = 4, 0 // per spec for 357994 useHighEntropyVA = false mlCompatibility = false + assumeNullOnImport = false checkOverflow = false showReferenceResolutions = false outputFile = None @@ -2882,6 +2884,7 @@ type TcConfig private (data : TcConfigBuilder, validate:bool) = member x.embedResources = data.embedResources member x.errorSeverityOptions = data.errorSeverityOptions member x.mlCompatibility = data.mlCompatibility + member x.assumeNullOnImport = data.assumeNullOnImport member x.checkOverflow = data.checkOverflow member x.showReferenceResolutions = data.showReferenceResolutions member x.outputFile = data.outputFile @@ -4794,7 +4797,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti // OK, now we have both mscorlib.dll and FSharp.Core.dll we can create TcGlobals let tcGlobals = TcGlobals(tcConfig.compilingFslib, ilGlobals, fslibCcu, tcConfig.implicitIncludeDir, tcConfig.mlCompatibility, - tcConfig.isInteractive, tryFindSysTypeCcu, tcConfig.emitDebugInfoInQuotations, tcConfig.noDebugData ) + tcConfig.isInteractive, tcConfig.assumeNullOnImport, tryFindSysTypeCcu, tcConfig.emitDebugInfoInQuotations, tcConfig.noDebugData ) #if DEBUG // the global_g reference cell is used only for debug printing diff --git a/src/fsharp/CompileOps.fsi b/src/fsharp/CompileOps.fsi index eb371fa5927..a8ab33591db 100755 --- a/src/fsharp/CompileOps.fsi +++ b/src/fsharp/CompileOps.fsi @@ -270,6 +270,7 @@ type TcConfigBuilder = mutable embedResources: string list mutable errorSeverityOptions: FSharpErrorSeverityOptions mutable mlCompatibility:bool + mutable assumeNullOnImport: bool mutable checkOverflow:bool mutable showReferenceResolutions:bool mutable outputFile: string option @@ -425,6 +426,7 @@ type TcConfig = member embedResources: string list member errorSeverityOptions: FSharpErrorSeverityOptions member mlCompatibility:bool + member assumeNullOnImport: bool member checkOverflow:bool member showReferenceResolutions:bool member outputFile: string option diff --git a/src/fsharp/CompileOptions.fs b/src/fsharp/CompileOptions.fs index 6ae18644dea..1c53aaaa6a8 100644 --- a/src/fsharp/CompileOptions.fs +++ b/src/fsharp/CompileOptions.fs @@ -832,6 +832,7 @@ let advancedFlagsFsc tcConfigB = let testFlag tcConfigB = CompilerOption("test", tagString, OptionString (fun s -> match s with + | "AssumeNullOnImport" -> tcConfigB.assumeNullOnImport <- true | "StackSpan" -> tcConfigB.internalTestSpanStackReferring <- true | "ErrorRanges" -> tcConfigB.errorStyle <- ErrorStyle.TestErrors | "MemberBodyRanges" -> PostTypeCheckSemanticChecks.testFlagMemberBody := true diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 73f03fc1689..e688fdf2908 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -798,7 +798,6 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD | _, _ -> - printfn "generating warning: %A %A %A %A" n1 n2 csenv.m m2 WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 ty2 nullness1 nullness2 = diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index 753a75204dc..d38327d2d49 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3331,12 +3331,37 @@ namespace Microsoft.FSharp.Core | null -> true | _ -> false + [] + let inline isNullV (value : Nullable<'T>) = not value.HasValue + [] let inline internal isNotNull (value : 'T) = match value with | null -> false | _ -> true + [] + let inline notNull (value : 'T when 'T : not struct and 'T : null) = + match value with + | null -> raise (System.NullReferenceException()) + | _ -> value + + [] + let inline notNullV (value : Nullable<'T>) = + if value.HasValue then + value.Value + else + raise (System.NullReferenceException()) + + [] + let inline withNull (value : 'T when 'T : not struct and 'T : null) = value + + [] + let inline withNullV (value : 'T) : Nullable<'T> = Nullable<'T>(value) + + [] + let inline nullV<'T when 'T : struct and 'T : (new : unit -> 'T) and 'T :> ValueType> = Nullable<'T>() + [] let inline raise (exn: exn) = (# "throw" exn : 'T #) diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index 61786826a20..18c8192c3ba 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -2241,12 +2241,47 @@ namespace Microsoft.FSharp.Core [] val inline isNull : value:'T -> bool when 'T : null + /// Determines whether the given value is null. + /// The value to check. + /// True when value is null, false otherwise. + [] + val inline isNullV : value:Nullable<'T> -> bool + /// Determines whether the given value is not null. /// The value to check. /// True when value is not null, false otherwise. [] val inline internal isNotNull : value:'T -> bool when 'T : null + /// Get the null value for a value type. + /// The null value for a value type. + [] + val inline nullV<'T when 'T : struct and 'T : (new : unit -> 'T) and 'T :> ValueType> : Nullable<'T> + + /// Asserts that the value is non-null. + /// The value to check. + /// True when value is null, false otherwise. + [] + val inline notNull : value:'T -> 'T when 'T : not struct and 'T : null + + /// Asserts that the value is non-null. + /// The value to check. + /// True when value is null, false otherwise. + [] + val inline notNullV : value:Nullable<'T> -> 'T + + /// Asserts that the value is non-null. + /// The value to check. + /// True when value is null, false otherwise. + [] + val inline withNull : value:'T -> 'T when 'T : not struct and 'T : null + + /// Asserts that the value is non-null. + /// The value to check. + /// True when value is null, false otherwise. + [] + val inline withNullV : value:'T -> Nullable<'T> + /// Throw a System.Exception exception. /// The exception message. /// The result value. diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index e03a1af9062..cee423c9a41 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -7503,28 +7503,31 @@ let TypeNullNever g ty = (isStructTy g underlyingTy) || (isByrefTy g underlyingTy) +let TyconRefNullIsExtraValueOld g m (tcref: TyconRef) = + not tcref.IsStructOrEnumTycon && + not (isByrefLikeTyconRef g m tcref) && + (if tcref.IsILTycon then + // Putting AllowNullLiteralAttribute(false) on an IL or provided type means 'null' can't be used with that type + (TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref <> Some false) + else + (TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true)) + +let TyconRefNullIsExtraValueNew g m (tcref: TyconRef) = + not tcref.IsStructOrEnumTycon && + not (isByrefLikeTyconRef g m tcref) && + (if tcref.IsILTycon then + false + else + // Putting AllowNullLiteralAttribute(true) on an F# type means it always admits null even in the new model + (TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true)) + /// Indicates if the type admits the use of 'null' as a value -// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this let TypeNullIsExtraValueNew g m ty = - if isILReferenceTy g ty then - false - elif TypeNullNever g ty then - false - else - // Putting AllowNullLiteralAttribute(true) on an F# type means 'null' can be used with that type - match tryDestAppTy g ty with ValueSome tcref -> TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true | _ -> false + match tryDestAppTy g ty with ValueSome tcref -> TyconRefNullIsExtraValueNew g m tcref | _ -> true /// Indicates if the type admits the use of 'null' as a value -// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this let TypeNullIsExtraValueOld g m ty = - if isILReferenceTy g ty || isDelegateTy g ty then - // Putting AllowNullLiteralAttribute(false) on an IL or provided type means 'null' can't be used with that type - not (match tryDestAppTy g ty with ValueSome tcref -> TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some false | _ -> false) - elif TypeNullNever g ty then - false - else - // Putting AllowNullLiteralAttribute(true) on an F# type means 'null' can be used with that type - match tryDestAppTy g ty with ValueSome tcref -> TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true | _ -> false + match tryDestAppTy g ty with ValueSome tcref -> TyconRefNullIsExtraValueOld g m tcref | _ -> true // TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this let TypeNullIsTrueValue g ty = diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index f73fe671213..8bc7e9e8678 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -1137,6 +1137,8 @@ val CompileAsEvent : TcGlobals -> Attribs -> bool val TypeNullIsExtraValueNew : TcGlobals -> range -> TType -> bool val TypeNullIsExtraValueOld : TcGlobals -> range -> TType -> bool +val TyconRefNullIsExtraValueOld : TcGlobals -> range -> TyconRef -> bool +val TyconRefNullIsExtraValueNew : TcGlobals -> range -> TyconRef -> bool val TypeNullNever : TcGlobals -> TType -> bool val TypeHasDefaultValue : TcGlobals -> range -> TType -> bool diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 28ced1a8604..8d367faa2d7 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -176,7 +176,7 @@ let tname_IAsyncResult = "System.IAsyncResult" //------------------------------------------------------------------------- type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, directoryToResolveRelativePaths, - mlCompatibility: bool, isInteractive:bool, + mlCompatibility: bool, isInteractive:bool, assumeNullOnImport: bool, // The helper to find system types amongst referenced DLLs tryFindSysTypeCcu, emitDebugInfoInQuotations: bool, noDebugData: bool) = @@ -896,6 +896,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d member __.ilg=ilg // A table of all intrinsics that the compiler cares about member __.knownIntrinsics = v_knownIntrinsics + member __.assumeNullOnImport = assumeNullOnImport // A table of known modules in FSharp.Core. Not all modules are necessarily listed, but the more we list the // better the job we do of mapping from provided expressions back to FSharp.Core F# functions and values. member __.knownFSharpCoreModules = v_knownFSharpCoreModules diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs index 8079cc337a3..96de23749d4 100644 --- a/src/fsharp/import.fs +++ b/src/fsharp/import.fs @@ -166,7 +166,7 @@ let rec ImportILType (env:ImportMap) m tinst ty = | ILType.Boxed tspec | ILType.Value tspec -> let tcref = ImportILTypeRef env m tspec.TypeRef let inst = tspec.GenericArgs |> List.map (ImportILType env m tinst) - let nullness = ObliviousToNull // TODO: give this the right setting + let nullness = if env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownNull else ObliviousToNull ImportTyconRefApp env tcref inst nullness | ILType.Modified(_,tref,ILType.Byref ty) when tref.Name = "System.Runtime.InteropServices.InAttribute" -> mkInByrefTy env.g (ImportILType env m tinst ty) @@ -314,7 +314,7 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: else genericArg) - let nullness = ObliviousToNull + let nullness = if env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownNull else ObliviousToNull ImportTyconRefApp env tcref genericArgs nullness From 302fc5ccc9ef80202a005c346e6d8cde9af56379 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 30 Oct 2018 13:08:51 +0000 Subject: [PATCH 008/137] continue work on nullness prototype --- build.cmd | 8 +- .../FSharp.Compiler.Private/FSComp.fs | 1146 +++++++++-------- .../FSharp.Compiler.Private/FSComp.resx | 11 +- src/fsharp/CompileOps.fs | 29 +- src/fsharp/CompileOps.fsi | 4 + src/fsharp/CompileOptions.fs | 4 + src/fsharp/ConstraintSolver.fs | 103 +- src/fsharp/ConstraintSolver.fsi | 1 + src/fsharp/FSComp.txt | 5 +- src/fsharp/FSStrings.resx | 5 +- .../FSharp.Build/FSharpEmbedResXSource.fs | 4 +- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 1 + src/fsharp/FSharp.Core/array.fs | 15 +- src/fsharp/FSharp.Core/array2.fs | 1 + src/fsharp/FSharp.Core/list.fs | 1 + src/fsharp/FSharp.Core/local.fs | 4 + src/fsharp/FSharp.Core/prim-types.fs | 6 +- src/fsharp/FSharp.Core/prim-types.fsi | 16 +- src/fsharp/FSharp.Core/seq.fs | 1 + src/fsharp/FSharp.Core/seqcore.fs | 1 + src/fsharp/IlxGen.fs | 4 +- src/fsharp/LexFilter.fs | 2 + src/fsharp/NameResolution.fs | 2 +- src/fsharp/NicePrint.fs | 10 +- src/fsharp/PostInferenceChecks.fs | 4 +- src/fsharp/QuotationTranslator.fs | 4 +- src/fsharp/TastOps.fs | 116 +- src/fsharp/TastOps.fsi | 2 +- src/fsharp/TastPickle.fs | 137 +- src/fsharp/TcGlobals.fs | 5 +- src/fsharp/TypeChecker.fs | 26 +- src/fsharp/import.fs | 10 +- src/fsharp/pars.fsy | 5 +- src/fsharp/symbols/Symbols.fs | 6 +- src/fsharp/tast.fs | 16 +- src/fsharp/xlf/FSComp.txt.cs.xlf | 19 +- src/fsharp/xlf/FSComp.txt.de.xlf | 19 +- src/fsharp/xlf/FSComp.txt.en.xlf | 19 +- src/fsharp/xlf/FSComp.txt.es.xlf | 19 +- src/fsharp/xlf/FSComp.txt.fr.xlf | 19 +- src/fsharp/xlf/FSComp.txt.it.xlf | 19 +- src/fsharp/xlf/FSComp.txt.ja.xlf | 19 +- src/fsharp/xlf/FSComp.txt.ko.xlf | 19 +- src/fsharp/xlf/FSComp.txt.pl.xlf | 19 +- src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 19 +- src/fsharp/xlf/FSComp.txt.ru.xlf | 19 +- src/fsharp/xlf/FSComp.txt.tr.xlf | 19 +- src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 19 +- src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 19 +- src/fsharp/xlf/FSStrings.cs.xlf | 9 +- src/fsharp/xlf/FSStrings.de.xlf | 9 +- src/fsharp/xlf/FSStrings.en.xlf | 9 +- src/fsharp/xlf/FSStrings.es.xlf | 9 +- src/fsharp/xlf/FSStrings.fr.xlf | 9 +- src/fsharp/xlf/FSStrings.it.xlf | 9 +- src/fsharp/xlf/FSStrings.ja.xlf | 9 +- src/fsharp/xlf/FSStrings.ko.xlf | 9 +- src/fsharp/xlf/FSStrings.pl.xlf | 9 +- src/fsharp/xlf/FSStrings.pt-BR.xlf | 9 +- src/fsharp/xlf/FSStrings.ru.xlf | 9 +- src/fsharp/xlf/FSStrings.tr.xlf | 9 +- src/fsharp/xlf/FSStrings.zh-Hans.xlf | 9 +- src/fsharp/xlf/FSStrings.zh-Hant.xlf | 9 +- .../fsc/help/help40.437.1033.bsl | 1 + .../fsi/exename/help40.437.1033.bsl | 1 + .../fsi/help/help40-nologo.437.1033.bsl | 1 + .../fsi/help/help40.437.1033.bsl | 1 + 67 files changed, 1329 insertions(+), 782 deletions(-) diff --git a/build.cmd b/build.cmd index dae4a3cafbf..3deefc2a836 100644 --- a/build.cmd +++ b/build.cmd @@ -64,7 +64,7 @@ set BUILD_FROMSOURCE=0 set BUILD_VS=0 set BUILD_FCS=0 set BUILD_CONFIG=release -set BUILD_DIAG= +set BUILD_DIAG=/v:minimal set BUILD_PUBLICSIGN=0 set TEST_NET40_COMPILERUNIT_SUITE=0 @@ -633,7 +633,7 @@ goto :eof :havemsbuild set _nrswitch=/nr:false -set msbuildflags=%_nrswitch% /nologo /clp:Summary /v:minimal +set msbuildflags=%_nrswitch% /nologo /clp:Summary set _ngenexe="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\ngen.exe" if not exist %_ngenexe% echo Error: Could not find ngen.exe. && goto :failure @@ -777,8 +777,8 @@ if "%BUILD_PROTO%" == "1" ( echo %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo %_ngenexe% install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo - echo %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true /bl:%~dp0%BUILD_CONFIG%\logs\protobuild-net40.build.binlog - %_msbuildexe% %msbuildflags% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true /bl:%~dp0%BUILD_CONFIG%\logs\protobuild-net40.build.binlog + echo %_msbuildexe% %msbuildflags% %BUILD_DIAG% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true /bl:%~dp0%BUILD_CONFIG%\logs\protobuild-net40.build.binlog + %_msbuildexe% %msbuildflags% %BUILD_DIAG% src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=%BUILD_PROTO_WITH_CORECLR_LKG% /p:Configuration=Proto /p:DisableLocalization=true /bl:%~dp0%BUILD_CONFIG%\logs\protobuild-net40.build.binlog @if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :failure ) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index f92fc725e57..255f1273417 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -2674,1701 +2674,1710 @@ type internal SR private() = /// Enable specific warnings that may be off by default /// (Originally from ..\FSComp.txt:864) static member optsWarnOn() = (GetStringFunc("optsWarnOn",",,,") ) - /// Generate overflow checks + /// Enable nullness declarations and checks /// (Originally from ..\FSComp.txt:865) + static member optsCheckNulls() = (GetStringFunc("optsCheckNulls",",,,") ) + /// Specify the language version + /// (Originally from ..\FSComp.txt:866) + static member optsLangVersion() = (GetStringFunc("optsLangVersion",",,,") ) + /// Generate overflow checks + /// (Originally from ..\FSComp.txt:867) static member optsChecked() = (GetStringFunc("optsChecked",",,,") ) /// Define conditional compilation symbols (Short form: -d) - /// (Originally from ..\FSComp.txt:866) + /// (Originally from ..\FSComp.txt:868) static member optsDefine() = (GetStringFunc("optsDefine",",,,") ) /// Ignore ML compatibility warnings - /// (Originally from ..\FSComp.txt:867) + /// (Originally from ..\FSComp.txt:869) static member optsMlcompatibility() = (GetStringFunc("optsMlcompatibility",",,,") ) /// Suppress compiler copyright message - /// (Originally from ..\FSComp.txt:868) + /// (Originally from ..\FSComp.txt:870) static member optsNologo() = (GetStringFunc("optsNologo",",,,") ) /// Display this usage message (Short form: -?) - /// (Originally from ..\FSComp.txt:869) + /// (Originally from ..\FSComp.txt:871) static member optsHelp() = (GetStringFunc("optsHelp",",,,") ) /// Read response file for more options - /// (Originally from ..\FSComp.txt:870) + /// (Originally from ..\FSComp.txt:872) static member optsResponseFile() = (GetStringFunc("optsResponseFile",",,,") ) /// Specify the codepage used to read source files - /// (Originally from ..\FSComp.txt:871) + /// (Originally from ..\FSComp.txt:873) static member optsCodepage() = (GetStringFunc("optsCodepage",",,,") ) /// Output messages in UTF-8 encoding - /// (Originally from ..\FSComp.txt:872) + /// (Originally from ..\FSComp.txt:874) static member optsUtf8output() = (GetStringFunc("optsUtf8output",",,,") ) /// Output messages with fully qualified paths - /// (Originally from ..\FSComp.txt:873) + /// (Originally from ..\FSComp.txt:875) static member optsFullpaths() = (GetStringFunc("optsFullpaths",",,,") ) /// Specify a directory for the include path which is used to resolve source files and assemblies (Short form: -I) - /// (Originally from ..\FSComp.txt:874) + /// (Originally from ..\FSComp.txt:876) static member optsLib() = (GetStringFunc("optsLib",",,,") ) /// Base address for the library to be built - /// (Originally from ..\FSComp.txt:875) + /// (Originally from ..\FSComp.txt:877) static member optsBaseaddress() = (GetStringFunc("optsBaseaddress",",,,") ) /// Do not reference the default CLI assemblies by default - /// (Originally from ..\FSComp.txt:876) + /// (Originally from ..\FSComp.txt:878) static member optsNoframework() = (GetStringFunc("optsNoframework",",,,") ) /// Statically link the F# library and all referenced DLLs that depend on it into the assembly being generated - /// (Originally from ..\FSComp.txt:877) + /// (Originally from ..\FSComp.txt:879) static member optsStandalone() = (GetStringFunc("optsStandalone",",,,") ) /// Statically link the given assembly and all referenced DLLs that depend on this assembly. Use an assembly name e.g. mylib, not a DLL name. - /// (Originally from ..\FSComp.txt:878) + /// (Originally from ..\FSComp.txt:880) static member optsStaticlink() = (GetStringFunc("optsStaticlink",",,,") ) /// Use a resident background compilation service to improve compiler startup times. - /// (Originally from ..\FSComp.txt:879) + /// (Originally from ..\FSComp.txt:881) static member optsResident() = (GetStringFunc("optsResident",",,,") ) /// Name the output debug file - /// (Originally from ..\FSComp.txt:880) + /// (Originally from ..\FSComp.txt:882) static member optsPdb() = (GetStringFunc("optsPdb",",,,") ) /// Resolve assembly references using directory-based rules rather than MSBuild resolution - /// (Originally from ..\FSComp.txt:881) + /// (Originally from ..\FSComp.txt:883) static member optsSimpleresolution() = (GetStringFunc("optsSimpleresolution",",,,") ) /// Unrecognized target '%s', expected 'exe', 'winexe', 'library' or 'module' - /// (Originally from ..\FSComp.txt:882) + /// (Originally from ..\FSComp.txt:884) static member optsUnrecognizedTarget(a0 : System.String) = (1048, GetStringFunc("optsUnrecognizedTarget",",,,%s,,,") a0) /// Unrecognized debug type '%s', expected 'pdbonly' or 'full' - /// (Originally from ..\FSComp.txt:883) + /// (Originally from ..\FSComp.txt:885) static member optsUnrecognizedDebugType(a0 : System.String) = (1049, GetStringFunc("optsUnrecognizedDebugType",",,,%s,,,") a0) /// Invalid warning level '%d' - /// (Originally from ..\FSComp.txt:884) + /// (Originally from ..\FSComp.txt:886) static member optsInvalidWarningLevel(a0 : System.Int32) = (1050, GetStringFunc("optsInvalidWarningLevel",",,,%d,,,") a0) /// Short form of '%s' - /// (Originally from ..\FSComp.txt:885) + /// (Originally from ..\FSComp.txt:887) static member optsShortFormOf(a0 : System.String) = (GetStringFunc("optsShortFormOf",",,,%s,,,") a0) /// The command-line option '--cliroot' has been deprecated. Use an explicit reference to a specific copy of mscorlib.dll instead. - /// (Originally from ..\FSComp.txt:886) + /// (Originally from ..\FSComp.txt:888) static member optsClirootDeprecatedMsg() = (GetStringFunc("optsClirootDeprecatedMsg",",,,") ) /// Use to override where the compiler looks for mscorlib.dll and framework components - /// (Originally from ..\FSComp.txt:887) + /// (Originally from ..\FSComp.txt:889) static member optsClirootDescription() = (GetStringFunc("optsClirootDescription",",,,") ) /// - OUTPUT FILES - - /// (Originally from ..\FSComp.txt:888) + /// (Originally from ..\FSComp.txt:890) static member optsHelpBannerOutputFiles() = (GetStringFunc("optsHelpBannerOutputFiles",",,,") ) /// - INPUT FILES - - /// (Originally from ..\FSComp.txt:889) + /// (Originally from ..\FSComp.txt:891) static member optsHelpBannerInputFiles() = (GetStringFunc("optsHelpBannerInputFiles",",,,") ) /// - RESOURCES - - /// (Originally from ..\FSComp.txt:890) + /// (Originally from ..\FSComp.txt:892) static member optsHelpBannerResources() = (GetStringFunc("optsHelpBannerResources",",,,") ) /// - CODE GENERATION - - /// (Originally from ..\FSComp.txt:891) + /// (Originally from ..\FSComp.txt:893) static member optsHelpBannerCodeGen() = (GetStringFunc("optsHelpBannerCodeGen",",,,") ) /// - ADVANCED - - /// (Originally from ..\FSComp.txt:892) + /// (Originally from ..\FSComp.txt:894) static member optsHelpBannerAdvanced() = (GetStringFunc("optsHelpBannerAdvanced",",,,") ) /// - MISCELLANEOUS - - /// (Originally from ..\FSComp.txt:893) + /// (Originally from ..\FSComp.txt:895) static member optsHelpBannerMisc() = (GetStringFunc("optsHelpBannerMisc",",,,") ) /// - LANGUAGE - - /// (Originally from ..\FSComp.txt:894) + /// (Originally from ..\FSComp.txt:896) static member optsHelpBannerLanguage() = (GetStringFunc("optsHelpBannerLanguage",",,,") ) /// - ERRORS AND WARNINGS - - /// (Originally from ..\FSComp.txt:895) + /// (Originally from ..\FSComp.txt:897) static member optsHelpBannerErrsAndWarns() = (GetStringFunc("optsHelpBannerErrsAndWarns",",,,") ) /// Unknown --test argument: '%s' - /// (Originally from ..\FSComp.txt:896) + /// (Originally from ..\FSComp.txt:898) static member optsUnknownArgumentToTheTestSwitch(a0 : System.String) = (1063, GetStringFunc("optsUnknownArgumentToTheTestSwitch",",,,%s,,,") a0) /// Unrecognized platform '%s', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu' - /// (Originally from ..\FSComp.txt:897) + /// (Originally from ..\FSComp.txt:899) static member optsUnknownPlatform(a0 : System.String) = (1064, GetStringFunc("optsUnknownPlatform",",,,%s,,,") a0) /// The command-line option '%s' is for test purposes only - /// (Originally from ..\FSComp.txt:898) + /// (Originally from ..\FSComp.txt:900) static member optsInternalNoDescription(a0 : System.String) = (GetStringFunc("optsInternalNoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated - /// (Originally from ..\FSComp.txt:899) + /// (Originally from ..\FSComp.txt:901) static member optsDCLONoDescription(a0 : System.String) = (GetStringFunc("optsDCLONoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated. Use '%s' instead. - /// (Originally from ..\FSComp.txt:900) + /// (Originally from ..\FSComp.txt:902) static member optsDCLODeprecatedSuggestAlternative(a0 : System.String, a1 : System.String) = (GetStringFunc("optsDCLODeprecatedSuggestAlternative",",,,%s,,,%s,,,") a0 a1) /// The command-line option '%s' has been deprecated. HTML document generation is now part of the F# Power Pack, via the tool FsHtmlDoc.exe. - /// (Originally from ..\FSComp.txt:901) + /// (Originally from ..\FSComp.txt:903) static member optsDCLOHtmlDoc(a0 : System.String) = (GetStringFunc("optsDCLOHtmlDoc",",,,%s,,,") a0) /// Output warning and error messages in color - /// (Originally from ..\FSComp.txt:902) + /// (Originally from ..\FSComp.txt:904) static member optsConsoleColors() = (GetStringFunc("optsConsoleColors",",,,") ) /// Enable high-entropy ASLR - /// (Originally from ..\FSComp.txt:903) + /// (Originally from ..\FSComp.txt:905) static member optsUseHighEntropyVA() = (GetStringFunc("optsUseHighEntropyVA",",,,") ) /// Specify subsystem version of this assembly - /// (Originally from ..\FSComp.txt:904) + /// (Originally from ..\FSComp.txt:906) static member optsSubSystemVersion() = (GetStringFunc("optsSubSystemVersion",",,,") ) /// Specify target framework profile of this assembly. Valid values are mscorlib, netcore or netstandard. Default - mscorlib - /// (Originally from ..\FSComp.txt:905) + /// (Originally from ..\FSComp.txt:907) static member optsTargetProfile() = (GetStringFunc("optsTargetProfile",",,,") ) /// Emit debug information in quotations - /// (Originally from ..\FSComp.txt:906) + /// (Originally from ..\FSComp.txt:908) static member optsEmitDebugInfoInQuotations() = (GetStringFunc("optsEmitDebugInfoInQuotations",",,,") ) /// Specify the preferred output language culture name (e.g. es-ES, ja-JP) - /// (Originally from ..\FSComp.txt:907) + /// (Originally from ..\FSComp.txt:909) static member optsPreferredUiLang() = (GetStringFunc("optsPreferredUiLang",",,,") ) /// Don't copy FSharp.Core.dll along the produced binaries - /// (Originally from ..\FSComp.txt:908) + /// (Originally from ..\FSComp.txt:910) static member optsNoCopyFsharpCore() = (GetStringFunc("optsNoCopyFsharpCore",",,,") ) /// Invalid version '%s' for '--subsystemversion'. The version must be 4.00 or greater. - /// (Originally from ..\FSComp.txt:909) + /// (Originally from ..\FSComp.txt:911) static member optsInvalidSubSystemVersion(a0 : System.String) = (1051, GetStringFunc("optsInvalidSubSystemVersion",",,,%s,,,") a0) /// Invalid value '%s' for '--targetprofile', valid values are 'mscorlib', 'netcore' or 'netstandard'. - /// (Originally from ..\FSComp.txt:910) + /// (Originally from ..\FSComp.txt:912) static member optsInvalidTargetProfile(a0 : System.String) = (1052, GetStringFunc("optsInvalidTargetProfile",",,,%s,,,") a0) /// Full name - /// (Originally from ..\FSComp.txt:911) + /// (Originally from ..\FSComp.txt:913) static member typeInfoFullName() = (GetStringFunc("typeInfoFullName",",,,") ) /// and %d other overloads - /// (Originally from ..\FSComp.txt:915) + /// (Originally from ..\FSComp.txt:917) static member typeInfoOtherOverloads(a0 : System.Int32) = (GetStringFunc("typeInfoOtherOverloads",",,,%d,,,") a0) /// union case - /// (Originally from ..\FSComp.txt:916) + /// (Originally from ..\FSComp.txt:918) static member typeInfoUnionCase() = (GetStringFunc("typeInfoUnionCase",",,,") ) /// active pattern result - /// (Originally from ..\FSComp.txt:917) + /// (Originally from ..\FSComp.txt:919) static member typeInfoActivePatternResult() = (GetStringFunc("typeInfoActivePatternResult",",,,") ) /// active recognizer - /// (Originally from ..\FSComp.txt:918) + /// (Originally from ..\FSComp.txt:920) static member typeInfoActiveRecognizer() = (GetStringFunc("typeInfoActiveRecognizer",",,,") ) /// field - /// (Originally from ..\FSComp.txt:919) + /// (Originally from ..\FSComp.txt:921) static member typeInfoField() = (GetStringFunc("typeInfoField",",,,") ) /// event - /// (Originally from ..\FSComp.txt:920) + /// (Originally from ..\FSComp.txt:922) static member typeInfoEvent() = (GetStringFunc("typeInfoEvent",",,,") ) /// property - /// (Originally from ..\FSComp.txt:921) + /// (Originally from ..\FSComp.txt:923) static member typeInfoProperty() = (GetStringFunc("typeInfoProperty",",,,") ) /// extension - /// (Originally from ..\FSComp.txt:922) + /// (Originally from ..\FSComp.txt:924) static member typeInfoExtension() = (GetStringFunc("typeInfoExtension",",,,") ) /// custom operation - /// (Originally from ..\FSComp.txt:923) + /// (Originally from ..\FSComp.txt:925) static member typeInfoCustomOperation() = (GetStringFunc("typeInfoCustomOperation",",,,") ) /// argument - /// (Originally from ..\FSComp.txt:924) + /// (Originally from ..\FSComp.txt:926) static member typeInfoArgument() = (GetStringFunc("typeInfoArgument",",,,") ) /// patvar - /// (Originally from ..\FSComp.txt:925) + /// (Originally from ..\FSComp.txt:927) static member typeInfoPatternVariable() = (GetStringFunc("typeInfoPatternVariable",",,,") ) /// namespace - /// (Originally from ..\FSComp.txt:926) + /// (Originally from ..\FSComp.txt:928) static member typeInfoNamespace() = (GetStringFunc("typeInfoNamespace",",,,") ) /// module - /// (Originally from ..\FSComp.txt:927) + /// (Originally from ..\FSComp.txt:929) static member typeInfoModule() = (GetStringFunc("typeInfoModule",",,,") ) /// namespace/module - /// (Originally from ..\FSComp.txt:928) + /// (Originally from ..\FSComp.txt:930) static member typeInfoNamespaceOrModule() = (GetStringFunc("typeInfoNamespaceOrModule",",,,") ) /// from %s - /// (Originally from ..\FSComp.txt:929) + /// (Originally from ..\FSComp.txt:931) static member typeInfoFromFirst(a0 : System.String) = (GetStringFunc("typeInfoFromFirst",",,,%s,,,") a0) /// also from %s - /// (Originally from ..\FSComp.txt:930) + /// (Originally from ..\FSComp.txt:932) static member typeInfoFromNext(a0 : System.String) = (GetStringFunc("typeInfoFromNext",",,,%s,,,") a0) /// generated property - /// (Originally from ..\FSComp.txt:931) + /// (Originally from ..\FSComp.txt:933) static member typeInfoGeneratedProperty() = (GetStringFunc("typeInfoGeneratedProperty",",,,") ) /// generated type - /// (Originally from ..\FSComp.txt:932) + /// (Originally from ..\FSComp.txt:934) static member typeInfoGeneratedType() = (GetStringFunc("typeInfoGeneratedType",",,,") ) /// Found by AssemblyFolders registry key - /// (Originally from ..\FSComp.txt:933) + /// (Originally from ..\FSComp.txt:935) static member assemblyResolutionFoundByAssemblyFoldersKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersKey",",,,") ) /// Found by AssemblyFoldersEx registry key - /// (Originally from ..\FSComp.txt:934) + /// (Originally from ..\FSComp.txt:936) static member assemblyResolutionFoundByAssemblyFoldersExKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersExKey",",,,") ) /// .NET Framework - /// (Originally from ..\FSComp.txt:935) + /// (Originally from ..\FSComp.txt:937) static member assemblyResolutionNetFramework() = (GetStringFunc("assemblyResolutionNetFramework",",,,") ) /// Global Assembly Cache - /// (Originally from ..\FSComp.txt:936) + /// (Originally from ..\FSComp.txt:938) static member assemblyResolutionGAC() = (GetStringFunc("assemblyResolutionGAC",",,,") ) /// Recursive class hierarchy in type '%s' - /// (Originally from ..\FSComp.txt:937) + /// (Originally from ..\FSComp.txt:939) static member recursiveClassHierarchy(a0 : System.String) = (1089, GetStringFunc("recursiveClassHierarchy",",,,%s,,,") a0) /// Invalid recursive reference to an abstract slot - /// (Originally from ..\FSComp.txt:938) + /// (Originally from ..\FSComp.txt:940) static member InvalidRecursiveReferenceToAbstractSlot() = (1090, GetStringFunc("InvalidRecursiveReferenceToAbstractSlot",",,,") ) /// The event '%s' has a non-standard type. If this event is declared in another CLI language, you may need to access this event using the explicit %s and %s methods for the event. If this event is declared in F#, make the type of the event an instantiation of either 'IDelegateEvent<_>' or 'IEvent<_,_>'. - /// (Originally from ..\FSComp.txt:939) + /// (Originally from ..\FSComp.txt:941) static member eventHasNonStandardType(a0 : System.String, a1 : System.String, a2 : System.String) = (1091, GetStringFunc("eventHasNonStandardType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:940) + /// (Originally from ..\FSComp.txt:942) static member typeIsNotAccessible(a0 : System.String) = (1092, GetStringFunc("typeIsNotAccessible",",,,%s,,,") a0) /// The union cases or fields of the type '%s' are not accessible from this code location - /// (Originally from ..\FSComp.txt:941) + /// (Originally from ..\FSComp.txt:943) static member unionCasesAreNotAccessible(a0 : System.String) = (1093, GetStringFunc("unionCasesAreNotAccessible",",,,%s,,,") a0) /// The value '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:942) + /// (Originally from ..\FSComp.txt:944) static member valueIsNotAccessible(a0 : System.String) = (1094, GetStringFunc("valueIsNotAccessible",",,,%s,,,") a0) /// The union case '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:943) + /// (Originally from ..\FSComp.txt:945) static member unionCaseIsNotAccessible(a0 : System.String) = (1095, GetStringFunc("unionCaseIsNotAccessible",",,,%s,,,") a0) /// The record, struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:944) + /// (Originally from ..\FSComp.txt:946) static member fieldIsNotAccessible(a0 : System.String) = (1096, GetStringFunc("fieldIsNotAccessible",",,,%s,,,") a0) /// The struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:945) + /// (Originally from ..\FSComp.txt:947) static member structOrClassFieldIsNotAccessible(a0 : System.String) = (1097, GetStringFunc("structOrClassFieldIsNotAccessible",",,,%s,,,") a0) /// This construct is experimental - /// (Originally from ..\FSComp.txt:946) + /// (Originally from ..\FSComp.txt:948) static member experimentalConstruct() = (GetStringFunc("experimentalConstruct",",,,") ) /// No Invoke methods found for delegate type - /// (Originally from ..\FSComp.txt:947) + /// (Originally from ..\FSComp.txt:949) static member noInvokeMethodsFound() = (1099, GetStringFunc("noInvokeMethodsFound",",,,") ) /// More than one Invoke method found for delegate type - /// (Originally from ..\FSComp.txt:948) + /// (Originally from ..\FSComp.txt:950) static member moreThanOneInvokeMethodFound() = (GetStringFunc("moreThanOneInvokeMethodFound",",,,") ) /// Delegates are not allowed to have curried signatures - /// (Originally from ..\FSComp.txt:949) + /// (Originally from ..\FSComp.txt:951) static member delegatesNotAllowedToHaveCurriedSignatures() = (1101, GetStringFunc("delegatesNotAllowedToHaveCurriedSignatures",",,,") ) /// Unexpected Expr.TyChoose - /// (Originally from ..\FSComp.txt:950) + /// (Originally from ..\FSComp.txt:952) static member tlrUnexpectedTExpr() = (1102, GetStringFunc("tlrUnexpectedTExpr",",,,") ) /// Note: Lambda-lifting optimizations have not been applied because of the use of this local constrained generic function as a first class value. Adding type constraints may resolve this condition. - /// (Originally from ..\FSComp.txt:951) + /// (Originally from ..\FSComp.txt:953) static member tlrLambdaLiftingOptimizationsNotApplied() = (1103, GetStringFunc("tlrLambdaLiftingOptimizationsNotApplied",",,,") ) /// Identifiers containing '@' are reserved for use in F# code generation - /// (Originally from ..\FSComp.txt:952) + /// (Originally from ..\FSComp.txt:954) static member lexhlpIdentifiersContainingAtSymbolReserved() = (1104, GetStringFunc("lexhlpIdentifiersContainingAtSymbolReserved",",,,") ) /// The identifier '%s' is reserved for future use by F# - /// (Originally from ..\FSComp.txt:953) + /// (Originally from ..\FSComp.txt:955) static member lexhlpIdentifierReserved(a0 : System.String) = (GetStringFunc("lexhlpIdentifierReserved",",,,%s,,,") a0) /// Missing variable '%s' - /// (Originally from ..\FSComp.txt:954) + /// (Originally from ..\FSComp.txt:956) static member patcMissingVariable(a0 : System.String) = (1106, GetStringFunc("patcMissingVariable",",,,%s,,,") a0) /// Partial active patterns may only generate one result - /// (Originally from ..\FSComp.txt:955) + /// (Originally from ..\FSComp.txt:957) static member patcPartialActivePatternsGenerateOneResult() = (1107, GetStringFunc("patcPartialActivePatternsGenerateOneResult",",,,") ) /// The type '%s' is required here and is unavailable. You must add a reference to assembly '%s'. - /// (Originally from ..\FSComp.txt:956) + /// (Originally from ..\FSComp.txt:958) static member impTypeRequiredUnavailable(a0 : System.String, a1 : System.String) = (1108, GetStringFunc("impTypeRequiredUnavailable",",,,%s,,,%s,,,") a0 a1) /// A reference to the type '%s' in assembly '%s' was found, but the type could not be found in that assembly - /// (Originally from ..\FSComp.txt:957) + /// (Originally from ..\FSComp.txt:959) static member impReferencedTypeCouldNotBeFoundInAssembly(a0 : System.String, a1 : System.String) = (1109, GetStringFunc("impReferencedTypeCouldNotBeFoundInAssembly",",,,%s,,,%s,,,") a0 a1) /// Internal error or badly formed metadata: not enough type parameters were in scope while importing - /// (Originally from ..\FSComp.txt:958) + /// (Originally from ..\FSComp.txt:960) static member impNotEnoughTypeParamsInScopeWhileImporting() = (1110, GetStringFunc("impNotEnoughTypeParamsInScopeWhileImporting",",,,") ) /// A reference to the DLL %s is required by assembly %s. The imported type %s is located in the first assembly and could not be resolved. - /// (Originally from ..\FSComp.txt:959) + /// (Originally from ..\FSComp.txt:961) static member impReferenceToDllRequiredByAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (1111, GetStringFunc("impReferenceToDllRequiredByAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// An imported assembly uses the type '%s' but that type is not public - /// (Originally from ..\FSComp.txt:960) + /// (Originally from ..\FSComp.txt:962) static member impImportedAssemblyUsesNotPublicType(a0 : System.String) = (1112, GetStringFunc("impImportedAssemblyUsesNotPublicType",",,,%s,,,") a0) /// The value '%s' was marked inline but its implementation makes use of an internal or private function which is not sufficiently accessible - /// (Originally from ..\FSComp.txt:961) + /// (Originally from ..\FSComp.txt:963) static member optValueMarkedInlineButIncomplete(a0 : System.String) = (1113, GetStringFunc("optValueMarkedInlineButIncomplete",",,,%s,,,") a0) /// The value '%s' was marked inline but was not bound in the optimization environment - /// (Originally from ..\FSComp.txt:962) + /// (Originally from ..\FSComp.txt:964) static member optValueMarkedInlineButWasNotBoundInTheOptEnv(a0 : System.String) = (1114, GetStringFunc("optValueMarkedInlineButWasNotBoundInTheOptEnv",",,,%s,,,") a0) /// Local value %s not found during optimization - /// (Originally from ..\FSComp.txt:963) + /// (Originally from ..\FSComp.txt:965) static member optLocalValueNotFoundDuringOptimization(a0 : System.String) = (1115, GetStringFunc("optLocalValueNotFoundDuringOptimization",",,,%s,,,") a0) /// A value marked as 'inline' has an unexpected value - /// (Originally from ..\FSComp.txt:964) + /// (Originally from ..\FSComp.txt:966) static member optValueMarkedInlineHasUnexpectedValue() = (1116, GetStringFunc("optValueMarkedInlineHasUnexpectedValue",",,,") ) /// A value marked as 'inline' could not be inlined - /// (Originally from ..\FSComp.txt:965) + /// (Originally from ..\FSComp.txt:967) static member optValueMarkedInlineCouldNotBeInlined() = (1117, GetStringFunc("optValueMarkedInlineCouldNotBeInlined",",,,") ) /// Failed to inline the value '%s' marked 'inline', perhaps because a recursive value was marked 'inline' - /// (Originally from ..\FSComp.txt:966) + /// (Originally from ..\FSComp.txt:968) static member optFailedToInlineValue(a0 : System.String) = (1118, GetStringFunc("optFailedToInlineValue",",,,%s,,,") a0) /// Recursive ValValue %s - /// (Originally from ..\FSComp.txt:967) + /// (Originally from ..\FSComp.txt:969) static member optRecursiveValValue(a0 : System.String) = (1119, GetStringFunc("optRecursiveValValue",",,,%s,,,") a0) /// The indentation of this 'in' token is incorrect with respect to the corresponding 'let' - /// (Originally from ..\FSComp.txt:968) + /// (Originally from ..\FSComp.txt:970) static member lexfltIncorrentIndentationOfIn() = (GetStringFunc("lexfltIncorrentIndentationOfIn",",,,") ) /// Possible incorrect indentation: this token is offside of context started at position %s. Try indenting this token further or using standard formatting conventions. - /// (Originally from ..\FSComp.txt:969) + /// (Originally from ..\FSComp.txt:971) static member lexfltTokenIsOffsideOfContextStartedEarlier(a0 : System.String) = (GetStringFunc("lexfltTokenIsOffsideOfContextStartedEarlier",",,,%s,,,") a0) /// The '|' tokens separating rules of this pattern match are misaligned by one column. Consider realigning your code or using further indentation. - /// (Originally from ..\FSComp.txt:970) + /// (Originally from ..\FSComp.txt:972) static member lexfltSeparatorTokensOfPatternMatchMisaligned() = (GetStringFunc("lexfltSeparatorTokensOfPatternMatchMisaligned",",,,") ) /// Invalid module/expression/type - /// (Originally from ..\FSComp.txt:971) + /// (Originally from ..\FSComp.txt:973) static member nrInvalidModuleExprType() = (1123, GetStringFunc("nrInvalidModuleExprType",",,,") ) /// Multiple types exist called '%s', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. '%s'. - /// (Originally from ..\FSComp.txt:972) + /// (Originally from ..\FSComp.txt:974) static member nrTypeInstantiationNeededToDisambiguateTypesWithSameName(a0 : System.String, a1 : System.String) = (1124, GetStringFunc("nrTypeInstantiationNeededToDisambiguateTypesWithSameName",",,,%s,,,%s,,,") a0 a1) /// The instantiation of the generic type '%s' is missing and can't be inferred from the arguments or return type of this member. Consider providing a type instantiation when accessing this type, e.g. '%s'. - /// (Originally from ..\FSComp.txt:973) + /// (Originally from ..\FSComp.txt:975) static member nrTypeInstantiationIsMissingAndCouldNotBeInferred(a0 : System.String, a1 : System.String) = (1125, GetStringFunc("nrTypeInstantiationIsMissingAndCouldNotBeInferred",",,,%s,,,%s,,,") a0 a1) /// 'global' may only be used as the first name in a qualified path - /// (Originally from ..\FSComp.txt:974) + /// (Originally from ..\FSComp.txt:976) static member nrGlobalUsedOnlyAsFirstName() = (1126, GetStringFunc("nrGlobalUsedOnlyAsFirstName",",,,") ) /// This is not a constructor or literal, or a constructor is being used incorrectly - /// (Originally from ..\FSComp.txt:975) + /// (Originally from ..\FSComp.txt:977) static member nrIsNotConstructorOrLiteral() = (1127, GetStringFunc("nrIsNotConstructorOrLiteral",",,,") ) /// Unexpected empty long identifier - /// (Originally from ..\FSComp.txt:976) + /// (Originally from ..\FSComp.txt:978) static member nrUnexpectedEmptyLongId() = (1128, GetStringFunc("nrUnexpectedEmptyLongId",",,,") ) /// The record type '%s' does not contain a label '%s'. - /// (Originally from ..\FSComp.txt:977) + /// (Originally from ..\FSComp.txt:979) static member nrRecordDoesNotContainSuchLabel(a0 : System.String, a1 : System.String) = (1129, GetStringFunc("nrRecordDoesNotContainSuchLabel",",,,%s,,,%s,,,") a0 a1) /// Invalid field label - /// (Originally from ..\FSComp.txt:978) + /// (Originally from ..\FSComp.txt:980) static member nrInvalidFieldLabel() = (1130, GetStringFunc("nrInvalidFieldLabel",",,,") ) /// Invalid expression '%s' - /// (Originally from ..\FSComp.txt:979) + /// (Originally from ..\FSComp.txt:981) static member nrInvalidExpression(a0 : System.String) = (1132, GetStringFunc("nrInvalidExpression",",,,%s,,,") a0) /// No constructors are available for the type '%s' - /// (Originally from ..\FSComp.txt:980) + /// (Originally from ..\FSComp.txt:982) static member nrNoConstructorsAvailableForType(a0 : System.String) = (1133, GetStringFunc("nrNoConstructorsAvailableForType",",,,%s,,,") a0) /// The union type for union case '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the union type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:981) + /// (Originally from ..\FSComp.txt:983) static member nrUnionTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1134, GetStringFunc("nrUnionTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// The record type for the record field '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the record type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:982) + /// (Originally from ..\FSComp.txt:984) static member nrRecordTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1135, GetStringFunc("nrRecordTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// Unexpected error creating debug information file '%s' - /// (Originally from ..\FSComp.txt:983) + /// (Originally from ..\FSComp.txt:985) static member ilwriteErrorCreatingPdb(a0 : System.String) = (1136, GetStringFunc("ilwriteErrorCreatingPdb",",,,%s,,,") a0) /// This number is outside the allowable range for this integer type - /// (Originally from ..\FSComp.txt:984) + /// (Originally from ..\FSComp.txt:986) static member lexOutsideIntegerRange() = (1138, GetStringFunc("lexOutsideIntegerRange",",,,") ) /// '%s' is not permitted as a character in operator names and is reserved for future use - /// (Originally from ..\FSComp.txt:988) + /// (Originally from ..\FSComp.txt:990) static member lexCharNotAllowedInOperatorNames(a0 : System.String) = (GetStringFunc("lexCharNotAllowedInOperatorNames",",,,%s,,,") a0) /// Unexpected character '%s' - /// (Originally from ..\FSComp.txt:989) + /// (Originally from ..\FSComp.txt:991) static member lexUnexpectedChar(a0 : System.String) = (GetStringFunc("lexUnexpectedChar",",,,%s,,,") a0) /// This byte array literal contains characters that do not encode as a single byte - /// (Originally from ..\FSComp.txt:990) + /// (Originally from ..\FSComp.txt:992) static member lexByteArrayCannotEncode() = (1140, GetStringFunc("lexByteArrayCannotEncode",",,,") ) /// Identifiers followed by '%s' are reserved for future use - /// (Originally from ..\FSComp.txt:991) + /// (Originally from ..\FSComp.txt:993) static member lexIdentEndInMarkReserved(a0 : System.String) = (1141, GetStringFunc("lexIdentEndInMarkReserved",",,,%s,,,") a0) /// This number is outside the allowable range for 8-bit signed integers - /// (Originally from ..\FSComp.txt:992) + /// (Originally from ..\FSComp.txt:994) static member lexOutsideEightBitSigned() = (1142, GetStringFunc("lexOutsideEightBitSigned",",,,") ) /// This number is outside the allowable range for hexadecimal 8-bit signed integers - /// (Originally from ..\FSComp.txt:993) + /// (Originally from ..\FSComp.txt:995) static member lexOutsideEightBitSignedHex() = (1143, GetStringFunc("lexOutsideEightBitSignedHex",",,,") ) /// This number is outside the allowable range for 8-bit unsigned integers - /// (Originally from ..\FSComp.txt:994) + /// (Originally from ..\FSComp.txt:996) static member lexOutsideEightBitUnsigned() = (1144, GetStringFunc("lexOutsideEightBitUnsigned",",,,") ) /// This number is outside the allowable range for 16-bit signed integers - /// (Originally from ..\FSComp.txt:995) + /// (Originally from ..\FSComp.txt:997) static member lexOutsideSixteenBitSigned() = (1145, GetStringFunc("lexOutsideSixteenBitSigned",",,,") ) /// This number is outside the allowable range for 16-bit unsigned integers - /// (Originally from ..\FSComp.txt:996) + /// (Originally from ..\FSComp.txt:998) static member lexOutsideSixteenBitUnsigned() = (1146, GetStringFunc("lexOutsideSixteenBitUnsigned",",,,") ) /// This number is outside the allowable range for 32-bit signed integers - /// (Originally from ..\FSComp.txt:997) + /// (Originally from ..\FSComp.txt:999) static member lexOutsideThirtyTwoBitSigned() = (1147, GetStringFunc("lexOutsideThirtyTwoBitSigned",",,,") ) /// This number is outside the allowable range for 32-bit unsigned integers - /// (Originally from ..\FSComp.txt:998) + /// (Originally from ..\FSComp.txt:1000) static member lexOutsideThirtyTwoBitUnsigned() = (1148, GetStringFunc("lexOutsideThirtyTwoBitUnsigned",",,,") ) /// This number is outside the allowable range for 64-bit signed integers - /// (Originally from ..\FSComp.txt:999) + /// (Originally from ..\FSComp.txt:1001) static member lexOutsideSixtyFourBitSigned() = (1149, GetStringFunc("lexOutsideSixtyFourBitSigned",",,,") ) /// This number is outside the allowable range for 64-bit unsigned integers - /// (Originally from ..\FSComp.txt:1000) + /// (Originally from ..\FSComp.txt:1002) static member lexOutsideSixtyFourBitUnsigned() = (1150, GetStringFunc("lexOutsideSixtyFourBitUnsigned",",,,") ) /// This number is outside the allowable range for signed native integers - /// (Originally from ..\FSComp.txt:1001) + /// (Originally from ..\FSComp.txt:1003) static member lexOutsideNativeSigned() = (1151, GetStringFunc("lexOutsideNativeSigned",",,,") ) /// This number is outside the allowable range for unsigned native integers - /// (Originally from ..\FSComp.txt:1002) + /// (Originally from ..\FSComp.txt:1004) static member lexOutsideNativeUnsigned() = (1152, GetStringFunc("lexOutsideNativeUnsigned",",,,") ) /// Invalid floating point number - /// (Originally from ..\FSComp.txt:1003) + /// (Originally from ..\FSComp.txt:1005) static member lexInvalidFloat() = (1153, GetStringFunc("lexInvalidFloat",",,,") ) /// This number is outside the allowable range for decimal literals - /// (Originally from ..\FSComp.txt:1004) + /// (Originally from ..\FSComp.txt:1006) static member lexOusideDecimal() = (1154, GetStringFunc("lexOusideDecimal",",,,") ) /// This number is outside the allowable range for 32-bit floats - /// (Originally from ..\FSComp.txt:1005) + /// (Originally from ..\FSComp.txt:1007) static member lexOusideThirtyTwoBitFloat() = (1155, GetStringFunc("lexOusideThirtyTwoBitFloat",",,,") ) /// This is not a valid numeric literal. Valid numeric literals include 1, 0x1, 0b0001 (int), 1u (uint32), 1L (int64), 1UL (uint64), 1s (int16), 1y (sbyte), 1uy (byte), 1.0 (float), 1.0f (float32), 1.0m (decimal), 1I (BigInteger). - /// (Originally from ..\FSComp.txt:1006) + /// (Originally from ..\FSComp.txt:1008) static member lexInvalidNumericLiteral() = (1156, GetStringFunc("lexInvalidNumericLiteral",",,,") ) /// This is not a valid byte literal - /// (Originally from ..\FSComp.txt:1007) + /// (Originally from ..\FSComp.txt:1009) static member lexInvalidByteLiteral() = (1157, GetStringFunc("lexInvalidByteLiteral",",,,") ) /// This is not a valid character literal - /// (Originally from ..\FSComp.txt:1008) + /// (Originally from ..\FSComp.txt:1010) static member lexInvalidCharLiteral() = (1158, GetStringFunc("lexInvalidCharLiteral",",,,") ) /// This Unicode encoding is only valid in string literals - /// (Originally from ..\FSComp.txt:1009) + /// (Originally from ..\FSComp.txt:1011) static member lexThisUnicodeOnlyInStringLiterals() = (1159, GetStringFunc("lexThisUnicodeOnlyInStringLiterals",",,,") ) /// This token is reserved for future use - /// (Originally from ..\FSComp.txt:1010) + /// (Originally from ..\FSComp.txt:1012) static member lexTokenReserved() = (1160, GetStringFunc("lexTokenReserved",",,,") ) /// TABs are not allowed in F# code unless the #indent \"off\" option is used - /// (Originally from ..\FSComp.txt:1011) + /// (Originally from ..\FSComp.txt:1013) static member lexTabsNotAllowed() = (1161, GetStringFunc("lexTabsNotAllowed",",,,") ) /// Invalid line number: '%s' - /// (Originally from ..\FSComp.txt:1012) + /// (Originally from ..\FSComp.txt:1014) static member lexInvalidLineNumber(a0 : System.String) = (1162, GetStringFunc("lexInvalidLineNumber",",,,%s,,,") a0) /// #if directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1013) + /// (Originally from ..\FSComp.txt:1015) static member lexHashIfMustBeFirst() = (1163, GetStringFunc("lexHashIfMustBeFirst",",,,") ) /// #else has no matching #if - /// (Originally from ..\FSComp.txt:1014) + /// (Originally from ..\FSComp.txt:1016) static member lexHashElseNoMatchingIf() = (GetStringFunc("lexHashElseNoMatchingIf",",,,") ) /// #endif required for #else - /// (Originally from ..\FSComp.txt:1015) + /// (Originally from ..\FSComp.txt:1017) static member lexHashEndifRequiredForElse() = (GetStringFunc("lexHashEndifRequiredForElse",",,,") ) /// #else directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1016) + /// (Originally from ..\FSComp.txt:1018) static member lexHashElseMustBeFirst() = (1166, GetStringFunc("lexHashElseMustBeFirst",",,,") ) /// #endif has no matching #if - /// (Originally from ..\FSComp.txt:1017) + /// (Originally from ..\FSComp.txt:1019) static member lexHashEndingNoMatchingIf() = (GetStringFunc("lexHashEndingNoMatchingIf",",,,") ) /// #endif directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1018) + /// (Originally from ..\FSComp.txt:1020) static member lexHashEndifMustBeFirst() = (1168, GetStringFunc("lexHashEndifMustBeFirst",",,,") ) /// #if directive should be immediately followed by an identifier - /// (Originally from ..\FSComp.txt:1019) + /// (Originally from ..\FSComp.txt:1021) static member lexHashIfMustHaveIdent() = (1169, GetStringFunc("lexHashIfMustHaveIdent",",,,") ) /// Syntax error. Wrong nested #endif, unexpected tokens before it. - /// (Originally from ..\FSComp.txt:1020) + /// (Originally from ..\FSComp.txt:1022) static member lexWrongNestedHashEndif() = (1170, GetStringFunc("lexWrongNestedHashEndif",",,,") ) /// #! may only appear as the first line at the start of a file. - /// (Originally from ..\FSComp.txt:1021) + /// (Originally from ..\FSComp.txt:1023) static member lexHashBangMustBeFirstInFile() = (GetStringFunc("lexHashBangMustBeFirstInFile",",,,") ) /// Expected single line comment or end of line - /// (Originally from ..\FSComp.txt:1022) + /// (Originally from ..\FSComp.txt:1024) static member pplexExpectedSingleLineComment() = (1171, GetStringFunc("pplexExpectedSingleLineComment",",,,") ) /// Infix operator member '%s' has no arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1023) + /// (Originally from ..\FSComp.txt:1025) static member memberOperatorDefinitionWithNoArguments(a0 : System.String) = (1172, GetStringFunc("memberOperatorDefinitionWithNoArguments",",,,%s,,,") a0) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1024) + /// (Originally from ..\FSComp.txt:1026) static member memberOperatorDefinitionWithNonPairArgument(a0 : System.String, a1 : System.Int32) = (1173, GetStringFunc("memberOperatorDefinitionWithNonPairArgument",",,,%s,,,%d,,,") a0 a1) /// Infix operator member '%s' has extra curried arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1025) + /// (Originally from ..\FSComp.txt:1027) static member memberOperatorDefinitionWithCurriedArguments(a0 : System.String) = (1174, GetStringFunc("memberOperatorDefinitionWithCurriedArguments",",,,%s,,,") a0) /// All record, union and struct types in FSharp.Core.dll must be explicitly labelled with 'StructuralComparison' or 'NoComparison' - /// (Originally from ..\FSComp.txt:1026) + /// (Originally from ..\FSComp.txt:1028) static member tcFSharpCoreRequiresExplicit() = (1175, GetStringFunc("tcFSharpCoreRequiresExplicit",",,,") ) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the type parameter '%s' does not satisfy the 'comparison' constraint. Consider adding the 'comparison' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1027) + /// (Originally from ..\FSComp.txt:1029) static member tcStructuralComparisonNotSatisfied1(a0 : System.String, a1 : System.String) = (1176, GetStringFunc("tcStructuralComparisonNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the component type '%s' does not satisfy the 'comparison' constraint - /// (Originally from ..\FSComp.txt:1028) + /// (Originally from ..\FSComp.txt:1030) static member tcStructuralComparisonNotSatisfied2(a0 : System.String, a1 : System.String) = (1177, GetStringFunc("tcStructuralComparisonNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' is not structurally comparable because the type parameter %s does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1029) + /// (Originally from ..\FSComp.txt:1031) static member tcNoComparisonNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' is not structurally comparable because the type '%s' does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1030) + /// (Originally from ..\FSComp.txt:1032) static member tcNoComparisonNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type parameter %s does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1031) + /// (Originally from ..\FSComp.txt:1033) static member tcNoEqualityNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type '%s' does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1032) + /// (Originally from ..\FSComp.txt:1034) static member tcNoEqualityNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the type parameter '%s' does not satisfy the 'equality' constraint. Consider adding the 'equality' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1033) + /// (Originally from ..\FSComp.txt:1035) static member tcStructuralEqualityNotSatisfied1(a0 : System.String, a1 : System.String) = (1179, GetStringFunc("tcStructuralEqualityNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the component type '%s' does not satisfy the 'equality' constraint - /// (Originally from ..\FSComp.txt:1034) + /// (Originally from ..\FSComp.txt:1036) static member tcStructuralEqualityNotSatisfied2(a0 : System.String, a1 : System.String) = (1180, GetStringFunc("tcStructuralEqualityNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// Each argument of the primary constructor for a struct must be given a type, for example 'type S(x1:int, x2: int) = ...'. These arguments determine the fields of the struct. - /// (Originally from ..\FSComp.txt:1035) + /// (Originally from ..\FSComp.txt:1037) static member tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly() = (1181, GetStringFunc("tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly",",,,") ) /// The value '%s' is unused - /// (Originally from ..\FSComp.txt:1036) + /// (Originally from ..\FSComp.txt:1038) static member chkUnusedValue(a0 : System.String) = (1182, GetStringFunc("chkUnusedValue",",,,%s,,,") a0) /// The recursive object reference '%s' is unused. The presence of a recursive object reference adds runtime initialization checks to members in this and derived types. Consider removing this recursive object reference. - /// (Originally from ..\FSComp.txt:1037) + /// (Originally from ..\FSComp.txt:1039) static member chkUnusedThisVariable(a0 : System.String) = (1183, GetStringFunc("chkUnusedThisVariable",",,,%s,,,") a0) /// A getter property may have at most one argument group - /// (Originally from ..\FSComp.txt:1038) + /// (Originally from ..\FSComp.txt:1040) static member parsGetterAtMostOneArgument() = (1184, GetStringFunc("parsGetterAtMostOneArgument",",,,") ) /// A setter property may have at most two argument groups - /// (Originally from ..\FSComp.txt:1039) + /// (Originally from ..\FSComp.txt:1041) static member parsSetterAtMostTwoArguments() = (1185, GetStringFunc("parsSetterAtMostTwoArguments",",,,") ) /// Invalid property getter or setter - /// (Originally from ..\FSComp.txt:1040) + /// (Originally from ..\FSComp.txt:1042) static member parsInvalidProperty() = (1186, GetStringFunc("parsInvalidProperty",",,,") ) /// An indexer property must be given at least one argument - /// (Originally from ..\FSComp.txt:1041) + /// (Originally from ..\FSComp.txt:1043) static member parsIndexerPropertyRequiresAtLeastOneArgument() = (1187, GetStringFunc("parsIndexerPropertyRequiresAtLeastOneArgument",",,,") ) /// This operation accesses a mutable top-level value defined in another assembly in an unsupported way. The value cannot be accessed through its address. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...', and if necessary assigning the value back after the completion of the operation - /// (Originally from ..\FSComp.txt:1042) + /// (Originally from ..\FSComp.txt:1044) static member tastInvalidAddressOfMutableAcrossAssemblyBoundary() = (1188, GetStringFunc("tastInvalidAddressOfMutableAcrossAssemblyBoundary",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"type C<'T>\", not type \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1043) + /// (Originally from ..\FSComp.txt:1045) static member parsNonAdjacentTypars() = (1189, GetStringFunc("parsNonAdjacentTypars",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"C<'T>\", not \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1044) + /// (Originally from ..\FSComp.txt:1046) static member parsNonAdjacentTyargs() = (1190, GetStringFunc("parsNonAdjacentTyargs",",,,") ) /// The use of the type syntax 'int C' and 'C ' is not permitted here. Consider adjusting this type to be written in the form 'C' - /// (Originally from ..\FSComp.txt:1045) + /// (Originally from ..\FSComp.txt:1047) static member parsNonAtomicType() = (GetStringFunc("parsNonAtomicType",",,,") ) /// The module/namespace '%s' from compilation unit '%s' did not contain the module/namespace '%s' - /// (Originally from ..\FSComp.txt:1048) + /// (Originally from ..\FSComp.txt:1050) static member tastUndefinedItemRefModuleNamespace(a0 : System.String, a1 : System.String, a2 : System.String) = (1193, GetStringFunc("tastUndefinedItemRefModuleNamespace",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the val '%s' - /// (Originally from ..\FSComp.txt:1049) + /// (Originally from ..\FSComp.txt:1051) static member tastUndefinedItemRefVal(a0 : System.String, a1 : System.String, a2 : System.String) = (1194, GetStringFunc("tastUndefinedItemRefVal",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the namespace, module or type '%s' - /// (Originally from ..\FSComp.txt:1050) + /// (Originally from ..\FSComp.txt:1052) static member tastUndefinedItemRefModuleNamespaceType(a0 : System.String, a1 : System.String, a2 : System.String) = (1195, GetStringFunc("tastUndefinedItemRefModuleNamespaceType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The 'UseNullAsTrueValue' attribute flag may only be used with union types that have one nullary case and at least one non-nullary case - /// (Originally from ..\FSComp.txt:1051) + /// (Originally from ..\FSComp.txt:1053) static member tcInvalidUseNullAsTrueValue() = (1196, GetStringFunc("tcInvalidUseNullAsTrueValue",",,,") ) /// The parameter '%s' was inferred to have byref type. Parameters of byref type must be given an explicit type annotation, e.g. 'x1: byref'. When used, a byref parameter is implicitly dereferenced. - /// (Originally from ..\FSComp.txt:1052) + /// (Originally from ..\FSComp.txt:1054) static member tcParameterInferredByref(a0 : System.String) = (1197, GetStringFunc("tcParameterInferredByref",",,,%s,,,") a0) /// The generic member '%s' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints. - /// (Originally from ..\FSComp.txt:1053) + /// (Originally from ..\FSComp.txt:1055) static member tcNonUniformMemberUse(a0 : System.String) = (1198, GetStringFunc("tcNonUniformMemberUse",",,,%s,,,") a0) /// The attribute '%s' appears in both the implementation and the signature, but the attribute arguments differ. Only the attribute from the signature will be included in the compiled code. - /// (Originally from ..\FSComp.txt:1054) + /// (Originally from ..\FSComp.txt:1056) static member tcAttribArgsDiffer(a0 : System.String) = (1200, GetStringFunc("tcAttribArgsDiffer",",,,%s,,,") a0) /// Cannot call an abstract base member: '%s' - /// (Originally from ..\FSComp.txt:1055) + /// (Originally from ..\FSComp.txt:1057) static member tcCannotCallAbstractBaseMember(a0 : System.String) = (1201, GetStringFunc("tcCannotCallAbstractBaseMember",",,,%s,,,") a0) /// Could not resolve the ambiguity in the use of a generic construct with an 'unmanaged' constraint at or near this position - /// (Originally from ..\FSComp.txt:1056) + /// (Originally from ..\FSComp.txt:1058) static member typrelCannotResolveAmbiguityInUnmanaged() = (1202, GetStringFunc("typrelCannotResolveAmbiguityInUnmanaged",",,,") ) /// This construct is for ML compatibility. %s. You can disable this warning by using '--mlcompatibility' or '--nowarn:62'. - /// (Originally from ..\FSComp.txt:1059) + /// (Originally from ..\FSComp.txt:1061) static member mlCompatMessage(a0 : System.String) = (GetStringFunc("mlCompatMessage",",,,%s,,,") a0) /// The type '%s' has been marked as having an Explicit layout, but the field '%s' has not been marked with the 'FieldOffset' attribute - /// (Originally from ..\FSComp.txt:1061) + /// (Originally from ..\FSComp.txt:1063) static member ilFieldDoesNotHaveValidOffsetForStructureLayout(a0 : System.String, a1 : System.String) = (1206, GetStringFunc("ilFieldDoesNotHaveValidOffsetForStructureLayout",",,,%s,,,%s,,,") a0 a1) /// Interfaces inherited by other interfaces should be declared using 'inherit ...' instead of 'interface ...' - /// (Originally from ..\FSComp.txt:1062) + /// (Originally from ..\FSComp.txt:1064) static member tcInterfacesShouldUseInheritNotInterface() = (1207, GetStringFunc("tcInterfacesShouldUseInheritNotInterface",",,,") ) /// Invalid prefix operator - /// (Originally from ..\FSComp.txt:1063) + /// (Originally from ..\FSComp.txt:1065) static member parsInvalidPrefixOperator() = (1208, GetStringFunc("parsInvalidPrefixOperator",",,,") ) /// Invalid operator definition. Prefix operator definitions must use a valid prefix operator name. - /// (Originally from ..\FSComp.txt:1064) + /// (Originally from ..\FSComp.txt:1066) static member parsInvalidPrefixOperatorDefinition() = (1208, GetStringFunc("parsInvalidPrefixOperatorDefinition",",,,") ) /// The file extensions '.ml' and '.mli' are for ML compatibility - /// (Originally from ..\FSComp.txt:1065) + /// (Originally from ..\FSComp.txt:1067) static member buildCompilingExtensionIsForML() = (GetStringFunc("buildCompilingExtensionIsForML",",,,") ) /// Consider using a file with extension '.ml' or '.mli' instead - /// (Originally from ..\FSComp.txt:1066) + /// (Originally from ..\FSComp.txt:1068) static member lexIndentOffForML() = (GetStringFunc("lexIndentOffForML",",,,") ) /// Active pattern '%s' is not a function - /// (Originally from ..\FSComp.txt:1067) + /// (Originally from ..\FSComp.txt:1069) static member activePatternIdentIsNotFunctionTyped(a0 : System.String) = (1209, GetStringFunc("activePatternIdentIsNotFunctionTyped",",,,%s,,,") a0) /// Active pattern '%s' has a result type containing type variables that are not determined by the input. The common cause is a when a result case is not mentioned, e.g. 'let (|A|B|) (x:int) = A x'. This can be fixed with a type constraint, e.g. 'let (|A|B|) (x:int) : Choice = A x' - /// (Originally from ..\FSComp.txt:1068) + /// (Originally from ..\FSComp.txt:1070) static member activePatternChoiceHasFreeTypars(a0 : System.String) = (1210, GetStringFunc("activePatternChoiceHasFreeTypars",",,,%s,,,") a0) /// The FieldOffset attribute can only be placed on members of types marked with the StructLayout(LayoutKind.Explicit) - /// (Originally from ..\FSComp.txt:1069) + /// (Originally from ..\FSComp.txt:1071) static member ilFieldHasOffsetForSequentialLayout() = (1211, GetStringFunc("ilFieldHasOffsetForSequentialLayout",",,,") ) /// Optional arguments must come at the end of the argument list, after any non-optional arguments - /// (Originally from ..\FSComp.txt:1070) + /// (Originally from ..\FSComp.txt:1072) static member tcOptionalArgsMustComeAfterNonOptionalArgs() = (1212, GetStringFunc("tcOptionalArgsMustComeAfterNonOptionalArgs",",,,") ) /// Attribute 'System.Diagnostics.ConditionalAttribute' is only valid on methods or attribute classes - /// (Originally from ..\FSComp.txt:1071) + /// (Originally from ..\FSComp.txt:1073) static member tcConditionalAttributeUsage() = (1213, GetStringFunc("tcConditionalAttributeUsage",",,,") ) /// Extension members cannot provide operator overloads. Consider defining the operator as part of the type definition instead. - /// (Originally from ..\FSComp.txt:1073) + /// (Originally from ..\FSComp.txt:1075) static member tcMemberOperatorDefinitionInExtrinsic() = (1215, GetStringFunc("tcMemberOperatorDefinitionInExtrinsic",",,,") ) /// The name of the MDB file must be .mdb. The --pdb option will be ignored. - /// (Originally from ..\FSComp.txt:1074) + /// (Originally from ..\FSComp.txt:1076) static member ilwriteMDBFileNameCannotBeChangedWarning() = (1216, GetStringFunc("ilwriteMDBFileNameCannotBeChangedWarning",",,,") ) /// MDB generation failed. Could not find compatible member %s - /// (Originally from ..\FSComp.txt:1075) + /// (Originally from ..\FSComp.txt:1077) static member ilwriteMDBMemberMissing(a0 : System.String) = (1217, GetStringFunc("ilwriteMDBMemberMissing",",,,%s,,,") a0) /// Cannot generate MDB debug information. Failed to load the 'MonoSymbolWriter' type from the 'Mono.CompilerServices.SymbolWriter.dll' assembly. - /// (Originally from ..\FSComp.txt:1076) + /// (Originally from ..\FSComp.txt:1078) static member ilwriteErrorCreatingMdb() = (1218, GetStringFunc("ilwriteErrorCreatingMdb",",,,") ) /// The union case named '%s' conflicts with the generated type '%s' - /// (Originally from ..\FSComp.txt:1077) + /// (Originally from ..\FSComp.txt:1079) static member tcUnionCaseNameConflictsWithGeneratedType(a0 : System.String, a1 : System.String) = (1219, GetStringFunc("tcUnionCaseNameConflictsWithGeneratedType",",,,%s,,,%s,,,") a0 a1) /// ReflectedDefinitionAttribute may not be applied to an instance member on a struct type, because the instance member takes an implicit 'this' byref parameter - /// (Originally from ..\FSComp.txt:1078) + /// (Originally from ..\FSComp.txt:1080) static member chkNoReflectedDefinitionOnStructMember() = (1220, GetStringFunc("chkNoReflectedDefinitionOnStructMember",",,,") ) /// DLLImport bindings must be static members in a class or function definitions in a module - /// (Originally from ..\FSComp.txt:1079) + /// (Originally from ..\FSComp.txt:1081) static member tcDllImportNotAllowed() = (1221, GetStringFunc("tcDllImportNotAllowed",",,,") ) /// When mscorlib.dll or FSharp.Core.dll is explicitly referenced the %s option must also be passed - /// (Originally from ..\FSComp.txt:1080) + /// (Originally from ..\FSComp.txt:1082) static member buildExplicitCoreLibRequiresNoFramework(a0 : System.String) = (1222, GetStringFunc("buildExplicitCoreLibRequiresNoFramework",",,,%s,,,") a0) /// FSharp.Core.sigdata not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1081) + /// (Originally from ..\FSComp.txt:1083) static member buildExpectedSigdataFile(a0 : System.String) = (1223, GetStringFunc("buildExpectedSigdataFile",",,,%s,,,") a0) /// File '%s' not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1082) + /// (Originally from ..\FSComp.txt:1084) static member buildExpectedFileAlongSideFSharpCore(a0 : System.String, a1 : System.String) = (1225, GetStringFunc("buildExpectedFileAlongSideFSharpCore",",,,%s,,,%s,,,") a0 a1) /// Filename '%s' contains invalid character '%s' - /// (Originally from ..\FSComp.txt:1083) + /// (Originally from ..\FSComp.txt:1085) static member buildUnexpectedFileNameCharacter(a0 : System.String, a1 : System.String) = (1227, GetStringFunc("buildUnexpectedFileNameCharacter",",,,%s,,,%s,,,") a0 a1) /// 'use!' bindings must be of the form 'use! = ' - /// (Originally from ..\FSComp.txt:1084) + /// (Originally from ..\FSComp.txt:1086) static member tcInvalidUseBangBinding() = (1228, GetStringFunc("tcInvalidUseBangBinding",",,,") ) /// Inner generic functions are not permitted in quoted expressions. Consider adding some type constraints until this function is no longer generic. - /// (Originally from ..\FSComp.txt:1085) + /// (Originally from ..\FSComp.txt:1087) static member crefNoInnerGenericsInQuotations() = (1230, GetStringFunc("crefNoInnerGenericsInQuotations",",,,") ) /// The type '%s' is not a valid enumerator type , i.e. does not have a 'MoveNext()' method returning a bool, and a 'Current' property - /// (Originally from ..\FSComp.txt:1086) + /// (Originally from ..\FSComp.txt:1088) static member tcEnumTypeCannotBeEnumerated(a0 : System.String) = (1231, GetStringFunc("tcEnumTypeCannotBeEnumerated",",,,%s,,,") a0) /// End of file in triple-quote string begun at or before here - /// (Originally from ..\FSComp.txt:1087) + /// (Originally from ..\FSComp.txt:1089) static member parsEofInTripleQuoteString() = (1232, GetStringFunc("parsEofInTripleQuoteString",",,,") ) /// End of file in triple-quote string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:1088) + /// (Originally from ..\FSComp.txt:1090) static member parsEofInTripleQuoteStringInComment() = (1233, GetStringFunc("parsEofInTripleQuoteStringInComment",",,,") ) /// This type test or downcast will ignore the unit-of-measure '%s' - /// (Originally from ..\FSComp.txt:1089) + /// (Originally from ..\FSComp.txt:1091) static member tcTypeTestLosesMeasures(a0 : System.String) = (1240, GetStringFunc("tcTypeTestLosesMeasures",",,,%s,,,") a0) /// Expected type argument or static argument - /// (Originally from ..\FSComp.txt:1090) + /// (Originally from ..\FSComp.txt:1092) static member parsMissingTypeArgs() = (1241, GetStringFunc("parsMissingTypeArgs",",,,") ) /// Unmatched '<'. Expected closing '>' - /// (Originally from ..\FSComp.txt:1091) + /// (Originally from ..\FSComp.txt:1093) static member parsMissingGreaterThan() = (1242, GetStringFunc("parsMissingGreaterThan",",,,") ) /// Unexpected quotation operator '<@' in type definition. If you intend to pass a verbatim string as a static argument to a type provider, put a space between the '<' and '@' characters. - /// (Originally from ..\FSComp.txt:1092) + /// (Originally from ..\FSComp.txt:1094) static member parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString() = (1243, GetStringFunc("parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString",",,,") ) /// Attempted to parse this as an operator name, but failed - /// (Originally from ..\FSComp.txt:1093) + /// (Originally from ..\FSComp.txt:1095) static member parsErrorParsingAsOperatorName() = (1244, GetStringFunc("parsErrorParsingAsOperatorName",",,,") ) /// \U%s is not a valid Unicode character escape sequence - /// (Originally from ..\FSComp.txt:1094) + /// (Originally from ..\FSComp.txt:1096) static member lexInvalidUnicodeLiteral(a0 : System.String) = (1245, GetStringFunc("lexInvalidUnicodeLiteral",",,,%s,,,") a0) /// '%s' must be applied to an argument of type '%s', but has been applied to an argument of type '%s' - /// (Originally from ..\FSComp.txt:1095) + /// (Originally from ..\FSComp.txt:1097) static member tcCallerInfoWrongType(a0 : System.String, a1 : System.String, a2 : System.String) = (1246, GetStringFunc("tcCallerInfoWrongType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// '%s' can only be applied to optional arguments - /// (Originally from ..\FSComp.txt:1096) + /// (Originally from ..\FSComp.txt:1098) static member tcCallerInfoNotOptional(a0 : System.String) = (1247, GetStringFunc("tcCallerInfoNotOptional",",,,%s,,,") a0) /// The specified .NET Framework version '%s' is not supported. Please specify a value from the enumeration Microsoft.Build.Utilities.TargetDotNetFrameworkVersion. - /// (Originally from ..\FSComp.txt:1098) + /// (Originally from ..\FSComp.txt:1100) static member toolLocationHelperUnsupportedFrameworkVersion(a0 : System.String) = (1300, GetStringFunc("toolLocationHelperUnsupportedFrameworkVersion",",,,%s,,,") a0) /// Invalid Magic value in CLR Header - /// (Originally from ..\FSComp.txt:1102) + /// (Originally from ..\FSComp.txt:1104) static member ilSignInvalidMagicValue() = (1301, GetStringFunc("ilSignInvalidMagicValue",",,,") ) /// Bad image format - /// (Originally from ..\FSComp.txt:1103) + /// (Originally from ..\FSComp.txt:1105) static member ilSignBadImageFormat() = (1302, GetStringFunc("ilSignBadImageFormat",",,,") ) /// Private key expected - /// (Originally from ..\FSComp.txt:1104) + /// (Originally from ..\FSComp.txt:1106) static member ilSignPrivateKeyExpected() = (1303, GetStringFunc("ilSignPrivateKeyExpected",",,,") ) /// RSA key expected - /// (Originally from ..\FSComp.txt:1105) + /// (Originally from ..\FSComp.txt:1107) static member ilSignRsaKeyExpected() = (1304, GetStringFunc("ilSignRsaKeyExpected",",,,") ) /// Invalid bit Length - /// (Originally from ..\FSComp.txt:1106) + /// (Originally from ..\FSComp.txt:1108) static member ilSignInvalidBitLen() = (1305, GetStringFunc("ilSignInvalidBitLen",",,,") ) /// Invalid RSAParameters structure - '{0}' expected - /// (Originally from ..\FSComp.txt:1107) + /// (Originally from ..\FSComp.txt:1109) static member ilSignInvalidRSAParams() = (1306, GetStringFunc("ilSignInvalidRSAParams",",,,") ) /// Invalid algId - 'Exponent' expected - /// (Originally from ..\FSComp.txt:1108) + /// (Originally from ..\FSComp.txt:1110) static member ilSignInvalidAlgId() = (1307, GetStringFunc("ilSignInvalidAlgId",",,,") ) /// Invalid signature size - /// (Originally from ..\FSComp.txt:1109) + /// (Originally from ..\FSComp.txt:1111) static member ilSignInvalidSignatureSize() = (1308, GetStringFunc("ilSignInvalidSignatureSize",",,,") ) /// No signature directory - /// (Originally from ..\FSComp.txt:1110) + /// (Originally from ..\FSComp.txt:1112) static member ilSignNoSignatureDirectory() = (1309, GetStringFunc("ilSignNoSignatureDirectory",",,,") ) /// Invalid Public Key blob - /// (Originally from ..\FSComp.txt:1111) + /// (Originally from ..\FSComp.txt:1113) static member ilSignInvalidPKBlob() = (1310, GetStringFunc("ilSignInvalidPKBlob",",,,") ) /// Exiting - too many errors - /// (Originally from ..\FSComp.txt:1113) + /// (Originally from ..\FSComp.txt:1115) static member fscTooManyErrors() = (GetStringFunc("fscTooManyErrors",",,,") ) /// The documentation file has no .xml suffix - /// (Originally from ..\FSComp.txt:1114) + /// (Originally from ..\FSComp.txt:1116) static member docfileNoXmlSuffix() = (2001, GetStringFunc("docfileNoXmlSuffix",",,,") ) /// No implementation files specified - /// (Originally from ..\FSComp.txt:1115) + /// (Originally from ..\FSComp.txt:1117) static member fscNoImplementationFiles() = (2002, GetStringFunc("fscNoImplementationFiles",",,,") ) /// The attribute %s specified version '%s', but this value is invalid and has been ignored - /// (Originally from ..\FSComp.txt:1116) + /// (Originally from ..\FSComp.txt:1118) static member fscBadAssemblyVersion(a0 : System.String, a1 : System.String) = (2003, GetStringFunc("fscBadAssemblyVersion",",,,%s,,,%s,,,") a0 a1) /// Conflicting options specified: 'win32manifest' and 'win32res'. Only one of these can be used. - /// (Originally from ..\FSComp.txt:1117) + /// (Originally from ..\FSComp.txt:1119) static member fscTwoResourceManifests() = (2004, GetStringFunc("fscTwoResourceManifests",",,,") ) /// The code in assembly '%s' makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1118) + /// (Originally from ..\FSComp.txt:1120) static member fscQuotationLiteralsStaticLinking(a0 : System.String) = (2005, GetStringFunc("fscQuotationLiteralsStaticLinking",",,,%s,,,") a0) /// Code in this assembly makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1119) + /// (Originally from ..\FSComp.txt:1121) static member fscQuotationLiteralsStaticLinking0() = (2006, GetStringFunc("fscQuotationLiteralsStaticLinking0",",,,") ) /// Static linking may not include a .EXE - /// (Originally from ..\FSComp.txt:1120) + /// (Originally from ..\FSComp.txt:1122) static member fscStaticLinkingNoEXE() = (2007, GetStringFunc("fscStaticLinkingNoEXE",",,,") ) /// Static linking may not include a mixed managed/unmanaged DLL - /// (Originally from ..\FSComp.txt:1121) + /// (Originally from ..\FSComp.txt:1123) static member fscStaticLinkingNoMixedDLL() = (2008, GetStringFunc("fscStaticLinkingNoMixedDLL",",,,") ) /// Ignoring mixed managed/unmanaged assembly '%s' during static linking - /// (Originally from ..\FSComp.txt:1122) + /// (Originally from ..\FSComp.txt:1124) static member fscIgnoringMixedWhenLinking(a0 : System.String) = (2009, GetStringFunc("fscIgnoringMixedWhenLinking",",,,%s,,,") a0) /// Assembly '%s' was referenced transitively and the assembly could not be resolved automatically. Static linking will assume this DLL has no dependencies on the F# library or other statically linked DLLs. Consider adding an explicit reference to this DLL. - /// (Originally from ..\FSComp.txt:1123) + /// (Originally from ..\FSComp.txt:1125) static member fscAssumeStaticLinkContainsNoDependencies(a0 : System.String) = (2011, GetStringFunc("fscAssumeStaticLinkContainsNoDependencies",",,,%s,,,") a0) /// Assembly '%s' not found in dependency set of target binary. Statically linked roots should be specified using an assembly name, without a DLL or EXE extension. If this assembly was referenced explicitly then it is possible the assembly was not actually required by the generated binary, in which case it should not be statically linked. - /// (Originally from ..\FSComp.txt:1124) + /// (Originally from ..\FSComp.txt:1126) static member fscAssemblyNotFoundInDependencySet(a0 : System.String) = (2012, GetStringFunc("fscAssemblyNotFoundInDependencySet",",,,%s,,,") a0) /// The key file '%s' could not be opened - /// (Originally from ..\FSComp.txt:1125) + /// (Originally from ..\FSComp.txt:1127) static member fscKeyFileCouldNotBeOpened(a0 : System.String) = (2013, GetStringFunc("fscKeyFileCouldNotBeOpened",",,,%s,,,") a0) /// A problem occurred writing the binary '%s': %s - /// (Originally from ..\FSComp.txt:1126) + /// (Originally from ..\FSComp.txt:1128) static member fscProblemWritingBinary(a0 : System.String, a1 : System.String) = (2014, GetStringFunc("fscProblemWritingBinary",",,,%s,,,%s,,,") a0 a1) /// The 'AssemblyVersionAttribute' has been ignored because a version was given using a command line option - /// (Originally from ..\FSComp.txt:1127) + /// (Originally from ..\FSComp.txt:1129) static member fscAssemblyVersionAttributeIgnored() = (2015, GetStringFunc("fscAssemblyVersionAttributeIgnored",",,,") ) /// Error emitting 'System.Reflection.AssemblyCultureAttribute' attribute -- 'Executables cannot be satellite assemblies, Culture should always be empty' - /// (Originally from ..\FSComp.txt:1128) + /// (Originally from ..\FSComp.txt:1130) static member fscAssemblyCultureAttributeError() = (2016, GetStringFunc("fscAssemblyCultureAttributeError",",,,") ) /// Option '--delaysign' overrides attribute 'System.Reflection.AssemblyDelaySignAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1129) + /// (Originally from ..\FSComp.txt:1131) static member fscDelaySignWarning() = (2017, GetStringFunc("fscDelaySignWarning",",,,") ) /// Option '--keyfile' overrides attribute 'System.Reflection.AssemblyKeyFileAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1130) + /// (Originally from ..\FSComp.txt:1132) static member fscKeyFileWarning() = (2018, GetStringFunc("fscKeyFileWarning",",,,") ) /// Option '--keycontainer' overrides attribute 'System.Reflection.AssemblyNameAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1131) + /// (Originally from ..\FSComp.txt:1133) static member fscKeyNameWarning() = (2019, GetStringFunc("fscKeyNameWarning",",,,") ) /// The assembly '%s' is listed on the command line. Assemblies should be referenced using a command line flag such as '-r'. - /// (Originally from ..\FSComp.txt:1132) + /// (Originally from ..\FSComp.txt:1134) static member fscReferenceOnCommandLine(a0 : System.String) = (2020, GetStringFunc("fscReferenceOnCommandLine",",,,%s,,,") a0) /// The resident compilation service was not used because a problem occured in communicating with the server. - /// (Originally from ..\FSComp.txt:1133) + /// (Originally from ..\FSComp.txt:1135) static member fscRemotingError() = (2021, GetStringFunc("fscRemotingError",",,,") ) /// Problem with filename '%s': Illegal characters in path. - /// (Originally from ..\FSComp.txt:1134) + /// (Originally from ..\FSComp.txt:1136) static member pathIsInvalid(a0 : System.String) = (2022, GetStringFunc("pathIsInvalid",",,,%s,,,") a0) /// Passing a .resx file (%s) as a source file to the compiler is deprecated. Use resgen.exe to transform the .resx file into a .resources file to pass as a --resource option. If you are using MSBuild, this can be done via an item in the .fsproj project file. - /// (Originally from ..\FSComp.txt:1135) + /// (Originally from ..\FSComp.txt:1137) static member fscResxSourceFileDeprecated(a0 : System.String) = (2023, GetStringFunc("fscResxSourceFileDeprecated",",,,%s,,,") a0) /// Static linking may not be used on an assembly referencing mscorlib (e.g. a .NET Framework assembly) when generating an assembly that references System.Runtime (e.g. a .NET Core or Portable assembly). - /// (Originally from ..\FSComp.txt:1136) + /// (Originally from ..\FSComp.txt:1138) static member fscStaticLinkingNoProfileMismatches() = (2024, GetStringFunc("fscStaticLinkingNoProfileMismatches",",,,") ) /// An %s specified version '%s', but this value is a wildcard, and you have requested a deterministic build, these are in conflict. - /// (Originally from ..\FSComp.txt:1137) + /// (Originally from ..\FSComp.txt:1139) static member fscAssemblyWildcardAndDeterminism(a0 : System.String, a1 : System.String) = (2025, GetStringFunc("fscAssemblyWildcardAndDeterminism",",,,%s,,,%s,,,") a0 a1) /// Determinstic builds only support portable PDBs (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:1138) + /// (Originally from ..\FSComp.txt:1140) static member fscDeterministicDebugRequiresPortablePdb() = (2026, GetStringFunc("fscDeterministicDebugRequiresPortablePdb",",,,") ) /// Character '%s' is not allowed in provided namespace name '%s' - /// (Originally from ..\FSComp.txt:1139) + /// (Originally from ..\FSComp.txt:1141) static member etIllegalCharactersInNamespaceName(a0 : System.String, a1 : System.String) = (3000, GetStringFunc("etIllegalCharactersInNamespaceName",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' returned a member with a null or empty member name - /// (Originally from ..\FSComp.txt:1140) + /// (Originally from ..\FSComp.txt:1142) static member etNullOrEmptyMemberName(a0 : System.String) = (3001, GetStringFunc("etNullOrEmptyMemberName",",,,%s,,,") a0) /// The provided type '%s' returned a null member - /// (Originally from ..\FSComp.txt:1141) + /// (Originally from ..\FSComp.txt:1143) static member etNullMember(a0 : System.String) = (3002, GetStringFunc("etNullMember",",,,%s,,,") a0) /// The provided type '%s' member info '%s' has null declaring type - /// (Originally from ..\FSComp.txt:1142) + /// (Originally from ..\FSComp.txt:1144) static member etNullMemberDeclaringType(a0 : System.String, a1 : System.String) = (3003, GetStringFunc("etNullMemberDeclaringType",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' has member '%s' which has declaring type '%s'. Expected declaring type to be the same as provided type. - /// (Originally from ..\FSComp.txt:1143) + /// (Originally from ..\FSComp.txt:1145) static member etNullMemberDeclaringTypeDifferentFromProvidedType(a0 : System.String, a1 : System.String, a2 : System.String) = (3004, GetStringFunc("etNullMemberDeclaringTypeDifferentFromProvidedType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Referenced assembly '%s' has assembly level attribute '%s' but no public type provider classes were found - /// (Originally from ..\FSComp.txt:1144) + /// (Originally from ..\FSComp.txt:1146) static member etHostingAssemblyFoundWithoutHosts(a0 : System.String, a1 : System.String) = (3005, GetStringFunc("etHostingAssemblyFoundWithoutHosts",",,,%s,,,%s,,,") a0 a1) /// Type '%s' from type provider '%s' has an empty namespace. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1145) + /// (Originally from ..\FSComp.txt:1147) static member etEmptyNamespaceOfTypeNotAllowed(a0 : System.String, a1 : System.String) = (3006, GetStringFunc("etEmptyNamespaceOfTypeNotAllowed",",,,%s,,,%s,,,") a0 a1) /// Empty namespace found from the type provider '%s'. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1146) + /// (Originally from ..\FSComp.txt:1148) static member etEmptyNamespaceNotAllowed(a0 : System.String) = (3007, GetStringFunc("etEmptyNamespaceNotAllowed",",,,%s,,,") a0) /// Provided type '%s' has 'IsGenericType' as true, but generic types are not supported. - /// (Originally from ..\FSComp.txt:1147) + /// (Originally from ..\FSComp.txt:1149) static member etMustNotBeGeneric(a0 : System.String) = (3011, GetStringFunc("etMustNotBeGeneric",",,,%s,,,") a0) /// Provided type '%s' has 'IsArray' as true, but array types are not supported. - /// (Originally from ..\FSComp.txt:1148) + /// (Originally from ..\FSComp.txt:1150) static member etMustNotBeAnArray(a0 : System.String) = (3013, GetStringFunc("etMustNotBeAnArray",",,,%s,,,") a0) /// Invalid member '%s' on provided type '%s'. Provided type members must be public, and not be generic, virtual, or abstract. - /// (Originally from ..\FSComp.txt:1149) + /// (Originally from ..\FSComp.txt:1151) static member etMethodHasRequirements(a0 : System.String, a1 : System.String) = (3014, GetStringFunc("etMethodHasRequirements",",,,%s,,,%s,,,") a0 a1) /// Invalid member '%s' on provided type '%s'. Only properties, methods and constructors are allowed - /// (Originally from ..\FSComp.txt:1150) + /// (Originally from ..\FSComp.txt:1152) static member etUnsupportedMemberKind(a0 : System.String, a1 : System.String) = (3015, GetStringFunc("etUnsupportedMemberKind",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=true but there was no value from GetGetMethod() - /// (Originally from ..\FSComp.txt:1151) + /// (Originally from ..\FSComp.txt:1153) static member etPropertyCanReadButHasNoGetter(a0 : System.String, a1 : System.String) = (3016, GetStringFunc("etPropertyCanReadButHasNoGetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=false but GetGetMethod() returned a method - /// (Originally from ..\FSComp.txt:1152) + /// (Originally from ..\FSComp.txt:1154) static member etPropertyHasGetterButNoCanRead(a0 : System.String, a1 : System.String) = (3017, GetStringFunc("etPropertyHasGetterButNoCanRead",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=true but there was no value from GetSetMethod() - /// (Originally from ..\FSComp.txt:1153) + /// (Originally from ..\FSComp.txt:1155) static member etPropertyCanWriteButHasNoSetter(a0 : System.String, a1 : System.String) = (3018, GetStringFunc("etPropertyCanWriteButHasNoSetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=false but GetSetMethod() returned a method - /// (Originally from ..\FSComp.txt:1154) + /// (Originally from ..\FSComp.txt:1156) static member etPropertyHasSetterButNoCanWrite(a0 : System.String, a1 : System.String) = (3019, GetStringFunc("etPropertyHasSetterButNoCanWrite",",,,%s,,,%s,,,") a0 a1) /// One or more errors seen during provided type setup - /// (Originally from ..\FSComp.txt:1155) + /// (Originally from ..\FSComp.txt:1157) static member etOneOrMoreErrorsSeenDuringExtensionTypeSetting() = (3020, GetStringFunc("etOneOrMoreErrorsSeenDuringExtensionTypeSetting",",,,") ) /// Unexpected exception from provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1156) + /// (Originally from ..\FSComp.txt:1158) static member etUnexpectedExceptionFromProvidedTypeMember(a0 : System.String, a1 : System.String, a2 : System.String) = (3021, GetStringFunc("etUnexpectedExceptionFromProvidedTypeMember",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Unsupported constant type '%s'. Quotations provided by type providers can only contain simple constants. The implementation of the type provider may need to be adjusted by moving a value declared outside a provided quotation literal to be a 'let' binding inside the quotation literal. - /// (Originally from ..\FSComp.txt:1157) + /// (Originally from ..\FSComp.txt:1159) static member etUnsupportedConstantType(a0 : System.String) = (3022, GetStringFunc("etUnsupportedConstantType",",,,%s,,,") a0) /// Unsupported expression '%s' from type provider. If you are the author of this type provider, consider adjusting it to provide a different provided expression. - /// (Originally from ..\FSComp.txt:1158) + /// (Originally from ..\FSComp.txt:1160) static member etUnsupportedProvidedExpression(a0 : System.String) = (3025, GetStringFunc("etUnsupportedProvidedExpression",",,,%s,,,") a0) /// Expected provided type named '%s' but provided type has 'Name' with value '%s' - /// (Originally from ..\FSComp.txt:1159) + /// (Originally from ..\FSComp.txt:1161) static member etProvidedTypeHasUnexpectedName(a0 : System.String, a1 : System.String) = (3028, GetStringFunc("etProvidedTypeHasUnexpectedName",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetAddMethod() - /// (Originally from ..\FSComp.txt:1160) + /// (Originally from ..\FSComp.txt:1162) static member etEventNoAdd(a0 : System.String, a1 : System.String) = (3029, GetStringFunc("etEventNoAdd",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetRemoveMethod() - /// (Originally from ..\FSComp.txt:1161) + /// (Originally from ..\FSComp.txt:1163) static member etEventNoRemove(a0 : System.String, a1 : System.String) = (3030, GetStringFunc("etEventNoRemove",",,,%s,,,%s,,,") a0 a1) /// Assembly attribute '%s' refers to a designer assembly '%s' which cannot be loaded or doesn't exist. %s - /// (Originally from ..\FSComp.txt:1162) + /// (Originally from ..\FSComp.txt:1164) static member etProviderHasWrongDesignerAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (3031, GetStringFunc("etProviderHasWrongDesignerAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider does not have a valid constructor. A constructor taking either no arguments or one argument of type 'TypeProviderConfig' was expected. - /// (Originally from ..\FSComp.txt:1163) + /// (Originally from ..\FSComp.txt:1165) static member etProviderDoesNotHaveValidConstructor() = (3032, GetStringFunc("etProviderDoesNotHaveValidConstructor",",,,") ) /// The type provider '%s' reported an error: %s - /// (Originally from ..\FSComp.txt:1164) + /// (Originally from ..\FSComp.txt:1166) static member etProviderError(a0 : System.String, a1 : System.String) = (3033, GetStringFunc("etProviderError",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' used an invalid parameter in the ParameterExpression: %s - /// (Originally from ..\FSComp.txt:1165) + /// (Originally from ..\FSComp.txt:1167) static member etIncorrectParameterExpression(a0 : System.String, a1 : System.String) = (3034, GetStringFunc("etIncorrectParameterExpression",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' provided a method with a name '%s' and metadata token '%d', which is not reported among its methods of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1166) + /// (Originally from ..\FSComp.txt:1168) static member etIncorrectProvidedMethod(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.String) = (3035, GetStringFunc("etIncorrectProvidedMethod",",,,%s,,,%s,,,%d,,,%s,,,") a0 a1 a2 a3) /// The type provider '%s' provided a constructor which is not reported among the constructors of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1167) + /// (Originally from ..\FSComp.txt:1169) static member etIncorrectProvidedConstructor(a0 : System.String, a1 : System.String) = (3036, GetStringFunc("etIncorrectProvidedConstructor",",,,%s,,,%s,,,") a0 a1) /// A direct reference to the generated type '%s' is not permitted. Instead, use a type definition, e.g. 'type TypeAlias = '. This indicates that a type provider adds generated types to your assembly. - /// (Originally from ..\FSComp.txt:1168) + /// (Originally from ..\FSComp.txt:1170) static member etDirectReferenceToGeneratedTypeNotAllowed(a0 : System.String) = (3039, GetStringFunc("etDirectReferenceToGeneratedTypeNotAllowed",",,,%s,,,") a0) /// Expected provided type with path '%s' but provided type has path '%s' - /// (Originally from ..\FSComp.txt:1169) + /// (Originally from ..\FSComp.txt:1171) static member etProvidedTypeHasUnexpectedPath(a0 : System.String, a1 : System.String) = (3041, GetStringFunc("etProvidedTypeHasUnexpectedPath",",,,%s,,,%s,,,") a0 a1) /// Unexpected 'null' return value from provided type '%s' member '%s' - /// (Originally from ..\FSComp.txt:1170) + /// (Originally from ..\FSComp.txt:1172) static member etUnexpectedNullFromProvidedTypeMember(a0 : System.String, a1 : System.String) = (3042, GetStringFunc("etUnexpectedNullFromProvidedTypeMember",",,,%s,,,%s,,,") a0 a1) /// Unexpected exception from member '%s' of provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1171) + /// (Originally from ..\FSComp.txt:1173) static member etUnexpectedExceptionFromProvidedMemberMember(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3043, GetStringFunc("etUnexpectedExceptionFromProvidedMemberMember",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// Nested provided types do not take static arguments or generic parameters - /// (Originally from ..\FSComp.txt:1172) + /// (Originally from ..\FSComp.txt:1174) static member etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters() = (3044, GetStringFunc("etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters",",,,") ) /// Invalid static argument to provided type. Expected an argument of kind '%s'. - /// (Originally from ..\FSComp.txt:1173) + /// (Originally from ..\FSComp.txt:1175) static member etInvalidStaticArgument(a0 : System.String) = (3045, GetStringFunc("etInvalidStaticArgument",",,,%s,,,") a0) /// An error occured applying the static arguments to a provided type - /// (Originally from ..\FSComp.txt:1174) + /// (Originally from ..\FSComp.txt:1176) static member etErrorApplyingStaticArgumentsToType() = (3046, GetStringFunc("etErrorApplyingStaticArgumentsToType",",,,") ) /// Unknown static argument kind '%s' when resolving a reference to a provided type or method '%s' - /// (Originally from ..\FSComp.txt:1175) + /// (Originally from ..\FSComp.txt:1177) static member etUnknownStaticArgumentKind(a0 : System.String, a1 : System.String) = (3047, GetStringFunc("etUnknownStaticArgumentKind",",,,%s,,,%s,,,") a0 a1) /// invalid namespace for provided type - /// (Originally from ..\FSComp.txt:1176) + /// (Originally from ..\FSComp.txt:1178) static member invalidNamespaceForProvidedType() = (GetStringFunc("invalidNamespaceForProvidedType",",,,") ) /// invalid full name for provided type - /// (Originally from ..\FSComp.txt:1177) + /// (Originally from ..\FSComp.txt:1179) static member invalidFullNameForProvidedType() = (GetStringFunc("invalidFullNameForProvidedType",",,,") ) /// The type provider returned 'null', which is not a valid return value from '%s' - /// (Originally from ..\FSComp.txt:1179) + /// (Originally from ..\FSComp.txt:1181) static member etProviderReturnedNull(a0 : System.String) = (3051, GetStringFunc("etProviderReturnedNull",",,,%s,,,") a0) /// The type provider constructor has thrown an exception: %s - /// (Originally from ..\FSComp.txt:1180) + /// (Originally from ..\FSComp.txt:1182) static member etTypeProviderConstructorException(a0 : System.String) = (3053, GetStringFunc("etTypeProviderConstructorException",",,,%s,,,") a0) /// Type provider '%s' returned null from GetInvokerExpression. - /// (Originally from ..\FSComp.txt:1181) + /// (Originally from ..\FSComp.txt:1183) static member etNullProvidedExpression(a0 : System.String) = (3056, GetStringFunc("etNullProvidedExpression",",,,%s,,,") a0) /// The type provider '%s' returned an invalid type from 'ApplyStaticArguments'. A type with name '%s' was expected, but a type with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1182) + /// (Originally from ..\FSComp.txt:1184) static member etProvidedAppliedTypeHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3057, GetStringFunc("etProvidedAppliedTypeHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider '%s' returned an invalid method from 'ApplyStaticArgumentsForMethod'. A method with name '%s' was expected, but a method with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1183) + /// (Originally from ..\FSComp.txt:1185) static member etProvidedAppliedMethodHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3058, GetStringFunc("etProvidedAppliedMethodHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// This type test or downcast will erase the provided type '%s' to the type '%s' - /// (Originally from ..\FSComp.txt:1184) + /// (Originally from ..\FSComp.txt:1186) static member tcTypeTestLossy(a0 : System.String, a1 : System.String) = (3060, GetStringFunc("tcTypeTestLossy",",,,%s,,,%s,,,") a0 a1) /// This downcast will erase the provided type '%s' to the type '%s'. - /// (Originally from ..\FSComp.txt:1185) + /// (Originally from ..\FSComp.txt:1187) static member tcTypeCastErased(a0 : System.String, a1 : System.String) = (3061, GetStringFunc("tcTypeCastErased",",,,%s,,,%s,,,") a0 a1) /// This type test with a provided type '%s' is not allowed because this provided type will be erased to '%s' at runtime. - /// (Originally from ..\FSComp.txt:1186) + /// (Originally from ..\FSComp.txt:1188) static member tcTypeTestErased(a0 : System.String, a1 : System.String) = (3062, GetStringFunc("tcTypeTestErased",",,,%s,,,%s,,,") a0 a1) /// Cannot inherit from erased provided type - /// (Originally from ..\FSComp.txt:1187) + /// (Originally from ..\FSComp.txt:1189) static member tcCannotInheritFromErasedType() = (3063, GetStringFunc("tcCannotInheritFromErasedType",",,,") ) /// Assembly '%s' hase TypeProviderAssembly attribute with invalid value '%s'. The value should be a valid assembly name - /// (Originally from ..\FSComp.txt:1188) + /// (Originally from ..\FSComp.txt:1190) static member etInvalidTypeProviderAssemblyName(a0 : System.String, a1 : System.String) = (3065, GetStringFunc("etInvalidTypeProviderAssemblyName",",,,%s,,,%s,,,") a0 a1) /// Invalid member name. Members may not have name '.ctor' or '.cctor' - /// (Originally from ..\FSComp.txt:1189) + /// (Originally from ..\FSComp.txt:1191) static member tcInvalidMemberNameCtor() = (3066, GetStringFunc("tcInvalidMemberNameCtor",",,,") ) /// The function or member '%s' is used in a way that requires further type annotations at its definition to ensure consistency of inferred types. The inferred signature is '%s'. - /// (Originally from ..\FSComp.txt:1190) + /// (Originally from ..\FSComp.txt:1192) static member tcInferredGenericTypeGivesRiseToInconsistency(a0 : System.String, a1 : System.String) = (3068, GetStringFunc("tcInferredGenericTypeGivesRiseToInconsistency",",,,%s,,,%s,,,") a0 a1) /// The number of type arguments did not match: '%d' given, '%d' expected. This may be related to a previously reported error. - /// (Originally from ..\FSComp.txt:1191) + /// (Originally from ..\FSComp.txt:1193) static member tcInvalidTypeArgumentCount(a0 : System.Int32, a1 : System.Int32) = (3069, GetStringFunc("tcInvalidTypeArgumentCount",",,,%d,,,%d,,,") a0 a1) /// Cannot override inherited member '%s' because it is sealed - /// (Originally from ..\FSComp.txt:1192) + /// (Originally from ..\FSComp.txt:1194) static member tcCannotOverrideSealedMethod(a0 : System.String) = (3070, GetStringFunc("tcCannotOverrideSealedMethod",",,,%s,,,") a0) /// The type provider '%s' reported an error in the context of provided type '%s', member '%s'. The error: %s - /// (Originally from ..\FSComp.txt:1193) + /// (Originally from ..\FSComp.txt:1195) static member etProviderErrorWithContext(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3071, GetStringFunc("etProviderErrorWithContext",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// An exception occurred when accessing the '%s' of a provided type: %s - /// (Originally from ..\FSComp.txt:1194) + /// (Originally from ..\FSComp.txt:1196) static member etProvidedTypeWithNameException(a0 : System.String, a1 : System.String) = (3072, GetStringFunc("etProvidedTypeWithNameException",",,,%s,,,%s,,,") a0 a1) /// The '%s' of a provided type was null or empty. - /// (Originally from ..\FSComp.txt:1195) + /// (Originally from ..\FSComp.txt:1197) static member etProvidedTypeWithNullOrEmptyName(a0 : System.String) = (3073, GetStringFunc("etProvidedTypeWithNullOrEmptyName",",,,%s,,,") a0) /// Character '%s' is not allowed in provided type name '%s' - /// (Originally from ..\FSComp.txt:1196) + /// (Originally from ..\FSComp.txt:1198) static member etIllegalCharactersInTypeName(a0 : System.String, a1 : System.String) = (3075, GetStringFunc("etIllegalCharactersInTypeName",",,,%s,,,%s,,,") a0 a1) /// In queries, '%s' must use a simple pattern - /// (Originally from ..\FSComp.txt:1197) + /// (Originally from ..\FSComp.txt:1199) static member tcJoinMustUseSimplePattern(a0 : System.String) = (3077, GetStringFunc("tcJoinMustUseSimplePattern",",,,%s,,,") a0) /// A custom query operation for '%s' is required but not specified - /// (Originally from ..\FSComp.txt:1198) + /// (Originally from ..\FSComp.txt:1200) static member tcMissingCustomOperation(a0 : System.String) = (3078, GetStringFunc("tcMissingCustomOperation",",,,%s,,,") a0) /// Named static arguments must come after all unnamed static arguments - /// (Originally from ..\FSComp.txt:1199) + /// (Originally from ..\FSComp.txt:1201) static member etBadUnnamedStaticArgs() = (3080, GetStringFunc("etBadUnnamedStaticArgs",",,,") ) /// The static parameter '%s' of the provided type or method '%s' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. '%s<%s=...>'. - /// (Originally from ..\FSComp.txt:1200) + /// (Originally from ..\FSComp.txt:1202) static member etStaticParameterRequiresAValue(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3081, GetStringFunc("etStaticParameterRequiresAValue",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// No static parameter exists with name '%s' - /// (Originally from ..\FSComp.txt:1201) + /// (Originally from ..\FSComp.txt:1203) static member etNoStaticParameterWithName(a0 : System.String) = (3082, GetStringFunc("etNoStaticParameterWithName",",,,%s,,,") a0) /// The static parameter '%s' has already been given a value - /// (Originally from ..\FSComp.txt:1202) + /// (Originally from ..\FSComp.txt:1204) static member etStaticParameterAlreadyHasValue(a0 : System.String) = (3083, GetStringFunc("etStaticParameterAlreadyHasValue",",,,%s,,,") a0) /// Multiple static parameters exist with name '%s' - /// (Originally from ..\FSComp.txt:1203) + /// (Originally from ..\FSComp.txt:1205) static member etMultipleStaticParameterWithName(a0 : System.String) = (3084, GetStringFunc("etMultipleStaticParameterWithName",",,,%s,,,") a0) /// A custom operation may not be used in conjunction with a non-value or recursive 'let' binding in another part of this computation expression - /// (Originally from ..\FSComp.txt:1204) + /// (Originally from ..\FSComp.txt:1206) static member tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings() = (3085, GetStringFunc("tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings",",,,") ) /// A custom operation may not be used in conjunction with 'use', 'try/with', 'try/finally', 'if/then/else' or 'match' operators within this computation expression - /// (Originally from ..\FSComp.txt:1205) + /// (Originally from ..\FSComp.txt:1207) static member tcCustomOperationMayNotBeUsedHere() = (3086, GetStringFunc("tcCustomOperationMayNotBeUsedHere",",,,") ) /// The custom operation '%s' refers to a method which is overloaded. The implementations of custom operations may not be overloaded. - /// (Originally from ..\FSComp.txt:1206) + /// (Originally from ..\FSComp.txt:1208) static member tcCustomOperationMayNotBeOverloaded(a0 : System.String) = (3087, GetStringFunc("tcCustomOperationMayNotBeOverloaded",",,,%s,,,") a0) /// An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead. - /// (Originally from ..\FSComp.txt:1207) + /// (Originally from ..\FSComp.txt:1209) static member tcIfThenElseMayNotBeUsedWithinQueries() = (3090, GetStringFunc("tcIfThenElseMayNotBeUsedWithinQueries",",,,") ) /// Invalid argument to 'methodhandleof' during codegen - /// (Originally from ..\FSComp.txt:1208) + /// (Originally from ..\FSComp.txt:1210) static member ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen() = (3091, GetStringFunc("ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen",",,,") ) /// A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1209) + /// (Originally from ..\FSComp.txt:1211) static member etProvidedTypeReferenceMissingArgument(a0 : System.String) = (3092, GetStringFunc("etProvidedTypeReferenceMissingArgument",",,,%s,,,") a0) /// A reference to a provided type had an invalid value '%s' for a static parameter. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1210) + /// (Originally from ..\FSComp.txt:1212) static member etProvidedTypeReferenceInvalidText(a0 : System.String) = (3093, GetStringFunc("etProvidedTypeReferenceInvalidText",",,,%s,,,") a0) /// '%s' is not used correctly. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1211) + /// (Originally from ..\FSComp.txt:1213) static member tcCustomOperationNotUsedCorrectly(a0 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly",",,,%s,,,") a0) /// '%s' is not used correctly. Usage: %s. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1212) + /// (Originally from ..\FSComp.txt:1214) static member tcCustomOperationNotUsedCorrectly2(a0 : System.String, a1 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly2",",,,%s,,,%s,,,") a0 a1) /// %s var in collection %s (outerKey = innerKey). Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1213) + /// (Originally from ..\FSComp.txt:1215) static member customOperationTextLikeJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection %s (outerKey = innerKey) into group. Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1214) + /// (Originally from ..\FSComp.txt:1216) static member customOperationTextLikeGroupJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeGroupJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection - /// (Originally from ..\FSComp.txt:1215) + /// (Originally from ..\FSComp.txt:1217) static member customOperationTextLikeZip(a0 : System.String) = (GetStringFunc("customOperationTextLikeZip",",,,%s,,,") a0) /// '%s' must be followed by a variable name. Usage: %s. - /// (Originally from ..\FSComp.txt:1216) + /// (Originally from ..\FSComp.txt:1218) static member tcBinaryOperatorRequiresVariable(a0 : System.String, a1 : System.String) = (3096, GetStringFunc("tcBinaryOperatorRequiresVariable",",,,%s,,,%s,,,") a0 a1) /// Incorrect syntax for '%s'. Usage: %s. - /// (Originally from ..\FSComp.txt:1217) + /// (Originally from ..\FSComp.txt:1219) static member tcOperatorIncorrectSyntax(a0 : System.String, a1 : System.String) = (3097, GetStringFunc("tcOperatorIncorrectSyntax",",,,%s,,,%s,,,") a0 a1) /// '%s' must come after a 'for' selection clause and be followed by the rest of the query. Syntax: ... %s ... - /// (Originally from ..\FSComp.txt:1218) + /// (Originally from ..\FSComp.txt:1220) static member tcBinaryOperatorRequiresBody(a0 : System.String, a1 : System.String) = (3098, GetStringFunc("tcBinaryOperatorRequiresBody",",,,%s,,,%s,,,") a0 a1) /// '%s' is used with an incorrect number of arguments. This is a custom operation in this query or computation expression. Expected %d argument(s), but given %d. - /// (Originally from ..\FSComp.txt:1219) + /// (Originally from ..\FSComp.txt:1221) static member tcCustomOperationHasIncorrectArgCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3099, GetStringFunc("tcCustomOperationHasIncorrectArgCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Expected an expression after this point - /// (Originally from ..\FSComp.txt:1220) + /// (Originally from ..\FSComp.txt:1222) static member parsExpectedExpressionAfterToken() = (3100, GetStringFunc("parsExpectedExpressionAfterToken",",,,") ) /// Expected a type after this point - /// (Originally from ..\FSComp.txt:1221) + /// (Originally from ..\FSComp.txt:1223) static member parsExpectedTypeAfterToken() = (3101, GetStringFunc("parsExpectedTypeAfterToken",",,,") ) /// Unmatched '[<'. Expected closing '>]' - /// (Originally from ..\FSComp.txt:1222) + /// (Originally from ..\FSComp.txt:1224) static member parsUnmatchedLBrackLess() = (3102, GetStringFunc("parsUnmatchedLBrackLess",",,,") ) /// Unexpected end of input in 'match' expression. Expected 'match with | -> | -> ...'. - /// (Originally from ..\FSComp.txt:1223) + /// (Originally from ..\FSComp.txt:1225) static member parsUnexpectedEndOfFileMatch() = (3103, GetStringFunc("parsUnexpectedEndOfFileMatch",",,,") ) /// Unexpected end of input in 'try' expression. Expected 'try with ' or 'try finally '. - /// (Originally from ..\FSComp.txt:1224) + /// (Originally from ..\FSComp.txt:1226) static member parsUnexpectedEndOfFileTry() = (3104, GetStringFunc("parsUnexpectedEndOfFileTry",",,,") ) /// Unexpected end of input in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1225) + /// (Originally from ..\FSComp.txt:1227) static member parsUnexpectedEndOfFileWhile() = (3105, GetStringFunc("parsUnexpectedEndOfFileWhile",",,,") ) /// Unexpected end of input in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1226) + /// (Originally from ..\FSComp.txt:1228) static member parsUnexpectedEndOfFileFor() = (3106, GetStringFunc("parsUnexpectedEndOfFileFor",",,,") ) /// Unexpected end of input in 'match' or 'try' expression - /// (Originally from ..\FSComp.txt:1227) + /// (Originally from ..\FSComp.txt:1229) static member parsUnexpectedEndOfFileWith() = (3107, GetStringFunc("parsUnexpectedEndOfFileWith",",,,") ) /// Unexpected end of input in 'then' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1228) + /// (Originally from ..\FSComp.txt:1230) static member parsUnexpectedEndOfFileThen() = (3108, GetStringFunc("parsUnexpectedEndOfFileThen",",,,") ) /// Unexpected end of input in 'else' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1229) + /// (Originally from ..\FSComp.txt:1231) static member parsUnexpectedEndOfFileElse() = (3109, GetStringFunc("parsUnexpectedEndOfFileElse",",,,") ) /// Unexpected end of input in body of lambda expression. Expected 'fun ... -> '. - /// (Originally from ..\FSComp.txt:1230) + /// (Originally from ..\FSComp.txt:1232) static member parsUnexpectedEndOfFileFunBody() = (3110, GetStringFunc("parsUnexpectedEndOfFileFunBody",",,,") ) /// Unexpected end of input in type arguments - /// (Originally from ..\FSComp.txt:1231) + /// (Originally from ..\FSComp.txt:1233) static member parsUnexpectedEndOfFileTypeArgs() = (3111, GetStringFunc("parsUnexpectedEndOfFileTypeArgs",",,,") ) /// Unexpected end of input in type signature - /// (Originally from ..\FSComp.txt:1232) + /// (Originally from ..\FSComp.txt:1234) static member parsUnexpectedEndOfFileTypeSignature() = (3112, GetStringFunc("parsUnexpectedEndOfFileTypeSignature",",,,") ) /// Unexpected end of input in type definition - /// (Originally from ..\FSComp.txt:1233) + /// (Originally from ..\FSComp.txt:1235) static member parsUnexpectedEndOfFileTypeDefinition() = (3113, GetStringFunc("parsUnexpectedEndOfFileTypeDefinition",",,,") ) /// Unexpected end of input in object members - /// (Originally from ..\FSComp.txt:1234) + /// (Originally from ..\FSComp.txt:1236) static member parsUnexpectedEndOfFileObjectMembers() = (3114, GetStringFunc("parsUnexpectedEndOfFileObjectMembers",",,,") ) /// Unexpected end of input in value, function or member definition - /// (Originally from ..\FSComp.txt:1235) + /// (Originally from ..\FSComp.txt:1237) static member parsUnexpectedEndOfFileDefinition() = (3115, GetStringFunc("parsUnexpectedEndOfFileDefinition",",,,") ) /// Unexpected end of input in expression - /// (Originally from ..\FSComp.txt:1236) + /// (Originally from ..\FSComp.txt:1238) static member parsUnexpectedEndOfFileExpression() = (3116, GetStringFunc("parsUnexpectedEndOfFileExpression",",,,") ) /// Unexpected end of type. Expected a name after this point. - /// (Originally from ..\FSComp.txt:1237) + /// (Originally from ..\FSComp.txt:1239) static member parsExpectedNameAfterToken() = (3117, GetStringFunc("parsExpectedNameAfterToken",",,,") ) /// Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword. - /// (Originally from ..\FSComp.txt:1238) + /// (Originally from ..\FSComp.txt:1240) static member parsUnmatchedLet() = (3118, GetStringFunc("parsUnmatchedLet",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let!' keyword. - /// (Originally from ..\FSComp.txt:1239) + /// (Originally from ..\FSComp.txt:1241) static member parsUnmatchedLetBang() = (3119, GetStringFunc("parsUnmatchedLetBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use!' keyword. - /// (Originally from ..\FSComp.txt:1240) + /// (Originally from ..\FSComp.txt:1242) static member parsUnmatchedUseBang() = (3120, GetStringFunc("parsUnmatchedUseBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use' keyword. - /// (Originally from ..\FSComp.txt:1241) + /// (Originally from ..\FSComp.txt:1243) static member parsUnmatchedUse() = (3121, GetStringFunc("parsUnmatchedUse",",,,") ) /// Missing 'do' in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1242) + /// (Originally from ..\FSComp.txt:1244) static member parsWhileDoExpected() = (3122, GetStringFunc("parsWhileDoExpected",",,,") ) /// Missing 'do' in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1243) + /// (Originally from ..\FSComp.txt:1245) static member parsForDoExpected() = (3123, GetStringFunc("parsForDoExpected",",,,") ) /// Invalid join relation in '%s'. Expected 'expr expr', where is =, =?, ?= or ?=?. - /// (Originally from ..\FSComp.txt:1244) + /// (Originally from ..\FSComp.txt:1246) static member tcInvalidRelationInJoin(a0 : System.String) = (3125, GetStringFunc("tcInvalidRelationInJoin",",,,%s,,,") a0) /// Calls - /// (Originally from ..\FSComp.txt:1245) + /// (Originally from ..\FSComp.txt:1247) static member typeInfoCallsWord() = (GetStringFunc("typeInfoCallsWord",",,,") ) /// Invalid number of generic arguments to type '%s' in provided type. Expected '%d' arguments, given '%d'. - /// (Originally from ..\FSComp.txt:1246) + /// (Originally from ..\FSComp.txt:1248) static member impInvalidNumberOfGenericArguments(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3126, GetStringFunc("impInvalidNumberOfGenericArguments",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Invalid value '%s' for unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1247) + /// (Originally from ..\FSComp.txt:1249) static member impInvalidMeasureArgument1(a0 : System.String, a1 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument1",",,,%s,,,%s,,,") a0 a1) /// Invalid value unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1248) + /// (Originally from ..\FSComp.txt:1250) static member impInvalidMeasureArgument2(a0 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument2",",,,%s,,,") a0) /// Property '%s' on provided type '%s' is neither readable nor writable as it has CanRead=false and CanWrite=false - /// (Originally from ..\FSComp.txt:1249) + /// (Originally from ..\FSComp.txt:1251) static member etPropertyNeedsCanWriteOrCanRead(a0 : System.String, a1 : System.String) = (3128, GetStringFunc("etPropertyNeedsCanWriteOrCanRead",",,,%s,,,%s,,,") a0 a1) /// A use of 'into' must be followed by the remainder of the computation - /// (Originally from ..\FSComp.txt:1250) + /// (Originally from ..\FSComp.txt:1252) static member tcIntoNeedsRestOfQuery() = (3129, GetStringFunc("tcIntoNeedsRestOfQuery",",,,") ) /// The operator '%s' does not accept the use of 'into' - /// (Originally from ..\FSComp.txt:1251) + /// (Originally from ..\FSComp.txt:1253) static member tcOperatorDoesntAcceptInto(a0 : System.String) = (3130, GetStringFunc("tcOperatorDoesntAcceptInto",",,,%s,,,") a0) /// The definition of the custom operator '%s' does not use a valid combination of attribute flags - /// (Originally from ..\FSComp.txt:1252) + /// (Originally from ..\FSComp.txt:1254) static member tcCustomOperationInvalid(a0 : System.String) = (3131, GetStringFunc("tcCustomOperationInvalid",",,,%s,,,") a0) /// This type definition may not have the 'CLIMutable' attribute. Only record types may have this attribute. - /// (Originally from ..\FSComp.txt:1253) + /// (Originally from ..\FSComp.txt:1255) static member tcThisTypeMayNotHaveACLIMutableAttribute() = (3132, GetStringFunc("tcThisTypeMayNotHaveACLIMutableAttribute",",,,") ) /// 'member val' definitions are only permitted in types with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:1254) + /// (Originally from ..\FSComp.txt:1256) static member tcAutoPropertyRequiresImplicitConstructionSequence() = (3133, GetStringFunc("tcAutoPropertyRequiresImplicitConstructionSequence",",,,") ) /// Property definitions may not be declared mutable. To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1255) + /// (Originally from ..\FSComp.txt:1257) static member parsMutableOnAutoPropertyShouldBeGetSet() = (3134, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSet",",,,") ) /// To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1256) + /// (Originally from ..\FSComp.txt:1258) static member parsMutableOnAutoPropertyShouldBeGetSetNotJustSet() = (3135, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSetNotJustSet",",,,") ) /// Type '%s' is illegal because in byref, T cannot contain byref types. - /// (Originally from ..\FSComp.txt:1257) + /// (Originally from ..\FSComp.txt:1259) static member chkNoByrefsOfByrefs(a0 : System.String) = (3136, GetStringFunc("chkNoByrefsOfByrefs",",,,%s,,,") a0) /// F# supports array ranks between 1 and 32. The value %d is not allowed. - /// (Originally from ..\FSComp.txt:1258) + /// (Originally from ..\FSComp.txt:1260) static member tastopsMaxArrayThirtyTwo(a0 : System.Int32) = (3138, GetStringFunc("tastopsMaxArrayThirtyTwo",",,,%d,,,") a0) /// In queries, use the form 'for x in n .. m do ...' for ranging over integers - /// (Originally from ..\FSComp.txt:1259) + /// (Originally from ..\FSComp.txt:1261) static member tcNoIntegerForLoopInQuery() = (3139, GetStringFunc("tcNoIntegerForLoopInQuery",",,,") ) /// 'while' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1260) + /// (Originally from ..\FSComp.txt:1262) static member tcNoWhileInQuery() = (3140, GetStringFunc("tcNoWhileInQuery",",,,") ) /// 'try/finally' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1261) + /// (Originally from ..\FSComp.txt:1263) static member tcNoTryFinallyInQuery() = (3141, GetStringFunc("tcNoTryFinallyInQuery",",,,") ) /// 'use' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1262) + /// (Originally from ..\FSComp.txt:1264) static member tcUseMayNotBeUsedInQueries() = (3142, GetStringFunc("tcUseMayNotBeUsedInQueries",",,,") ) /// 'let!', 'use!' and 'do!' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1263) + /// (Originally from ..\FSComp.txt:1265) static member tcBindMayNotBeUsedInQueries() = (3143, GetStringFunc("tcBindMayNotBeUsedInQueries",",,,") ) /// 'return' and 'return!' may not be used in queries - /// (Originally from ..\FSComp.txt:1264) + /// (Originally from ..\FSComp.txt:1266) static member tcReturnMayNotBeUsedInQueries() = (3144, GetStringFunc("tcReturnMayNotBeUsedInQueries",",,,") ) /// This is not a known query operator. Query operators are identifiers such as 'select', 'where', 'sortBy', 'thenBy', 'groupBy', 'groupValBy', 'join', 'groupJoin', 'sumBy' and 'averageBy', defined using corresponding methods on the 'QueryBuilder' type. - /// (Originally from ..\FSComp.txt:1265) + /// (Originally from ..\FSComp.txt:1267) static member tcUnrecognizedQueryOperator() = (3145, GetStringFunc("tcUnrecognizedQueryOperator",",,,") ) /// 'try/with' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1266) + /// (Originally from ..\FSComp.txt:1268) static member tcTryWithMayNotBeUsedInQueries() = (3146, GetStringFunc("tcTryWithMayNotBeUsedInQueries",",,,") ) /// This 'let' definition may not be used in a query. Only simple value definitions may be used in queries. - /// (Originally from ..\FSComp.txt:1267) + /// (Originally from ..\FSComp.txt:1269) static member tcNonSimpleLetBindingInQuery() = (3147, GetStringFunc("tcNonSimpleLetBindingInQuery",",,,") ) /// Too many static parameters. Expected at most %d parameters, but got %d unnamed and %d named parameters. - /// (Originally from ..\FSComp.txt:1268) + /// (Originally from ..\FSComp.txt:1270) static member etTooManyStaticParameters(a0 : System.Int32, a1 : System.Int32, a2 : System.Int32) = (3148, GetStringFunc("etTooManyStaticParameters",",,,%d,,,%d,,,%d,,,") a0 a1 a2) /// Invalid provided literal value '%s' - /// (Originally from ..\FSComp.txt:1269) + /// (Originally from ..\FSComp.txt:1271) static member infosInvalidProvidedLiteralValue(a0 : System.String) = (3149, GetStringFunc("infosInvalidProvidedLiteralValue",",,,%s,,,") a0) /// The 'anycpu32bitpreferred' platform can only be used with EXE targets. You must use 'anycpu' instead. - /// (Originally from ..\FSComp.txt:1270) + /// (Originally from ..\FSComp.txt:1272) static member invalidPlatformTarget() = (3150, GetStringFunc("invalidPlatformTarget",",,,") ) /// This member, function or value declaration may not be declared 'inline' - /// (Originally from ..\FSComp.txt:1271) + /// (Originally from ..\FSComp.txt:1273) static member tcThisValueMayNotBeInlined() = (3151, GetStringFunc("tcThisValueMayNotBeInlined",",,,") ) /// The provider '%s' returned a non-generated type '%s' in the context of a set of generated types. Consider adjusting the type provider to only return generated types. - /// (Originally from ..\FSComp.txt:1272) + /// (Originally from ..\FSComp.txt:1274) static member etErasedTypeUsedInGeneration(a0 : System.String, a1 : System.String) = (3152, GetStringFunc("etErasedTypeUsedInGeneration",",,,%s,,,%s,,,") a0 a1) /// Arguments to query operators may require parentheses, e.g. 'where (x > y)' or 'groupBy (x.Length / 10)' - /// (Originally from ..\FSComp.txt:1273) + /// (Originally from ..\FSComp.txt:1275) static member tcUnrecognizedQueryBinaryOperator() = (3153, GetStringFunc("tcUnrecognizedQueryBinaryOperator",",,,") ) /// A quotation may not involve an assignment to or taking the address of a captured local variable - /// (Originally from ..\FSComp.txt:1274) + /// (Originally from ..\FSComp.txt:1276) static member crefNoSetOfHole() = (3155, GetStringFunc("crefNoSetOfHole",",,,") ) /// + 1 overload - /// (Originally from ..\FSComp.txt:1275) + /// (Originally from ..\FSComp.txt:1277) static member nicePrintOtherOverloads1() = (GetStringFunc("nicePrintOtherOverloads1",",,,") ) /// + %d overloads - /// (Originally from ..\FSComp.txt:1276) + /// (Originally from ..\FSComp.txt:1278) static member nicePrintOtherOverloadsN(a0 : System.Int32) = (GetStringFunc("nicePrintOtherOverloadsN",",,,%d,,,") a0) /// Erased to - /// (Originally from ..\FSComp.txt:1277) + /// (Originally from ..\FSComp.txt:1279) static member erasedTo() = (GetStringFunc("erasedTo",",,,") ) /// Unexpected token '%s' or incomplete expression - /// (Originally from ..\FSComp.txt:1278) + /// (Originally from ..\FSComp.txt:1280) static member parsUnfinishedExpression(a0 : System.String) = (3156, GetStringFunc("parsUnfinishedExpression",",,,%s,,,") a0) /// Cannot find code target for this attribute, possibly because the code after the attribute is incomplete. - /// (Originally from ..\FSComp.txt:1279) + /// (Originally from ..\FSComp.txt:1281) static member parsAttributeOnIncompleteCode() = (3158, GetStringFunc("parsAttributeOnIncompleteCode",",,,") ) /// Type name cannot be empty. - /// (Originally from ..\FSComp.txt:1280) + /// (Originally from ..\FSComp.txt:1282) static member parsTypeNameCannotBeEmpty() = (3159, GetStringFunc("parsTypeNameCannotBeEmpty",",,,") ) /// Problem reading assembly '%s': %s - /// (Originally from ..\FSComp.txt:1281) + /// (Originally from ..\FSComp.txt:1283) static member buildProblemReadingAssembly(a0 : System.String, a1 : System.String) = (3160, GetStringFunc("buildProblemReadingAssembly",",,,%s,,,%s,,,") a0 a1) /// Invalid provided field. Provided fields of erased provided types must be literals. - /// (Originally from ..\FSComp.txt:1282) + /// (Originally from ..\FSComp.txt:1284) static member tcTPFieldMustBeLiteral() = (3161, GetStringFunc("tcTPFieldMustBeLiteral",",,,") ) /// (loading description...) - /// (Originally from ..\FSComp.txt:1283) + /// (Originally from ..\FSComp.txt:1285) static member loadingDescription() = (GetStringFunc("loadingDescription",",,,") ) /// (description unavailable...) - /// (Originally from ..\FSComp.txt:1284) + /// (Originally from ..\FSComp.txt:1286) static member descriptionUnavailable() = (GetStringFunc("descriptionUnavailable",",,,") ) /// A type variable has been constrained by multiple different class types. A type variable may only have one class constraint. - /// (Originally from ..\FSComp.txt:1285) + /// (Originally from ..\FSComp.txt:1287) static member chkTyparMultipleClassConstraints() = (3162, GetStringFunc("chkTyparMultipleClassConstraints",",,,") ) /// 'match' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1286) + /// (Originally from ..\FSComp.txt:1288) static member tcMatchMayNotBeUsedWithQuery() = (3163, GetStringFunc("tcMatchMayNotBeUsedWithQuery",",,,") ) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 3 arguments - /// (Originally from ..\FSComp.txt:1287) + /// (Originally from ..\FSComp.txt:1289) static member memberOperatorDefinitionWithNonTripleArgument(a0 : System.String, a1 : System.Int32) = (3164, GetStringFunc("memberOperatorDefinitionWithNonTripleArgument",",,,%s,,,%d,,,") a0 a1) /// The operator '%s' cannot be resolved. Consider opening the module 'Microsoft.FSharp.Linq.NullableOperators'. - /// (Originally from ..\FSComp.txt:1288) + /// (Originally from ..\FSComp.txt:1290) static member cannotResolveNullableOperators(a0 : System.String) = (3165, GetStringFunc("cannotResolveNullableOperators",",,,%s,,,") a0) /// '%s' must be followed by 'in'. Usage: %s. - /// (Originally from ..\FSComp.txt:1289) + /// (Originally from ..\FSComp.txt:1291) static member tcOperatorRequiresIn(a0 : System.String, a1 : System.String) = (3167, GetStringFunc("tcOperatorRequiresIn",",,,%s,,,%s,,,") a0 a1) /// Neither 'member val' nor 'override val' definitions are permitted in object expressions. - /// (Originally from ..\FSComp.txt:1290) + /// (Originally from ..\FSComp.txt:1292) static member parsIllegalMemberVarInObjectImplementation() = (3168, GetStringFunc("parsIllegalMemberVarInObjectImplementation",",,,") ) /// Copy-and-update record expressions must include at least one field. - /// (Originally from ..\FSComp.txt:1291) + /// (Originally from ..\FSComp.txt:1293) static member tcEmptyCopyAndUpdateRecordInvalid() = (3169, GetStringFunc("tcEmptyCopyAndUpdateRecordInvalid",",,,") ) /// '_' cannot be used as field name - /// (Originally from ..\FSComp.txt:1292) + /// (Originally from ..\FSComp.txt:1294) static member parsUnderscoreInvalidFieldName() = (3170, GetStringFunc("parsUnderscoreInvalidFieldName",",,,") ) /// The provided types generated by this use of a type provider may not be used from other F# assemblies and should be marked internal or private. Consider using 'type internal TypeName = ...' or 'type private TypeName = ...'. - /// (Originally from ..\FSComp.txt:1293) + /// (Originally from ..\FSComp.txt:1295) static member tcGeneratedTypesShouldBeInternalOrPrivate() = (3171, GetStringFunc("tcGeneratedTypesShouldBeInternalOrPrivate",",,,") ) /// A property's getter and setter must have the same type. Property '%s' has getter of type '%s' but setter of type '%s'. - /// (Originally from ..\FSComp.txt:1294) + /// (Originally from ..\FSComp.txt:1296) static member chkGetterAndSetterHaveSamePropertyType(a0 : System.String, a1 : System.String, a2 : System.String) = (3172, GetStringFunc("chkGetterAndSetterHaveSamePropertyType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Array method '%s' is supplied by the runtime and cannot be directly used in code. For operations with array elements consider using family of GetArray/SetArray functions from LanguagePrimitives.IntrinsicFunctions module. - /// (Originally from ..\FSComp.txt:1295) + /// (Originally from ..\FSComp.txt:1297) static member tcRuntimeSuppliedMethodCannotBeUsedInUserCode(a0 : System.String) = (3173, GetStringFunc("tcRuntimeSuppliedMethodCannotBeUsedInUserCode",",,,%s,,,") a0) /// The union case '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1296) + /// (Originally from ..\FSComp.txt:1298) static member tcUnionCaseConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcUnionCaseConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// The exception '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1297) + /// (Originally from ..\FSComp.txt:1299) static member tcExceptionConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcExceptionConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// Active patterns do not have fields. This syntax is invalid. - /// (Originally from ..\FSComp.txt:1298) + /// (Originally from ..\FSComp.txt:1300) static member tcActivePatternsDoNotHaveFields() = (3174, GetStringFunc("tcActivePatternsDoNotHaveFields",",,,") ) /// The constructor does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1299) + /// (Originally from ..\FSComp.txt:1301) static member tcConstructorDoesNotHaveFieldWithGivenName(a0 : System.String) = (3174, GetStringFunc("tcConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,") a0) /// Union case/exception field '%s' cannot be used more than once. - /// (Originally from ..\FSComp.txt:1300) + /// (Originally from ..\FSComp.txt:1302) static member tcUnionCaseFieldCannotBeUsedMoreThanOnce(a0 : System.String) = (3175, GetStringFunc("tcUnionCaseFieldCannotBeUsedMoreThanOnce",",,,%s,,,") a0) /// Named field '%s' is used more than once. - /// (Originally from ..\FSComp.txt:1301) + /// (Originally from ..\FSComp.txt:1303) static member tcFieldNameIsUsedModeThanOnce(a0 : System.String) = (3176, GetStringFunc("tcFieldNameIsUsedModeThanOnce",",,,%s,,,") a0) /// Named field '%s' conflicts with autogenerated name for anonymous field. - /// (Originally from ..\FSComp.txt:1302) + /// (Originally from ..\FSComp.txt:1304) static member tcFieldNameConflictsWithGeneratedNameForAnonymousField(a0 : System.String) = (3176, GetStringFunc("tcFieldNameConflictsWithGeneratedNameForAnonymousField",",,,%s,,,") a0) /// This literal expression or attribute argument results in an arithmetic overflow. - /// (Originally from ..\FSComp.txt:1303) + /// (Originally from ..\FSComp.txt:1305) static member tastConstantExpressionOverflow() = (3177, GetStringFunc("tastConstantExpressionOverflow",",,,") ) /// This is not valid literal expression. The [] attribute will be ignored. - /// (Originally from ..\FSComp.txt:1304) + /// (Originally from ..\FSComp.txt:1306) static member tcIllegalStructTypeForConstantExpression() = (3178, GetStringFunc("tcIllegalStructTypeForConstantExpression",",,,") ) /// System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes. - /// (Originally from ..\FSComp.txt:1305) + /// (Originally from ..\FSComp.txt:1307) static member fscSystemRuntimeInteropServicesIsRequired() = (3179, GetStringFunc("fscSystemRuntimeInteropServicesIsRequired",",,,") ) /// The mutable local '%s' is implicitly allocated as a reference cell because it has been captured by a closure. This warning is for informational purposes only to indicate where implicit allocations are performed. - /// (Originally from ..\FSComp.txt:1306) + /// (Originally from ..\FSComp.txt:1308) static member abImplicitHeapAllocation(a0 : System.String) = (3180, GetStringFunc("abImplicitHeapAllocation",",,,%s,,,") a0) /// A type provider implemented GetStaticParametersForMethod, but ApplyStaticArgumentsForMethod was not implemented or invalid - /// (Originally from ..\FSComp.txt:1307) + /// (Originally from ..\FSComp.txt:1309) static member estApplyStaticArgumentsForMethodNotImplemented() = (GetStringFunc("estApplyStaticArgumentsForMethodNotImplemented",",,,") ) /// An error occured applying the static arguments to a provided method - /// (Originally from ..\FSComp.txt:1308) + /// (Originally from ..\FSComp.txt:1310) static member etErrorApplyingStaticArgumentsToMethod() = (3181, GetStringFunc("etErrorApplyingStaticArgumentsToMethod",",,,") ) /// Unexpected character '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1309) + /// (Originally from ..\FSComp.txt:1311) static member pplexUnexpectedChar(a0 : System.String) = (3182, GetStringFunc("pplexUnexpectedChar",",,,%s,,,") a0) /// Unexpected token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1310) + /// (Originally from ..\FSComp.txt:1312) static member ppparsUnexpectedToken(a0 : System.String) = (3183, GetStringFunc("ppparsUnexpectedToken",",,,%s,,,") a0) /// Incomplete preprocessor expression - /// (Originally from ..\FSComp.txt:1311) + /// (Originally from ..\FSComp.txt:1313) static member ppparsIncompleteExpression() = (3184, GetStringFunc("ppparsIncompleteExpression",",,,") ) /// Missing token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1312) + /// (Originally from ..\FSComp.txt:1314) static member ppparsMissingToken(a0 : System.String) = (3185, GetStringFunc("ppparsMissingToken",",,,%s,,,") a0) /// An error occurred while reading the F# metadata node at position %d in table '%s' of assembly '%s'. The node had no matching declaration. Please report this warning. You may need to recompile the F# assembly you are using. - /// (Originally from ..\FSComp.txt:1313) + /// (Originally from ..\FSComp.txt:1315) static member pickleMissingDefinition(a0 : System.Int32, a1 : System.String, a2 : System.String) = (3186, GetStringFunc("pickleMissingDefinition",",,,%d,,,%s,,,%s,,,") a0 a1 a2) /// Type inference caused the type variable %s to escape its scope. Consider adding an explicit type parameter declaration or adjusting your code to be less generic. - /// (Originally from ..\FSComp.txt:1314) + /// (Originally from ..\FSComp.txt:1316) static member checkNotSufficientlyGenericBecauseOfScope(a0 : System.String) = (3187, GetStringFunc("checkNotSufficientlyGenericBecauseOfScope",",,,%s,,,") a0) /// Type inference caused an inference type variable to escape its scope. Consider adding type annotations to make your code less generic. - /// (Originally from ..\FSComp.txt:1315) + /// (Originally from ..\FSComp.txt:1317) static member checkNotSufficientlyGenericBecauseOfScopeAnon() = (3188, GetStringFunc("checkNotSufficientlyGenericBecauseOfScopeAnon",",,,") ) /// Redundant arguments are being ignored in function '%s'. Expected %d but got %d arguments. - /// (Originally from ..\FSComp.txt:1316) + /// (Originally from ..\FSComp.txt:1318) static member checkRaiseFamilyFunctionArgumentCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3189, GetStringFunc("checkRaiseFamilyFunctionArgumentCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Lowercase literal '%s' is being shadowed by a new pattern with the same name. Only uppercase and module-prefixed literals can be used as named patterns. - /// (Originally from ..\FSComp.txt:1317) + /// (Originally from ..\FSComp.txt:1319) static member checkLowercaseLiteralBindingInPattern(a0 : System.String) = (3190, GetStringFunc("checkLowercaseLiteralBindingInPattern",",,,%s,,,") a0) /// This literal pattern does not take arguments - /// (Originally from ..\FSComp.txt:1318) + /// (Originally from ..\FSComp.txt:1320) static member tcLiteralDoesNotTakeArguments() = (3191, GetStringFunc("tcLiteralDoesNotTakeArguments",",,,") ) /// Constructors are not permitted as extension members - they must be defined as part of the original definition of the type - /// (Originally from ..\FSComp.txt:1319) + /// (Originally from ..\FSComp.txt:1321) static member tcConstructorsIllegalInAugmentation() = (3192, GetStringFunc("tcConstructorsIllegalInAugmentation",",,,") ) /// Invalid response file '%s' ( '%s' ) - /// (Originally from ..\FSComp.txt:1320) + /// (Originally from ..\FSComp.txt:1322) static member optsInvalidResponseFile(a0 : System.String, a1 : System.String) = (3193, GetStringFunc("optsInvalidResponseFile",",,,%s,,,%s,,,") a0 a1) /// Response file '%s' not found in '%s' - /// (Originally from ..\FSComp.txt:1321) + /// (Originally from ..\FSComp.txt:1323) static member optsResponseFileNotFound(a0 : System.String, a1 : System.String) = (3194, GetStringFunc("optsResponseFileNotFound",",,,%s,,,%s,,,") a0 a1) /// Response file name '%s' is empty, contains invalid characters, has a drive specification without an absolute path, or is too long - /// (Originally from ..\FSComp.txt:1322) + /// (Originally from ..\FSComp.txt:1324) static member optsResponseFileNameInvalid(a0 : System.String) = (3195, GetStringFunc("optsResponseFileNameInvalid",",,,%s,,,") a0) /// Cannot find FSharp.Core.dll in compiler's directory - /// (Originally from ..\FSComp.txt:1323) + /// (Originally from ..\FSComp.txt:1325) static member fsharpCoreNotFoundToBeCopied() = (3196, GetStringFunc("fsharpCoreNotFoundToBeCopied",",,,") ) /// One tuple type is a struct tuple, the other is a reference tuple - /// (Originally from ..\FSComp.txt:1324) + /// (Originally from ..\FSComp.txt:1326) static member tcTupleStructMismatch() = (GetStringFunc("tcTupleStructMismatch",",,,") ) /// This provided method requires static parameters - /// (Originally from ..\FSComp.txt:1325) + /// (Originally from ..\FSComp.txt:1327) static member etMissingStaticArgumentsToMethod() = (3197, GetStringFunc("etMissingStaticArgumentsToMethod",",,,") ) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using 'upcast' instead of 'downcast'. - /// (Originally from ..\FSComp.txt:1326) + /// (Originally from ..\FSComp.txt:1328) static member considerUpcast(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcast",",,,%s,,,%s,,,") a0 a1) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using the :> (upcast) operator instead of the :?> (downcast) operator. - /// (Originally from ..\FSComp.txt:1327) + /// (Originally from ..\FSComp.txt:1329) static member considerUpcastOperator(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcastOperator",",,,%s,,,%s,,,") a0 a1) /// The 'rec' on this module is implied by an outer 'rec' declaration and is being ignored - /// (Originally from ..\FSComp.txt:1328) + /// (Originally from ..\FSComp.txt:1330) static member tcRecImplied() = (3199, GetStringFunc("tcRecImplied",",,,") ) /// In a recursive declaration group, 'open' declarations must come first in each module - /// (Originally from ..\FSComp.txt:1329) + /// (Originally from ..\FSComp.txt:1331) static member tcOpenFirstInMutRec() = (3200, GetStringFunc("tcOpenFirstInMutRec",",,,") ) /// In a recursive declaration group, module abbreviations must come after all 'open' declarations and before other declarations - /// (Originally from ..\FSComp.txt:1330) + /// (Originally from ..\FSComp.txt:1332) static member tcModuleAbbrevFirstInMutRec() = (3201, GetStringFunc("tcModuleAbbrevFirstInMutRec",",,,") ) /// This declaration is not supported in recursive declaration groups - /// (Originally from ..\FSComp.txt:1331) + /// (Originally from ..\FSComp.txt:1333) static member tcUnsupportedMutRecDecl() = (3202, GetStringFunc("tcUnsupportedMutRecDecl",",,,") ) /// Invalid use of 'rec' keyword - /// (Originally from ..\FSComp.txt:1332) + /// (Originally from ..\FSComp.txt:1334) static member parsInvalidUseOfRec() = (3203, GetStringFunc("parsInvalidUseOfRec",",,,") ) /// If a union type has more than one case and is a struct, then all fields within the union type must be given unique names. - /// (Originally from ..\FSComp.txt:1333) + /// (Originally from ..\FSComp.txt:1335) static member tcStructUnionMultiCaseDistinctFields() = (3204, GetStringFunc("tcStructUnionMultiCaseDistinctFields",",,,") ) /// The CallerMemberNameAttribute applied to parameter '%s' will have no effect. It is overridden by the CallerFilePathAttribute. - /// (Originally from ..\FSComp.txt:1334) + /// (Originally from ..\FSComp.txt:1336) static member CallerMemberNameIsOverriden(a0 : System.String) = (3206, GetStringFunc("CallerMemberNameIsOverriden",",,,%s,,,") a0) /// Invalid use of 'fixed'. 'fixed' may only be used in a declaration of the form 'use x = fixed expr' where the expression is an array, the address of a field, the address of an array element or a string' - /// (Originally from ..\FSComp.txt:1335) + /// (Originally from ..\FSComp.txt:1337) static member tcFixedNotAllowed() = (3207, GetStringFunc("tcFixedNotAllowed",",,,") ) /// Could not find method System.Runtime.CompilerServices.OffsetToStringData in references when building 'fixed' expression. - /// (Originally from ..\FSComp.txt:1336) + /// (Originally from ..\FSComp.txt:1338) static member tcCouldNotFindOffsetToStringData() = (3208, GetStringFunc("tcCouldNotFindOffsetToStringData",",,,") ) /// The address of the variable '%s' or a related expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1337) + /// (Originally from ..\FSComp.txt:1339) static member chkNoByrefAddressOfLocal(a0 : System.String) = (3209, GetStringFunc("chkNoByrefAddressOfLocal",",,,%s,,,") a0) /// %s is an active pattern and cannot be treated as a discriminated union case with named fields. - /// (Originally from ..\FSComp.txt:1338) + /// (Originally from ..\FSComp.txt:1340) static member tcNamedActivePattern(a0 : System.String) = (3210, GetStringFunc("tcNamedActivePattern",",,,%s,,,") a0) /// The default value does not have the same type as the argument. The DefaultParameterValue attribute and any Optional attribute will be ignored. Note: 'null' needs to be annotated with the correct type, e.g. 'DefaultParameterValue(null:obj)'. - /// (Originally from ..\FSComp.txt:1339) + /// (Originally from ..\FSComp.txt:1341) static member DefaultParameterValueNotAppropriateForArgument() = (3211, GetStringFunc("DefaultParameterValueNotAppropriateForArgument",",,,") ) /// The system type '%s' was required but no referenced system DLL contained this type - /// (Originally from ..\FSComp.txt:1340) + /// (Originally from ..\FSComp.txt:1342) static member tcGlobalsSystemTypeNotFound(a0 : System.String) = (GetStringFunc("tcGlobalsSystemTypeNotFound",",,,%s,,,") a0) /// The member '%s' matches multiple overloads of the same method.\nPlease restrict it to one of the following:%s. - /// (Originally from ..\FSComp.txt:1341) + /// (Originally from ..\FSComp.txt:1343) static member typrelMemberHasMultiplePossibleDispatchSlots(a0 : System.String, a1 : System.String) = (3213, GetStringFunc("typrelMemberHasMultiplePossibleDispatchSlots",",,,%s,,,%s,,,") a0 a1) /// Method or object constructor '%s' is not static - /// (Originally from ..\FSComp.txt:1342) + /// (Originally from ..\FSComp.txt:1344) static member methodIsNotStatic(a0 : System.String) = (3214, GetStringFunc("methodIsNotStatic",",,,%s,,,") a0) /// Unexpected symbol '=' in expression. Did you intend to use 'for x in y .. z do' instead? - /// (Originally from ..\FSComp.txt:1343) + /// (Originally from ..\FSComp.txt:1345) static member parsUnexpectedSymbolEqualsInsteadOfIn() = (3215, GetStringFunc("parsUnexpectedSymbolEqualsInsteadOfIn",",,,") ) /// Indicates a method that either has no implementation in the type in which it is declared or that is virtual and has a default implementation. - /// (Originally from ..\FSComp.txt:1344) + /// (Originally from ..\FSComp.txt:1346) static member keywordDescriptionAbstract() = (GetStringFunc("keywordDescriptionAbstract",",,,") ) /// Used in mutually recursive bindings, in property declarations, and with multiple constraints on generic parameters. - /// (Originally from ..\FSComp.txt:1345) + /// (Originally from ..\FSComp.txt:1347) static member keyworkDescriptionAnd() = (GetStringFunc("keyworkDescriptionAnd",",,,") ) /// Used to give the current class object an object name. Also used to give a name to a whole pattern within a pattern match. - /// (Originally from ..\FSComp.txt:1346) + /// (Originally from ..\FSComp.txt:1348) static member keywordDescriptionAs() = (GetStringFunc("keywordDescriptionAs",",,,") ) /// Used to verify code during debugging. - /// (Originally from ..\FSComp.txt:1347) + /// (Originally from ..\FSComp.txt:1349) static member keywordDescriptionAssert() = (GetStringFunc("keywordDescriptionAssert",",,,") ) /// Used as the name of the base class object. - /// (Originally from ..\FSComp.txt:1348) + /// (Originally from ..\FSComp.txt:1350) static member keywordDescriptionBase() = (GetStringFunc("keywordDescriptionBase",",,,") ) /// In verbose syntax, indicates the start of a code block. - /// (Originally from ..\FSComp.txt:1349) + /// (Originally from ..\FSComp.txt:1351) static member keywordDescriptionBegin() = (GetStringFunc("keywordDescriptionBegin",",,,") ) /// In verbose syntax, indicates the start of a class definition. - /// (Originally from ..\FSComp.txt:1350) + /// (Originally from ..\FSComp.txt:1352) static member keywordDescriptionClass() = (GetStringFunc("keywordDescriptionClass",",,,") ) /// Indicates an implementation of an abstract method; used together with an abstract method declaration to create a virtual method. - /// (Originally from ..\FSComp.txt:1351) + /// (Originally from ..\FSComp.txt:1353) static member keywordDescriptionDefault() = (GetStringFunc("keywordDescriptionDefault",",,,") ) /// Used to declare a delegate. - /// (Originally from ..\FSComp.txt:1352) + /// (Originally from ..\FSComp.txt:1354) static member keywordDescriptionDelegate() = (GetStringFunc("keywordDescriptionDelegate",",,,") ) /// Used in looping constructs or to execute imperative code. - /// (Originally from ..\FSComp.txt:1353) + /// (Originally from ..\FSComp.txt:1355) static member keywordDescriptionDo() = (GetStringFunc("keywordDescriptionDo",",,,") ) /// In verbose syntax, indicates the end of a block of code in a looping expression. - /// (Originally from ..\FSComp.txt:1354) + /// (Originally from ..\FSComp.txt:1356) static member keywordDescriptionDone() = (GetStringFunc("keywordDescriptionDone",",,,") ) /// Used to convert to a type that is lower in the inheritance chain. - /// (Originally from ..\FSComp.txt:1355) + /// (Originally from ..\FSComp.txt:1357) static member keywordDescriptionDowncast() = (GetStringFunc("keywordDescriptionDowncast",",,,") ) /// In a for expression, used when counting in reverse. - /// (Originally from ..\FSComp.txt:1356) + /// (Originally from ..\FSComp.txt:1358) static member keywordDescriptionDownto() = (GetStringFunc("keywordDescriptionDownto",",,,") ) /// Used in conditional branching. A short form of else if. - /// (Originally from ..\FSComp.txt:1357) + /// (Originally from ..\FSComp.txt:1359) static member keywordDescriptionElif() = (GetStringFunc("keywordDescriptionElif",",,,") ) /// Used in conditional branching. - /// (Originally from ..\FSComp.txt:1358) + /// (Originally from ..\FSComp.txt:1360) static member keywordDescriptionElse() = (GetStringFunc("keywordDescriptionElse",",,,") ) /// In type definitions and type extensions, indicates the end of a section of member definitions. In verbose syntax, used to specify the end of a code block that starts with the begin keyword. - /// (Originally from ..\FSComp.txt:1359) + /// (Originally from ..\FSComp.txt:1361) static member keywordDescriptionEnd() = (GetStringFunc("keywordDescriptionEnd",",,,") ) /// Used to declare an exception type. - /// (Originally from ..\FSComp.txt:1360) + /// (Originally from ..\FSComp.txt:1362) static member keywordDescriptionException() = (GetStringFunc("keywordDescriptionException",",,,") ) /// Indicates that a declared program element is defined in another binary or assembly. - /// (Originally from ..\FSComp.txt:1361) + /// (Originally from ..\FSComp.txt:1363) static member keywordDescriptionExtern() = (GetStringFunc("keywordDescriptionExtern",",,,") ) /// Used as a Boolean literal. - /// (Originally from ..\FSComp.txt:1362) + /// (Originally from ..\FSComp.txt:1364) static member keywordDescriptionTrueFalse() = (GetStringFunc("keywordDescriptionTrueFalse",",,,") ) /// Used together with try to introduce a block of code that executes regardless of whether an exception occurs. - /// (Originally from ..\FSComp.txt:1363) + /// (Originally from ..\FSComp.txt:1365) static member keywordDescriptionFinally() = (GetStringFunc("keywordDescriptionFinally",",,,") ) /// Used in looping constructs. - /// (Originally from ..\FSComp.txt:1364) + /// (Originally from ..\FSComp.txt:1366) static member keywordDescriptionFor() = (GetStringFunc("keywordDescriptionFor",",,,") ) /// Used in lambda expressions, also known as anonymous functions. - /// (Originally from ..\FSComp.txt:1365) + /// (Originally from ..\FSComp.txt:1367) static member keywordDescriptionFun() = (GetStringFunc("keywordDescriptionFun",",,,") ) /// Used as a shorter alternative to the fun keyword and a match expression in a lambda expression that has pattern matching on a single argument. - /// (Originally from ..\FSComp.txt:1366) + /// (Originally from ..\FSComp.txt:1368) static member keywordDescriptionFunction() = (GetStringFunc("keywordDescriptionFunction",",,,") ) /// Used to reference the top-level .NET namespace. - /// (Originally from ..\FSComp.txt:1367) + /// (Originally from ..\FSComp.txt:1369) static member keywordDescriptionGlobal() = (GetStringFunc("keywordDescriptionGlobal",",,,") ) /// Used in conditional branching constructs. - /// (Originally from ..\FSComp.txt:1368) + /// (Originally from ..\FSComp.txt:1370) static member keywordDescriptionIf() = (GetStringFunc("keywordDescriptionIf",",,,") ) /// Used for sequence expressions and, in verbose syntax, to separate expressions from bindings. - /// (Originally from ..\FSComp.txt:1369) + /// (Originally from ..\FSComp.txt:1371) static member keywordDescriptionIn() = (GetStringFunc("keywordDescriptionIn",",,,") ) /// Used to specify a base class or base interface. - /// (Originally from ..\FSComp.txt:1370) + /// (Originally from ..\FSComp.txt:1372) static member keywordDescriptionInherit() = (GetStringFunc("keywordDescriptionInherit",",,,") ) /// Used to indicate a function that should be integrated directly into the caller's code. - /// (Originally from ..\FSComp.txt:1371) + /// (Originally from ..\FSComp.txt:1373) static member keywordDescriptionInline() = (GetStringFunc("keywordDescriptionInline",",,,") ) /// Used to declare and implement interfaces. - /// (Originally from ..\FSComp.txt:1372) + /// (Originally from ..\FSComp.txt:1374) static member keywordDescriptionInterface() = (GetStringFunc("keywordDescriptionInterface",",,,") ) /// Used to specify that a member is visible inside an assembly but not outside it. - /// (Originally from ..\FSComp.txt:1373) + /// (Originally from ..\FSComp.txt:1375) static member keywordDescriptionInternal() = (GetStringFunc("keywordDescriptionInternal",",,,") ) /// Used to specify a computation that is to be performed only when a result is needed. - /// (Originally from ..\FSComp.txt:1374) + /// (Originally from ..\FSComp.txt:1376) static member keywordDescriptionLazy() = (GetStringFunc("keywordDescriptionLazy",",,,") ) /// Used to associate, or bind, a name to a value or function. - /// (Originally from ..\FSComp.txt:1375) + /// (Originally from ..\FSComp.txt:1377) static member keywordDescriptionLet() = (GetStringFunc("keywordDescriptionLet",",,,") ) /// Used in computation expressions to bind a name to the result of another computation expression. - /// (Originally from ..\FSComp.txt:1376) + /// (Originally from ..\FSComp.txt:1378) static member keywordDescriptionLetBang() = (GetStringFunc("keywordDescriptionLetBang",",,,") ) /// Used to branch by comparing a value to a pattern. - /// (Originally from ..\FSComp.txt:1377) + /// (Originally from ..\FSComp.txt:1379) static member keywordDescriptionMatch() = (GetStringFunc("keywordDescriptionMatch",",,,") ) /// Used in computation expressions to pattern match directly over the result of another computation expression. - /// (Originally from ..\FSComp.txt:1378) + /// (Originally from ..\FSComp.txt:1380) static member keywordDescriptionMatchBang() = (GetStringFunc("keywordDescriptionMatchBang",",,,") ) /// Used to declare a property or method in an object type. - /// (Originally from ..\FSComp.txt:1379) + /// (Originally from ..\FSComp.txt:1381) static member keywordDescriptionMember() = (GetStringFunc("keywordDescriptionMember",",,,") ) /// Used to associate a name with a group of related types, values, and functions, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1380) + /// (Originally from ..\FSComp.txt:1382) static member keywordDescriptionModule() = (GetStringFunc("keywordDescriptionModule",",,,") ) /// Used to declare a variable, that is, a value that can be changed. - /// (Originally from ..\FSComp.txt:1381) + /// (Originally from ..\FSComp.txt:1383) static member keywordDescriptionMutable() = (GetStringFunc("keywordDescriptionMutable",",,,") ) /// Used to associate a name with a group of related types and modules, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1382) + /// (Originally from ..\FSComp.txt:1384) static member keywordDescriptionNamespace() = (GetStringFunc("keywordDescriptionNamespace",",,,") ) /// Used to declare, define, or invoke a constructor that creates or that can create an object. Also used in generic parameter constraints to indicate that a type must have a certain constructor. - /// (Originally from ..\FSComp.txt:1383) + /// (Originally from ..\FSComp.txt:1385) static member keywordDescriptionNew() = (GetStringFunc("keywordDescriptionNew",",,,") ) /// Not actually a keyword. However, not struct in combination is used as a generic parameter constraint. - /// (Originally from ..\FSComp.txt:1384) + /// (Originally from ..\FSComp.txt:1386) static member keywordDescriptionNot() = (GetStringFunc("keywordDescriptionNot",",,,") ) /// Indicates the absence of an object. Also used in generic parameter constraints. - /// (Originally from ..\FSComp.txt:1385) + /// (Originally from ..\FSComp.txt:1387) static member keywordDescriptionNull() = (GetStringFunc("keywordDescriptionNull",",,,") ) /// Used in discriminated unions to indicate the type of categories of values, and in delegate and exception declarations. - /// (Originally from ..\FSComp.txt:1386) + /// (Originally from ..\FSComp.txt:1388) static member keywordDescriptionOf() = (GetStringFunc("keywordDescriptionOf",",,,") ) /// Used to make the contents of a namespace or module available without qualification. - /// (Originally from ..\FSComp.txt:1387) + /// (Originally from ..\FSComp.txt:1389) static member keywordDescriptionOpen() = (GetStringFunc("keywordDescriptionOpen",",,,") ) /// Used with Boolean conditions as a Boolean or operator. Equivalent to ||. Also used in member constraints. - /// (Originally from ..\FSComp.txt:1388) + /// (Originally from ..\FSComp.txt:1390) static member keywordDescriptionOr() = (GetStringFunc("keywordDescriptionOr",",,,") ) /// Used to implement a version of an abstract or virtual method that differs from the base version. - /// (Originally from ..\FSComp.txt:1389) + /// (Originally from ..\FSComp.txt:1391) static member keywordDescriptionOverride() = (GetStringFunc("keywordDescriptionOverride",",,,") ) /// Restricts access to a member to code in the same type or module. - /// (Originally from ..\FSComp.txt:1390) + /// (Originally from ..\FSComp.txt:1392) static member keywordDescriptionPrivate() = (GetStringFunc("keywordDescriptionPrivate",",,,") ) /// Allows access to a member from outside the type. - /// (Originally from ..\FSComp.txt:1391) + /// (Originally from ..\FSComp.txt:1393) static member keywordDescriptionPublic() = (GetStringFunc("keywordDescriptionPublic",",,,") ) /// Used to indicate that a function is recursive. - /// (Originally from ..\FSComp.txt:1392) + /// (Originally from ..\FSComp.txt:1394) static member keywordDescriptionRec() = (GetStringFunc("keywordDescriptionRec",",,,") ) /// Used to provide a value for the result of the containing computation expression. - /// (Originally from ..\FSComp.txt:1393) + /// (Originally from ..\FSComp.txt:1395) static member keywordDescriptionReturn() = (GetStringFunc("keywordDescriptionReturn",",,,") ) /// Used to provide a value for the result of the containing computation expression, where that value itself comes from the result another computation expression. - /// (Originally from ..\FSComp.txt:1394) + /// (Originally from ..\FSComp.txt:1396) static member keywordDescriptionReturnBang() = (GetStringFunc("keywordDescriptionReturnBang",",,,") ) /// Used in query expressions to specify what fields or columns to extract. Note that this is a contextual keyword, which means that it is not actually a reserved word and it only acts like a keyword in appropriate context. - /// (Originally from ..\FSComp.txt:1395) + /// (Originally from ..\FSComp.txt:1397) static member keywordDescriptionSelect() = (GetStringFunc("keywordDescriptionSelect",",,,") ) /// Used to indicate a method or property that can be called without an instance of a type, or a value member that is shared among all instances of a type. - /// (Originally from ..\FSComp.txt:1396) + /// (Originally from ..\FSComp.txt:1398) static member keywordDescriptionStatic() = (GetStringFunc("keywordDescriptionStatic",",,,") ) /// Used to declare a structure type. Also used in generic parameter constraints. Used for OCaml compatibility in module definitions. - /// (Originally from ..\FSComp.txt:1397) + /// (Originally from ..\FSComp.txt:1399) static member keywordDescriptionStruct() = (GetStringFunc("keywordDescriptionStruct",",,,") ) /// Used in conditional expressions. Also used to perform side effects after object construction. - /// (Originally from ..\FSComp.txt:1398) + /// (Originally from ..\FSComp.txt:1400) static member keywordDescriptionThen() = (GetStringFunc("keywordDescriptionThen",",,,") ) /// Used in for loops to indicate a range. - /// (Originally from ..\FSComp.txt:1399) + /// (Originally from ..\FSComp.txt:1401) static member keywordDescriptionTo() = (GetStringFunc("keywordDescriptionTo",",,,") ) /// Used to introduce a block of code that might generate an exception. Used together with with or finally. - /// (Originally from ..\FSComp.txt:1400) + /// (Originally from ..\FSComp.txt:1402) static member keywordDescriptionTry() = (GetStringFunc("keywordDescriptionTry",",,,") ) /// Used to declare a class, record, structure, discriminated union, enumeration type, unit of measure, or type abbreviation. - /// (Originally from ..\FSComp.txt:1401) + /// (Originally from ..\FSComp.txt:1403) static member keywordDescriptionType() = (GetStringFunc("keywordDescriptionType",",,,") ) /// Used to convert to a type that is higher in the inheritance chain. - /// (Originally from ..\FSComp.txt:1402) + /// (Originally from ..\FSComp.txt:1404) static member keywordDescriptionUpcast() = (GetStringFunc("keywordDescriptionUpcast",",,,") ) /// Used instead of let for values that implement IDisposable" - /// (Originally from ..\FSComp.txt:1403) + /// (Originally from ..\FSComp.txt:1405) static member keywordDescriptionUse() = (GetStringFunc("keywordDescriptionUse",",,,") ) /// Used instead of let! in computation expressions for computation expression results that implement IDisposable. - /// (Originally from ..\FSComp.txt:1404) + /// (Originally from ..\FSComp.txt:1406) static member keywordDescriptionUseBang() = (GetStringFunc("keywordDescriptionUseBang",",,,") ) /// Used in a signature to indicate a value, or in a type to declare a member, in limited situations. - /// (Originally from ..\FSComp.txt:1405) + /// (Originally from ..\FSComp.txt:1407) static member keywordDescriptionVal() = (GetStringFunc("keywordDescriptionVal",",,,") ) /// Indicates the .NET void type. Used when interoperating with other .NET languages. - /// (Originally from ..\FSComp.txt:1406) + /// (Originally from ..\FSComp.txt:1408) static member keywordDescriptionVoid() = (GetStringFunc("keywordDescriptionVoid",",,,") ) /// Used for Boolean conditions (when guards) on pattern matches and to introduce a constraint clause for a generic type parameter. - /// (Originally from ..\FSComp.txt:1407) + /// (Originally from ..\FSComp.txt:1409) static member keywordDescriptionWhen() = (GetStringFunc("keywordDescriptionWhen",",,,") ) /// Introduces a looping construct. - /// (Originally from ..\FSComp.txt:1408) + /// (Originally from ..\FSComp.txt:1410) static member keywordDescriptionWhile() = (GetStringFunc("keywordDescriptionWhile",",,,") ) /// Used together with the match keyword in pattern matching expressions. Also used in object expressions, record copying expressions, and type extensions to introduce member definitions, and to introduce exception handlers. - /// (Originally from ..\FSComp.txt:1409) + /// (Originally from ..\FSComp.txt:1411) static member keywordDescriptionWith() = (GetStringFunc("keywordDescriptionWith",",,,") ) /// Used in a sequence expression to produce a value for a sequence. - /// (Originally from ..\FSComp.txt:1410) + /// (Originally from ..\FSComp.txt:1412) static member keywordDescriptionYield() = (GetStringFunc("keywordDescriptionYield",",,,") ) /// Used in a computation expression to append the result of a given computation expression to a collection of results for the containing computation expression. - /// (Originally from ..\FSComp.txt:1411) + /// (Originally from ..\FSComp.txt:1413) static member keywordDescriptionYieldBang() = (GetStringFunc("keywordDescriptionYieldBang",",,,") ) /// In function types, delimits arguments and return values. Yields an expression (in sequence expressions); equivalent to the yield keyword. Used in match expressions - /// (Originally from ..\FSComp.txt:1412) + /// (Originally from ..\FSComp.txt:1414) static member keywordDescriptionRightArrow() = (GetStringFunc("keywordDescriptionRightArrow",",,,") ) /// Assigns a value to a variable. - /// (Originally from ..\FSComp.txt:1413) + /// (Originally from ..\FSComp.txt:1415) static member keywordDescriptionLeftArrow() = (GetStringFunc("keywordDescriptionLeftArrow",",,,") ) /// Converts a type to type that is higher in the hierarchy. - /// (Originally from ..\FSComp.txt:1414) + /// (Originally from ..\FSComp.txt:1416) static member keywordDescriptionCast() = (GetStringFunc("keywordDescriptionCast",",,,") ) /// Converts a type to a type that is lower in the hierarchy. - /// (Originally from ..\FSComp.txt:1415) + /// (Originally from ..\FSComp.txt:1417) static member keywordDescriptionDynamicCast() = (GetStringFunc("keywordDescriptionDynamicCast",",,,") ) /// Delimits a typed code quotation. - /// (Originally from ..\FSComp.txt:1416) + /// (Originally from ..\FSComp.txt:1418) static member keywordDescriptionTypedQuotation() = (GetStringFunc("keywordDescriptionTypedQuotation",",,,") ) /// Delimits a untyped code quotation. - /// (Originally from ..\FSComp.txt:1417) + /// (Originally from ..\FSComp.txt:1419) static member keywordDescriptionUntypedQuotation() = (GetStringFunc("keywordDescriptionUntypedQuotation",",,,") ) /// %s '%s' not found in assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1418) + /// (Originally from ..\FSComp.txt:1420) static member itemNotFoundDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String) = (3216, GetStringFunc("itemNotFoundDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s '%s' not found in type '%s' from assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1419) + /// (Originally from ..\FSComp.txt:1421) static member itemNotFoundInTypeDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3216, GetStringFunc("itemNotFoundInTypeDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// is - /// (Originally from ..\FSComp.txt:1420) + /// (Originally from ..\FSComp.txt:1422) static member descriptionWordIs() = (GetStringFunc("descriptionWordIs",",,,") ) /// This value is not a function and cannot be applied. - /// (Originally from ..\FSComp.txt:1421) + /// (Originally from ..\FSComp.txt:1423) static member notAFunction() = (GetStringFunc("notAFunction",",,,") ) /// This value is not a function and cannot be applied. Did you intend to access the indexer via %s.[index] instead? - /// (Originally from ..\FSComp.txt:1422) + /// (Originally from ..\FSComp.txt:1424) static member notAFunctionButMaybeIndexerWithName(a0 : System.String) = (GetStringFunc("notAFunctionButMaybeIndexerWithName",",,,%s,,,") a0) /// This expression is not a function and cannot be applied. Did you intend to access the indexer via expr.[index] instead? - /// (Originally from ..\FSComp.txt:1423) + /// (Originally from ..\FSComp.txt:1425) static member notAFunctionButMaybeIndexer() = (GetStringFunc("notAFunctionButMaybeIndexer",",,,") ) /// - /// (Originally from ..\FSComp.txt:1424) + /// (Originally from ..\FSComp.txt:1426) static member notAFunctionButMaybeIndexerErrorCode() = (3217, GetStringFunc("notAFunctionButMaybeIndexerErrorCode",",,,") ) /// This value is not a function and cannot be applied. Did you forget to terminate a declaration? - /// (Originally from ..\FSComp.txt:1425) + /// (Originally from ..\FSComp.txt:1427) static member notAFunctionButMaybeDeclaration() = (GetStringFunc("notAFunctionButMaybeDeclaration",",,,") ) /// The argument names in the signature '%s' and implementation '%s' do not match. The argument name from the signature file will be used. This may cause problems when debugging or profiling. - /// (Originally from ..\FSComp.txt:1426) + /// (Originally from ..\FSComp.txt:1428) static member ArgumentsInSigAndImplMismatch(a0 : System.String, a1 : System.String) = (3218, GetStringFunc("ArgumentsInSigAndImplMismatch",",,,%s,,,%s,,,") a0 a1) /// An error occurred while reading the F# metadata of assembly '%s'. A reserved construct was utilized. You may need to upgrade your F# compiler or use an earlier version of the assembly that doesn't make use of a specific construct. - /// (Originally from ..\FSComp.txt:1427) + /// (Originally from ..\FSComp.txt:1429) static member pickleUnexpectedNonZero(a0 : System.String) = (3219, GetStringFunc("pickleUnexpectedNonZero",",,,%s,,,") a0) /// This method or property is not normally used from F# code, use an explicit tuple pattern for deconstruction instead. - /// (Originally from ..\FSComp.txt:1428) + /// (Originally from ..\FSComp.txt:1430) static member tcTupleMemberNotNormallyUsed() = (3220, GetStringFunc("tcTupleMemberNotNormallyUsed",",,,") ) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield'. - /// (Originally from ..\FSComp.txt:1429) + /// (Originally from ..\FSComp.txt:1431) static member implicitlyDiscardedInSequenceExpression(a0 : System.String) = (3221, GetStringFunc("implicitlyDiscardedInSequenceExpression",",,,%s,,,") a0) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield!'. - /// (Originally from ..\FSComp.txt:1430) + /// (Originally from ..\FSComp.txt:1432) static member implicitlyDiscardedSequenceInSequenceExpression(a0 : System.String) = (3222, GetStringFunc("implicitlyDiscardedSequenceInSequenceExpression",",,,%s,,,") a0) /// The file '%s' changed on disk unexpectedly, please reload. - /// (Originally from ..\FSComp.txt:1431) + /// (Originally from ..\FSComp.txt:1433) static member ilreadFileChanged(a0 : System.String) = (3223, GetStringFunc("ilreadFileChanged",",,,%s,,,") a0) /// The byref pointer is readonly, so this write is not permitted. - /// (Originally from ..\FSComp.txt:1432) + /// (Originally from ..\FSComp.txt:1434) static member writeToReadOnlyByref() = (3224, GetStringFunc("writeToReadOnlyByref",",,,") ) /// A ReadOnly attribute has been applied to a struct type with a mutable field. - /// (Originally from ..\FSComp.txt:1433) + /// (Originally from ..\FSComp.txt:1435) static member readOnlyAttributeOnStructWithMutableField() = (3225, GetStringFunc("readOnlyAttributeOnStructWithMutableField",",,,") ) /// A byref pointer returned by a function or method is implicitly dereferenced as of F# 4.5. To acquire the return value as a pointer, use the address-of operator, e.g. '&f(x)' or '&obj.Method(arg1, arg2)'. - /// (Originally from ..\FSComp.txt:1434) + /// (Originally from ..\FSComp.txt:1436) static member tcByrefReturnImplicitlyDereferenced() = (3226, GetStringFunc("tcByrefReturnImplicitlyDereferenced",",,,") ) /// A type annotated with IsByRefLike must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1435) + /// (Originally from ..\FSComp.txt:1437) static member tcByRefLikeNotStruct() = (3227, GetStringFunc("tcByRefLikeNotStruct",",,,") ) /// The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1436) + /// (Originally from ..\FSComp.txt:1438) static member chkNoByrefAddressOfValueFromExpression() = (3228, GetStringFunc("chkNoByrefAddressOfValueFromExpression",",,,") ) /// The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope. - /// (Originally from ..\FSComp.txt:1437) + /// (Originally from ..\FSComp.txt:1439) static member chkNoReturnOfLimitedSpan() = (3229, GetStringFunc("chkNoReturnOfLimitedSpan",",,,") ) /// This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope. - /// (Originally from ..\FSComp.txt:1438) + /// (Originally from ..\FSComp.txt:1440) static member chkNoWriteToLimitedSpan(a0 : System.String) = (3230, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0) /// A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...' - /// (Originally from ..\FSComp.txt:1439) + /// (Originally from ..\FSComp.txt:1441) static member tastValueMustBeLocal() = (3231, GetStringFunc("tastValueMustBeLocal",",,,") ) /// A type annotated with IsReadOnly must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1440) + /// (Originally from ..\FSComp.txt:1442) static member tcIsReadOnlyNotStruct() = (3232, GetStringFunc("tcIsReadOnlyNotStruct",",,,") ) /// Struct members cannot return the address of fields of the struct by reference - /// (Originally from ..\FSComp.txt:1441) + /// (Originally from ..\FSComp.txt:1443) static member chkStructsMayNotReturnAddressesOfContents() = (3233, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,") ) /// The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1442) + /// (Originally from ..\FSComp.txt:1444) static member chkNoByrefLikeFunctionCall() = (3234, GetStringFunc("chkNoByrefLikeFunctionCall",",,,") ) /// The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1443) + /// (Originally from ..\FSComp.txt:1445) static member chkNoSpanLikeVariable(a0 : System.String) = (3235, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0) /// A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1444) + /// (Originally from ..\FSComp.txt:1446) static member chkNoSpanLikeValueFromExpression() = (3236, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,") ) /// Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address. - /// (Originally from ..\FSComp.txt:1445) + /// (Originally from ..\FSComp.txt:1447) static member tastCantTakeAddressOfExpression() = (3237, GetStringFunc("tastCantTakeAddressOfExpression",",,,") ) /// This type does not inherit Attribute, it will not work correctly with other .NET languages. - /// (Originally from ..\FSComp.txt:1446) + /// (Originally from ..\FSComp.txt:1448) static member tcTypeDoesNotInheritAttribute() = (3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,") ) - /// The type '%s' never has 'null' as a value. To specify a nullable value type use Nullable<%s> - /// (Originally from ..\FSComp.txt:1447) - static member tcTypeDoesNotHaveAnyNull(a0 : System.String, a1 : System.String) = (3243, GetStringFunc("tcTypeDoesNotHaveAnyNull",",,,%s,,,%s,,,") a0 a1) + /// The type '%s' does not support a nullness qualitification. + /// (Originally from ..\FSComp.txt:1449) + static member tcTypeDoesNotHaveAnyNull(a0 : System.String) = (3243, GetStringFunc("tcTypeDoesNotHaveAnyNull",",,,%s,,,") a0) + /// The /checknulls language feature is not enabled + /// (Originally from ..\FSComp.txt:1452) + static member tcNullnessCheckingNotEnabled() = (3246, GetStringFunc("tcNullnessCheckingNotEnabled",",,,") ) /// Call this method once to validate that all known resources are valid; throws if not static member RunStartupValidation() = @@ -5225,6 +5234,8 @@ type internal SR private() = ignore(GetString("optsWarn")) ignore(GetString("optsNowarn")) ignore(GetString("optsWarnOn")) + ignore(GetString("optsCheckNulls")) + ignore(GetString("optsLangVersion")) ignore(GetString("optsChecked")) ignore(GetString("optsDefine")) ignore(GetString("optsMlcompatibility")) @@ -5790,4 +5801,5 @@ type internal SR private() = ignore(GetString("tastCantTakeAddressOfExpression")) ignore(GetString("tcTypeDoesNotInheritAttribute")) ignore(GetString("tcTypeDoesNotHaveAnyNull")) + ignore(GetString("tcNullnessCheckingNotEnabled")) () diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index 60a051560e9..11e6631c6e1 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -2676,6 +2676,12 @@ Enable specific warnings that may be off by default + + Enable nullness declarations and checks + + + Specify the language version + Generate overflow checks @@ -4370,6 +4376,9 @@ This type does not inherit Attribute, it will not work correctly with other .NET languages. - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + + + The /checknulls language feature is not enabled \ No newline at end of file diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 8c0ca6d5ba5..9cfe154ed36 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -194,6 +194,7 @@ let GetRangeOfDiagnostic(err:PhasedDiagnostic) = | ConstraintSolverTupleDiffLengths(_, _, _, m, _) | ConstraintSolverInfiniteTypes(_, _, _, _, m, _) | ConstraintSolverMissingConstraint(_, _, _, m, _) + | ConstraintSolverNullnessWarningEquivWithTypes(_, _, _, _, _, m, _) | ConstraintSolverNullnessWarningWithTypes(_, _, _, _, _, m, _) | ConstraintSolverNullnessWarningWithType(_, _, _, m, _) | ConstraintSolverTypesNotInEqualityRelation(_, _, _, m, _, _) @@ -373,6 +374,7 @@ let GetDiagnosticNumber(err:PhasedDiagnostic) = | :? TypeProviderError as e -> e.Number #endif | ErrorsFromAddingSubsumptionConstraint (_, _, _, _, _, ContextInfo.DowncastUsedInsteadOfUpcast _, _) -> fst (FSComp.SR.considerUpcast("", "")) + | ConstraintSolverNullnessWarningEquivWithTypes _ -> 3244 | ConstraintSolverNullnessWarningWithTypes _ -> 3244 | ConstraintSolverNullnessWarningWithType _ -> 3245 | _ -> 193 @@ -446,7 +448,8 @@ let ConstraintSolverTupleDiffLengthsE() = DeclareResourceString("ConstraintSolve let ConstraintSolverInfiniteTypesE() = DeclareResourceString("ConstraintSolverInfiniteTypes", "%s%s") let ConstraintSolverMissingConstraintE() = DeclareResourceString("ConstraintSolverMissingConstraint", "%s") let ConstraintSolverTypesNotInEqualityRelation1E() = DeclareResourceString("ConstraintSolverTypesNotInEqualityRelation1", "%s%s") -let ConstraintSolverNullnessWarningWithTypesE() = DeclareResourceString("ConstraintSolverNullnessWarningWithTypes", "%s%s") +let ConstraintSolverNullnessWarningEquivWithTypesE() = DeclareResourceString("ConstraintSolverNullnessWarningEquivWithTypes", "%s%s%s%s") +let ConstraintSolverNullnessWarningWithTypesE() = DeclareResourceString("ConstraintSolverNullnessWarningWithTypes", "%s%s%s%s") let ConstraintSolverNullnessWarningWithTypeE() = DeclareResourceString("ConstraintSolverNullnessWarningWithType", "%s") let ConstraintSolverTypesNotInEqualityRelation2E() = DeclareResourceString("ConstraintSolverTypesNotInEqualityRelation2", "%s%s") let ConstraintSolverTypesNotInSubsumptionRelationE() = DeclareResourceString("ConstraintSolverTypesNotInSubsumptionRelation", "%s%s%s") @@ -637,11 +640,20 @@ let OutputPhasedErrorR (os:StringBuilder) (err:PhasedDiagnostic) = if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore - | ConstraintSolverNullnessWarningWithTypes(denv, ty1, ty2, _nullness, _nullness2, m, m2) -> + | ConstraintSolverNullnessWarningEquivWithTypes(denv, ty1, ty2, nullness1, nullness2, m, m2) -> let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv ty1 ty2 - os.Append(ConstraintSolverNullnessWarningWithTypesE().Format t1 t2) |> ignore + os.Append(ConstraintSolverNullnessWarningEquivWithTypesE().Format t1 t2 (nullness1.ToString()) (nullness2.ToString())) |> ignore + + if m.StartLine <> m2.StartLine then + os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore + + | ConstraintSolverNullnessWarningWithTypes(denv, ty1, ty2, nullness1, nullness2, m, m2) -> + + let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv ty1 ty2 + + os.Append(ConstraintSolverNullnessWarningWithTypesE().Format t1 t2 (nullness1.ToString()) (nullness2.ToString())) |> ignore if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore @@ -658,7 +670,7 @@ let OutputPhasedErrorR (os:StringBuilder) (err:PhasedDiagnostic) = // REVIEW: consider if we need to show _cxs (the type parameter constraints) let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv t1 t2 - os.Append(ConstraintSolverTypesNotInEqualityRelation1E().Format t1 t2 ) |> ignore + os.Append(ConstraintSolverTypesNotInEqualityRelation1E().Format t1 t2) |> ignore if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore @@ -2251,6 +2263,8 @@ type TcConfigBuilder = mutable errorSeverityOptions: FSharpErrorSeverityOptions mutable mlCompatibility: bool mutable assumeNullOnImport: bool + mutable checkNullness: bool + mutable langVersion: double mutable checkOverflow: bool mutable showReferenceResolutions:bool mutable outputFile : string option @@ -2412,6 +2426,8 @@ type TcConfigBuilder = useHighEntropyVA = false mlCompatibility = false assumeNullOnImport = false + checkNullness = false + langVersion = 5.0 checkOverflow = false showReferenceResolutions = false outputFile = None @@ -2885,6 +2901,8 @@ type TcConfig private (data : TcConfigBuilder, validate:bool) = member x.errorSeverityOptions = data.errorSeverityOptions member x.mlCompatibility = data.mlCompatibility member x.assumeNullOnImport = data.assumeNullOnImport + member x.checkNullness = data.checkNullness + member x.langVersion = data.langVersion member x.checkOverflow = data.checkOverflow member x.showReferenceResolutions = data.showReferenceResolutions member x.outputFile = data.outputFile @@ -4797,7 +4815,8 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti // OK, now we have both mscorlib.dll and FSharp.Core.dll we can create TcGlobals let tcGlobals = TcGlobals(tcConfig.compilingFslib, ilGlobals, fslibCcu, tcConfig.implicitIncludeDir, tcConfig.mlCompatibility, - tcConfig.isInteractive, tcConfig.assumeNullOnImport, tryFindSysTypeCcu, tcConfig.emitDebugInfoInQuotations, tcConfig.noDebugData ) + tcConfig.isInteractive, tcConfig.assumeNullOnImport, tcConfig.checkNullness, tcConfig.langVersion, + tryFindSysTypeCcu, tcConfig.emitDebugInfoInQuotations, tcConfig.noDebugData ) #if DEBUG // the global_g reference cell is used only for debug printing diff --git a/src/fsharp/CompileOps.fsi b/src/fsharp/CompileOps.fsi index a8ab33591db..5b69b69243a 100755 --- a/src/fsharp/CompileOps.fsi +++ b/src/fsharp/CompileOps.fsi @@ -271,6 +271,8 @@ type TcConfigBuilder = mutable errorSeverityOptions: FSharpErrorSeverityOptions mutable mlCompatibility:bool mutable assumeNullOnImport: bool + mutable checkNullness: bool + mutable langVersion: double mutable checkOverflow:bool mutable showReferenceResolutions:bool mutable outputFile: string option @@ -427,6 +429,8 @@ type TcConfig = member errorSeverityOptions: FSharpErrorSeverityOptions member mlCompatibility:bool member assumeNullOnImport: bool + member checkNullness: bool + member langVersion: double member checkOverflow:bool member showReferenceResolutions:bool member outputFile: string option diff --git a/src/fsharp/CompileOptions.fs b/src/fsharp/CompileOptions.fs index 1c53aaaa6a8..c025bb2f13e 100644 --- a/src/fsharp/CompileOptions.fs +++ b/src/fsharp/CompileOptions.fs @@ -595,6 +595,10 @@ let errorsAndWarningsFlags (tcConfigB: TcConfigBuilder) = CompilerOption("warnon", tagWarnList, OptionStringList (fun n -> tcConfigB.TurnWarningOn(rangeCmdArgs, trimFS n)), None, Some (FSComp.SR.optsWarnOn())) + CompilerOption("checknulls", tagNone, OptionSwitch (fun switch -> tcConfigB.checkNullness <- (switch = OptionSwitch.On)), None, Some (FSComp.SR.optsCheckNulls())) + + CompilerOption("langversion", tagNone, OptionString (fun switch -> tcConfigB.langVersion <- double switch), None, Some (FSComp.SR.optsLangVersion())) + CompilerOption("consolecolors", tagNone, OptionSwitch (fun switch -> enableConsoleColoring <- switch = OptionSwitch.On), None, Some (FSComp.SR.optsConsoleColors())) ] diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index e688fdf2908..c0439d097e5 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -156,6 +156,7 @@ exception ConstraintSolverInfiniteTypes of ContextInfo * DisplayEnv * TType * TT exception ConstraintSolverTypesNotInEqualityRelation of DisplayEnv * TType * TType * range * range * ContextInfo exception ConstraintSolverTypesNotInSubsumptionRelation of DisplayEnv * TType * TType * range * range exception ConstraintSolverMissingConstraint of DisplayEnv * Tast.Typar * Tast.TyparConstraint * range * range +exception ConstraintSolverNullnessWarningEquivWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverNullnessWarningWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverNullnessWarningWithType of DisplayEnv * TType * NullnessInfo * range * range exception ConstraintSolverError of string * range * range @@ -231,7 +232,7 @@ let rec occursCheck g un ty = | TType_app (_, l, _) | TType_tuple (_, l) -> List.exists (occursCheck g un) l | TType_fun (d, r, _nullness) -> occursCheck g un d || occursCheck g un r - | TType_var r -> typarEq un r + | TType_var (r, _) -> typarEq un r | TType_forall (_, tau) -> occursCheck g un tau | _ -> false @@ -710,7 +711,7 @@ let rec SolveTyparEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace:Optiona DepthCheck ndeep m ++ (fun () -> match ty1 with - | TType_var r | TType_measure (Measure.Var r) -> + | TType_var (r, _) | TType_measure (Measure.Var r) -> // The types may still be equivalent due to abbreviations, which we are trying not to eliminate if typeEquiv csenv.g ty1 ty then CompleteD else @@ -783,14 +784,18 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 match nullness1, nullness2 with | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> CompleteD - | Nullness.Variable nv1, _ when not nv1.IsSolved -> - trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) - CompleteD - | _, Nullness.Variable nv2 when not nv2.IsSolved -> - trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) - CompleteD - | Nullness.Variable nv1, _ -> SolveNullnessEquiv csenv m2 trace ty1 ty2 nv1.Solution nullness2 - | _, Nullness.Variable nv2 -> SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nv2.Solution + | Nullness.Variable nv1, _ -> + if nv1.IsSolved then + SolveNullnessEquiv csenv m2 trace ty1 ty2 nv1.Solution nullness2 + else + trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) + CompleteD + | _, Nullness.Variable nv2 -> + if nv2.IsSolved then + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nv2.Solution + else + trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) + CompleteD | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with | NullnessInfo.Oblivious, _ -> CompleteD @@ -798,20 +803,27 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD | _, _ -> - WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) + if csenv.g.checkNullness then + WarnD(ConstraintSolverNullnessWarningEquivWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) + else + CompleteD and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 ty2 nullness1 nullness2 = match nullness1, nullness2 with | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> CompleteD - | Nullness.Variable nv1, _ when not nv1.IsSolved -> - trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) - CompleteD - | _, Nullness.Variable nv2 when not nv2.IsSolved -> - trace.Exec (fun () -> nv2.Set nullness2) (fun () -> nv2.Unset()) - CompleteD - | Nullness.Variable nv1, _ -> SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nv1.Solution nullness2 - | _, Nullness.Variable nv2 -> SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nv2.Solution + | Nullness.Variable nv1, _ -> + if nv1.IsSolved then + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nv1.Solution nullness2 + else + trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) + CompleteD + | _, Nullness.Variable nv2 -> + if nv2.IsSolved then + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nv2.Solution + else + trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) + CompleteD | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with | NullnessInfo.Oblivious, _ -> CompleteD @@ -820,7 +832,10 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> - WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) + if csenv.g.checkNullness then + WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) + else + CompleteD /// Add the constraint "ty1 = ty2" to the constraint problem. /// Propagate all effects of adding this constraint, e.g. to solve type variables @@ -843,13 +858,26 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra match sty1, sty2 with // type vars inside forall-types may be alpha-equivalent - | TType_var tp1, TType_var tp2 when typarEq tp1 tp2 || (match aenv.EquivTypars.TryFind tp1 with | Some v when typeEquiv g v ty2 -> true | _ -> false) -> CompleteD + | TType_var (tp1, nullness1), TType_var (tp2, nullness2) when typarEq tp1 tp2 || (match aenv.EquivTypars.TryFind tp1 with | Some v when typeEquiv g v ty2 -> true | _ -> false) -> + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 - | TType_var tp1, TType_var tp2 when PreferUnifyTypar tp1 tp2 -> SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 - | TType_var tp1, TType_var tp2 when not csenv.MatchingOnly && PreferUnifyTypar tp2 tp1 -> SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 + | TType_var (tp1, nullness1), TType_var (tp2, nullness2) when PreferUnifyTypar tp1 tp2 -> + SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 ++ (fun () -> + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 + ) + | TType_var (tp1, nullness1), TType_var (tp2, nullness2) when not csenv.MatchingOnly && PreferUnifyTypar tp2 tp1 -> + SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 + ) - | TType_var r, _ when (r.Rigidity <> TyparRigidity.Rigid) -> SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 - | _, TType_var r when (r.Rigidity <> TyparRigidity.Rigid) && not csenv.MatchingOnly -> SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 + | TType_var (r, nullness1), _ when (r.Rigidity <> TyparRigidity.Rigid) -> + SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 ++ (fun () -> + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 (nullnessOfTy g sty2) + ) + | _, TType_var (r, nullness2) when (r.Rigidity <> TyparRigidity.Rigid) && not csenv.MatchingOnly -> + SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> + SolveNullnessEquiv csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullness2 + ) // Catch float<_>=float<1>, float32<_>=float32<1> and decimal<_>=decimal<1> | (_, TType_app (tc2, [ms2], nullness2)) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty1 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms2])) -> @@ -937,25 +965,34 @@ and SolveTypeSubsumesType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalT let aenv = csenv.EquivEnv let denv = csenv.DisplayEnv match sty1, sty2 with - | TType_var tp1, _ -> + | TType_var (tp1, nullness1) , _ -> match aenv.EquivTypars.TryFind tp1 with | Some v -> SolveTypeSubsumesType csenv ndeep m2 trace cxsln v ty2 | _ -> match sty2 with - | TType_var r2 when typarEq tp1 r2 -> CompleteD - | TType_var r when not csenv.MatchingOnly -> SolveTyparSubtypeOfType csenv ndeep m2 trace r ty1 + | TType_var (r2, nullness2) when typarEq tp1 r2 -> + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 + | TType_var (r2, nullness2) when not csenv.MatchingOnly -> + SolveTyparSubtypeOfType csenv ndeep m2 trace r2 ty1 ++ (fun () -> + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nullness2 + ) | _ -> SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ty1 ty2 - | _, TType_var r when not csenv.MatchingOnly -> SolveTyparSubtypeOfType csenv ndeep m2 trace r ty1 + | _, TType_var (r2, nullness2) when not csenv.MatchingOnly -> + SolveTyparSubtypeOfType csenv ndeep m2 trace r2 ty1 ++ (fun () -> + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullness2 + ) | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> if evalTupInfoIsStruct tupInfo1 <> evalTupInfoIsStruct tupInfo2 then ErrorD (ConstraintSolverError(FSComp.SR.tcTupleStructMismatch(), csenv.m, m2)) else SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 (* nb. can unify since no variance *) + | TType_fun (d1, r1, nullness1) , TType_fun (d2, r2, nullness2) -> (* nb. can unify since no variance *) SolveFunTypeEqn csenv ndeep m2 trace cxsln d1 d2 r1 r2 ++ (fun () -> SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nullness2 ) + | TType_measure ms1, TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 // Enforce the identities float=float<1>, float32=float32<1> and decimal=decimal<1> @@ -1766,10 +1803,14 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio CompleteD | Nullness.Variable nv -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nv.Solution | Nullness.Known n1 -> - match n1 with + match n1 with | NullnessInfo.Oblivious -> CompleteD | NullnessInfo.WithNull -> CompleteD - | NullnessInfo.WithoutNull -> WarnD(ConstraintSolverNullnessWarningWithType(denv, ty, n1, m, m2)) + | NullnessInfo.WithoutNull -> + if csenv.g.checkNullness then + WarnD(ConstraintSolverNullnessWarningWithType(denv, ty, n1, m, m2)) + else + CompleteD and SolveTypeSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let g = csenv.g diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi index ef0d5134a64..3fad04fd039 100644 --- a/src/fsharp/ConstraintSolver.fsi +++ b/src/fsharp/ConstraintSolver.fsi @@ -81,6 +81,7 @@ exception ConstraintSolverInfiniteTypes of ContextInfo * Display exception ConstraintSolverTypesNotInEqualityRelation of DisplayEnv * TType * TType * range * range * ContextInfo exception ConstraintSolverTypesNotInSubsumptionRelation of DisplayEnv * TType * TType * range * range exception ConstraintSolverMissingConstraint of DisplayEnv * Typar * TyparConstraint * range * range +exception ConstraintSolverNullnessWarningEquivWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverNullnessWarningWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverNullnessWarningWithType of DisplayEnv * TType * NullnessInfo * range * range exception ConstraintSolverError of string * range * range diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index 6c46fdbef9e..8b6b1318803 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -862,6 +862,8 @@ optsWarnaserror,"Report specific warnings as errors" optsWarn,"Set a warning level (0-5)" optsNowarn,"Disable specific warning messages" optsWarnOn,"Enable specific warnings that may be off by default" +optsCheckNulls,"Enable nullness declarations and checks" +optsLangVersion,"Specify the language version" optsChecked,"Generate overflow checks" optsDefine,"Define conditional compilation symbols (Short form: -d)" optsMlcompatibility,"Ignore ML compatibility warnings" @@ -1444,6 +1446,7 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl 3236,chkNoSpanLikeValueFromExpression,"A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope." 3237,tastCantTakeAddressOfExpression,"Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address." 3242,tcTypeDoesNotInheritAttribute,"This type does not inherit Attribute, it will not work correctly with other .NET languages." -3243,tcTypeDoesNotHaveAnyNull,"The type '%s' never has 'null' as a value. To specify a nullable value type use Nullable<%s>" +3243,tcTypeDoesNotHaveAnyNull,"The type '%s' does not support a nullness qualitification." #3244 reserved for ConstraintSolverNullnessWarningWithTypes #3245 reserved for ConstraintSolverNullnessWarningWithType +3246,tcNullnessCheckingNotEnabled,"The /checknulls language feature is not enabled" diff --git a/src/fsharp/FSStrings.resx b/src/fsharp/FSStrings.resx index c2d4c288913..35dfaf07dba 100644 --- a/src/fsharp/FSStrings.resx +++ b/src/fsharp/FSStrings.resx @@ -129,8 +129,11 @@ A type parameter is missing a constraint '{0}' + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. Nullness warning: The type '{0}' does not support nullness. diff --git a/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs b/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs index 0150ef26ec5..ddc1f9242ca 100644 --- a/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs +++ b/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs @@ -27,9 +27,9 @@ namespace {0} open System.Reflection module internal {1} = - type private C (_dummy:System.Object) = class end + type private C (_dummy:System.Int32) = class end let mutable Culture = System.Globalization.CultureInfo.CurrentUICulture - let ResourceManager = new System.Resources.ResourceManager(""{2}"", C(null).GetType().GetTypeInfo().Assembly) + let ResourceManager = new System.Resources.ResourceManager(""{2}"", C(0).GetType().GetTypeInfo().Assembly) let GetString(name:System.String) : System.String = ResourceManager.GetString(name, Culture)" let boilerplateGetObject = " let GetObject(name:System.String) : System.Object = ResourceManager.GetObject(name, Culture)" diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index 8681b9c4fc5..827b9932ba8 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -27,6 +27,7 @@ $(OtherFlags) --maxerrors:20 $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 $(OtherFlags) --compiling-fslib-40 + diff --git a/src/fsharp/FSharp.Core/array.fs b/src/fsharp/FSharp.Core/array.fs index 29713557fc9..9d010246bf4 100644 --- a/src/fsharp/FSharp.Core/array.fs +++ b/src/fsharp/FSharp.Core/array.fs @@ -13,6 +13,7 @@ namespace Microsoft.FSharp.Collections #if FX_RESHAPED_REFLECTION open System.Reflection #endif + #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this? /// Basic operations on arrays [] @@ -571,12 +572,16 @@ namespace Microsoft.FSharp.Collections maskArray.[maskIdx] <- mask count +#if BUILDING_WITH_LKG let private createMask<'a> (f:'a->bool) (src:array<'a>) (maskArrayOut:byref>) (leftoverMaskOut:byref) = +#else + let private createMask<'a> (f:'a->bool) (src:array<'a>) (maskArrayOut:byref< array? >) (leftoverMaskOut:byref) = +#endif let maskArrayLength = src.Length / 0x20 // null when there are less than 32 items in src array. let maskArray = - if maskArrayLength = 0 then Unchecked.defaultof<_> + if maskArrayLength = 0 then null else Microsoft.FSharp.Primitives.Basics.Array.zeroCreateUnchecked maskArrayLength let mutable count = @@ -657,7 +662,11 @@ namespace Microsoft.FSharp.Collections dstIdx +#if BUILDING_WITH_LKG let private filterViaMask (maskArray:array) (leftoverMask:uint32) (count:int) (src:array<_>) = +#else + let private filterViaMask (maskArray:array?) (leftoverMask:uint32) (count:int) (src:array<_>) = +#endif let dst = Microsoft.FSharp.Primitives.Basics.Array.zeroCreateUnchecked count let mutable dstIdx = 0 @@ -676,8 +685,8 @@ namespace Microsoft.FSharp.Collections dst let filter f (src:array<_>) = - let mutable maskArray = Unchecked.defaultof<_> - let mutable leftOverMask = Unchecked.defaultof<_> + let mutable maskArray = null + let mutable leftOverMask = 0u match createMask f src &maskArray &leftOverMask with | 0 -> empty | count -> filterViaMask maskArray leftOverMask count src diff --git a/src/fsharp/FSharp.Core/array2.fs b/src/fsharp/FSharp.Core/array2.fs index d6836475f7e..dbd7320281b 100644 --- a/src/fsharp/FSharp.Core/array2.fs +++ b/src/fsharp/FSharp.Core/array2.fs @@ -9,6 +9,7 @@ namespace Microsoft.FSharp.Collections open Microsoft.FSharp.Core.Operators.Checked #nowarn "3218" // mismatch of parameter name where 'count1' --> 'length1' would shadow function in module of same name + #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this? [] [] diff --git a/src/fsharp/FSharp.Core/list.fs b/src/fsharp/FSharp.Core/list.fs index f02ceffcff6..6d46be2180f 100644 --- a/src/fsharp/FSharp.Core/list.fs +++ b/src/fsharp/FSharp.Core/list.fs @@ -12,6 +12,7 @@ namespace Microsoft.FSharp.Collections #if FX_RESHAPED_REFLECTION open System.Reflection #endif + #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this? [] [] diff --git a/src/fsharp/FSharp.Core/local.fs b/src/fsharp/FSharp.Core/local.fs index 42297795184..c903f56aef8 100644 --- a/src/fsharp/FSharp.Core/local.fs +++ b/src/fsharp/FSharp.Core/local.fs @@ -1096,7 +1096,11 @@ module internal Array = if len < 2 then () else Array.Sort<_>(array, fastComparerForArraySort()) +#if BUILDING_WITH_LKG let stableSortWithKeysAndComparer (cFast:IComparer<'Key>) (c:IComparer<'Key>) (array:array<'T>) (keys:array<'Key>) = +#else + let stableSortWithKeysAndComparer (cFast:IComparer<'Key>?) (c:IComparer<'Key>) (array:array<'T>) (keys:array<'Key>) = +#endif // 'places' is an array or integers storing the permutation performed by the sort let places = zeroCreateUnchecked array.Length for i = 0 to array.Length - 1 do diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index d38327d2d49..2ee1d07d5cf 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -9,6 +9,8 @@ #nowarn "69" // Interface implementations in augmentations are now deprecated. Interface implementations should be given on the initial declaration of a type. #nowarn "77" // Member constraints with the name 'Exp' are given special status by the F# compiler as certain .NET types are implicitly augmented with this member. This may result in compilation failures if you attempt to invoke the member constraint from your own code. #nowarn "3218" // mismatch of parameter name for 'fst' and 'snd' +#nowarn "3244" // no nullness checking +#nowarn "3245" // no nullness checking namespace Microsoft.FSharp.Core @@ -821,7 +823,7 @@ namespace Microsoft.FSharp.Core /// Implements generic comparison between two objects. This corresponds to the pseudo-code in the F# /// specification. The treatment of NaNs is governed by "comp". - let rec GenericCompare (comp:GenericComparer) (xobj:obj,yobj:obj) = + let rec GenericCompare (comp:GenericComparer) (xobj:obj, yobj:obj) = (*if objEq xobj yobj then 0 else *) match xobj,yobj with | null,null -> 0 @@ -3326,7 +3328,7 @@ namespace Microsoft.FSharp.Core | _ -> None [] - let inline isNull (value : 'T) = + let inline isNull (value : 'T when 'T : not struct and 'T : null) = match value with | null -> true | _ -> false diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index 18c8192c3ba..1a2db379696 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -952,7 +952,11 @@ namespace Microsoft.FSharp.Core val inline FastGenericComparer<'T> : System.Collections.Generic.IComparer<'T> when 'T : comparison /// Make an F# comparer object for the given type, where it can be null if System.Collections.Generic.Comparer<'T>.Default +#if BUILDING_WITH_LKG val internal FastGenericComparerCanBeNull<'T> : System.Collections.Generic.IComparer<'T> when 'T : comparison +#else + val internal FastGenericComparerCanBeNull<'T> : System.Collections.Generic.IComparer<'T>? when 'T : comparison +#endif /// Make an F# hash/equality object for the given type val inline FastGenericEqualityComparer<'T> : System.Collections.Generic.IEqualityComparer<'T> when 'T : equality @@ -2239,20 +2243,23 @@ namespace Microsoft.FSharp.Core /// The value to check. /// True when value is null, false otherwise. [] - val inline isNull : value:'T -> bool when 'T : null + val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null +#if !BUILDING_WITH_LKG /// Determines whether the given value is null. /// The value to check. /// True when value is null, false otherwise. [] val inline isNullV : value:Nullable<'T> -> bool - +#endif + /// Determines whether the given value is not null. /// The value to check. /// True when value is not null, false otherwise. [] val inline internal isNotNull : value:'T -> bool when 'T : null +#if !BUILDING_WITH_LKG /// Get the null value for a value type. /// The null value for a value type. [] @@ -2262,7 +2269,7 @@ namespace Microsoft.FSharp.Core /// The value to check. /// True when value is null, false otherwise. [] - val inline notNull : value:'T -> 'T when 'T : not struct and 'T : null + val inline notNull : value: (('T)?) -> 'T when 'T : not struct /// Asserts that the value is non-null. /// The value to check. @@ -2274,13 +2281,14 @@ namespace Microsoft.FSharp.Core /// The value to check. /// True when value is null, false otherwise. [] - val inline withNull : value:'T -> 'T when 'T : not struct and 'T : null + val inline withNull : value:'T -> (('T)?) when 'T : not struct and 'T : null /// Asserts that the value is non-null. /// The value to check. /// True when value is null, false otherwise. [] val inline withNullV : value:'T -> Nullable<'T> +#endif /// Throw a System.Exception exception. /// The exception message. diff --git a/src/fsharp/FSharp.Core/seq.fs b/src/fsharp/FSharp.Core/seq.fs index 3162a0fe594..f721aea94ac 100644 --- a/src/fsharp/FSharp.Core/seq.fs +++ b/src/fsharp/FSharp.Core/seq.fs @@ -2,6 +2,7 @@ namespace Microsoft.FSharp.Collections #nowarn "52" // The value has been copied to ensure the original is not mutated by this operation + #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this? open System open System.Diagnostics diff --git a/src/fsharp/FSharp.Core/seqcore.fs b/src/fsharp/FSharp.Core/seqcore.fs index 71bfc1601ca..e20e984dd8c 100644 --- a/src/fsharp/FSharp.Core/seqcore.fs +++ b/src/fsharp/FSharp.Core/seqcore.fs @@ -2,6 +2,7 @@ namespace Microsoft.FSharp.Collections #nowarn "52" // The value has been copied to ensure the original is not mutated by this operation + #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this? open System open System.Diagnostics diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs index b4bd878bd1d..962c0b8a7c9 100644 --- a/src/fsharp/IlxGen.fs +++ b/src/fsharp/IlxGen.fs @@ -448,7 +448,7 @@ and GenTypeAux amap m (tyenv: TypeReprEnv) voidOK ptrsOK ty = if tps.IsEmpty then GenTypeAux amap m tyenv VoidNotOK ptrsOK tau else EraseClosures.mkILTyFuncTy g.ilxPubCloEnv - | TType_var tp -> mkILTyvarTy tyenv.[tp,m] + | TType_var (tp, _nullness) -> mkILTyvarTy tyenv.[tp,m] | TType_measure _ -> g.ilg.typ_Int32 @@ -5471,7 +5471,7 @@ and GenBindingRhs cenv cgbuf eenv sp (vspec:Val) e = (match StorageForVal vspec.Range vspec eenv with Local _ -> true | _ -> false) && (isLocalTypeFunc || (match ttype with - TType_var(typar) -> match typar.Solution with Some(TType_app(t,_,_))-> t.IsStructOrEnumTycon | _ -> false + TType_var(typar, _) -> match typar.Solution with Some(TType_app(t,_,_))-> t.IsStructOrEnumTycon | _ -> false | _ -> false)) ) -> // type lambda with erased type arguments that is stored as local variable (not method or property)- inline body diff --git a/src/fsharp/LexFilter.fs b/src/fsharp/LexFilter.fs index f8b7f951c29..eec471e541c 100755 --- a/src/fsharp/LexFilter.fs +++ b/src/fsharp/LexFilter.fs @@ -919,7 +919,9 @@ type LexFilterImpl (lightSyntaxStatus:LightSyntaxStatus, compilingFsLib, lexer, // f x>x // fx // fx + // fx | DEFAULT | COLON | COLON_GREATER | STRUCT | NULL | DELEGATE | AND | WHEN + | QMARK | HACKNULL | DOT_DOT | INFIX_AT_HAT_OP "^" | INFIX_AT_HAT_OP "^-" diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs index d327f2a62e3..d9d47fe69b2 100644 --- a/src/fsharp/NameResolution.fs +++ b/src/fsharp/NameResolution.fs @@ -1377,7 +1377,7 @@ let ItemsAreEffectivelyEqual g orig other = nm1 = nm2 && (typeEquiv g (mkTyparTy tp1) (mkTyparTy tp2) || match stripTyparEqns (mkTyparTy tp1), stripTyparEqns (mkTyparTy tp2) with - | TType_var tp1, TType_var tp2 -> + | TType_var (tp1, _), TType_var (tp2, _) -> not tp1.IsCompilerGenerated && not tp1.IsFromError && not tp2.IsCompilerGenerated && not tp2.IsFromError && tp1.Range = tp2.Range diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs index f6410d6072a..c1a7474a517 100755 --- a/src/fsharp/NicePrint.fs +++ b/src/fsharp/NicePrint.fs @@ -910,7 +910,7 @@ module private PrintTypes = match nullness.Evaluate() with | NullnessInfo.WithNull -> part2 ^^ rightL (tagText "?") | NullnessInfo.WithoutNull -> part2 - | NullnessInfo.Oblivious -> part2 ^^ wordL (tagText "obliv") + | NullnessInfo.Oblivious -> part2 ^^ wordL (tagText "%") /// Layout a type, taking precedence into account to insert brackets where needed and layoutTypeWithInfoAndPrec denv env prec ty = @@ -972,8 +972,10 @@ module private PrintTypes = bracketIfL (prec <= 4) (loop emptyL ty) // Layout a type variable . - | TType_var r -> - layoutTyparRefWithInfo denv env r + | TType_var (r, nullness) -> + let part1 = layoutTyparRefWithInfo denv env r + let part2 = layoutNullness part1 nullness + part2 | TType_measure unt -> layoutMeasure denv unt @@ -2065,7 +2067,7 @@ let minimalStringsOfTwoTypes denv t1 t2= let denv = { denv with includeStaticParametersInTypeNames=true } let makeName t = let assemblyName = PrintTypes.layoutAssemblyName denv t |> function | null | "" -> "" | name -> sprintf " (%s)" name - sprintf "%s%s" (stringOfTy denv t1) assemblyName + sprintf "%s%s" (stringOfTy denv t) assemblyName (makeName t1,makeName t2,stringOfTyparConstraints denv tpcs) diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index dc572c36f0c..635fe5d47f5 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -310,7 +310,7 @@ let rec CheckTypeDeep ((visitTy,visitTyconRefOpt,visitAppTyOpt,visitTraitSolutio // In an ideal world we would, instead, record the solutions to these constraints as "witness variables" in expressions, // rather than solely in types. match ty with - | TType_var tp when tp.Solution.IsSome -> + | TType_var (tp, _nullness) when tp.Solution.IsSome -> tp.Constraints |> List.iter (fun cx -> match cx with | TyparConstraint.MayResolveMember((TTrait(_,_,_,_,_,soln)),_) -> @@ -342,7 +342,7 @@ let rec CheckTypeDeep ((visitTy,visitTyconRefOpt,visitAppTyOpt,visitTraitSolutio | TType_ucase (_,tinst) -> CheckTypesDeep f g env tinst | TType_tuple (_,tys) -> CheckTypesDeep f g env tys | TType_fun (s,t,_nullness) -> CheckTypeDeep f g env true s; CheckTypeDeep f g env true t - | TType_var tp -> + | TType_var (tp, _nullness) -> if not tp.IsSolved then match visitTyarOpt with | None -> () diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs index 06c3bf4d064..2ccecc915d1 100644 --- a/src/fsharp/QuotationTranslator.fs +++ b/src/fsharp/QuotationTranslator.fs @@ -807,8 +807,8 @@ and ConvType cenv env m ty = | TType_fun(a,b,_nullness) -> QP.mkFunTy(ConvType cenv env m a,ConvType cenv env m b) | TType_tuple(tupInfo,l) -> ConvType cenv env m (mkCompiledTupleTy cenv.g (evalTupInfoIsStruct tupInfo) l) - | TType_var(tp) -> QP.mkVarTy(ConvTyparRef cenv env m tp) - | TType_forall(_spec,_ty) -> wfail(Error(FSComp.SR.crefNoInnerGenericsInQuotations(),m)) + | TType_var(tp, _nullness) -> QP.mkVarTy(ConvTyparRef cenv env m tp) + | TType_forall(_spec,_ty) -> wfail(Error(FSComp.SR.crefNoInnerGenericsInQuotations(),m)) | _ -> wfail(Error (FSComp.SR.crefQuotationsCantContainThisType(),m)) and ConvTypes cenv env m tys = diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index cee423c9a41..b11e3e9cd13 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -160,10 +160,35 @@ let mkTyparInst (typars: Typars) tyargs = let generalizeTypar tp = mkTyparTy tp let generalizeTypars tps = List.map generalizeTypar tps +let tryAddNullToTy (ty:TType) = + let ty = stripTyparEqns ty + match ty with + | TType_var (tp, _nullness) -> Some (TType_var (tp, KnownNull)) + | TType_app (tcr, tinst, _nullness) -> Some (TType_app (tcr, tinst, KnownNull)) + | TType_ucase _ -> None + | TType_tuple _ -> None + | TType_fun (d, r, _nullness) -> Some (TType_fun (d, r, KnownNull)) + | TType_forall _ -> None + | TType_measure _ -> None + +// TODO NULLNESS: Assess for completeness +let applyNullness nullness (ty:TType) = + match nullness with + | NullnessInfo.WithoutNull + | NullnessInfo.Oblivious -> ty + | NullnessInfo.WithNull -> + match tryAddNullToTy ty with + | None -> ty + | Some ty -> ty + let rec remapTypeAux (tyenv : Remap) (ty:TType) = let ty = stripTyparEqns ty match ty with - | TType_var tp as ty -> instTyparRef tyenv.tpinst ty tp + | TType_var (tp, nullnessInfo) as ty -> + let nullness = nullnessInfo.Evaluate() // TODO - nullness inference variables are never attached to type variables + let res = instTyparRef tyenv.tpinst ty tp + applyNullness nullness res + | TType_app (tcr, tinst, nullness) as ty -> match tyenv.tyconRefRemap.TryFind tcr with | Some tcr' -> TType_app (tcr', remapTypesAux tyenv tinst, nullness) @@ -600,12 +625,12 @@ let mkByrefTyWithInference (g:TcGlobals) ty1 ty2 = else TType_app (g.byref_tcr, [ty1], KnownNonNull) -let mkArrayTy (g:TcGlobals) rank ty m = +let mkArrayTy (g:TcGlobals) rank nullness ty m = if rank < 1 || rank > 32 then errorR(Error(FSComp.SR.tastopsMaxArrayThirtyTwo(rank), m)) - TType_app (g.il_arr_tcr_map.[3], [ty], KnownNonNull) + TType_app (g.il_arr_tcr_map.[3], [ty], nullness) else - TType_app (g.il_arr_tcr_map.[rank - 1], [ty], KnownNonNull) + TType_app (g.il_arr_tcr_map.[rank - 1], [ty], nullness) //-------------------------------------------------------------------------- // Tuple compilation (types) @@ -703,27 +728,6 @@ let reduceTyconMeasureableOrProvided (g:TcGlobals) (tycon:Tycon) tyargs = let reduceTyconRefMeasureableOrProvided (g:TcGlobals) (tcref:TyconRef) tyargs = reduceTyconMeasureableOrProvided g tcref.Deref tyargs -let tryAddNullToTy (ty:TType) = - let ty = stripTyparEqns ty - match ty with - | TType_var _ -> None - | TType_app (tcr, tinst, _nullness) -> Some (TType_app (tcr, tinst, KnownNull)) - | TType_ucase _ -> None - | TType_tuple _ -> None - | TType_fun (d, r, _nullness) -> Some (TType_fun (d, r, KnownNull)) - | TType_forall _ -> None - | TType_measure _ -> None - -// TODO NULLNESS: Assess for completeness -let applyNullness nullness (ty:TType) = - match nullness with - | NullnessInfo.WithoutNull - | NullnessInfo.Oblivious -> ty - | NullnessInfo.WithNull -> - match tryAddNullToTy ty with - | None -> ty - | Some ty -> ty - let rec stripTyEqnsA g canShortcut ty = let ty = stripTyparEqnsAux canShortcut ty match ty with @@ -802,8 +806,8 @@ let destFunTy g ty = ty |> stripTyEqns g |> (function TType_fun (tyv, tau, let destAnyTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple (tupInfo, l) -> tupInfo, l | _ -> failwith "destAnyTupleTy: not a tuple type") let destRefTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple (tupInfo, l) when not (evalTupInfoIsStruct tupInfo) -> l | _ -> failwith "destRefTupleTy: not a reference tuple type") let destStructTupleTy g ty = ty |> stripTyEqns g |> (function TType_tuple (tupInfo, l) when evalTupInfoIsStruct tupInfo -> l | _ -> failwith "destStructTupleTy: not a struct tuple type") -let destTyparTy g ty = ty |> stripTyEqns g |> (function TType_var v -> v | _ -> failwith "destTyparTy: not a typar type") -let destAnyParTy g ty = ty |> stripTyEqns g |> (function TType_var v -> v | TType_measure unt -> destUnitParMeasure g unt | _ -> failwith "destAnyParTy: not a typar or unpar type") +let destTyparTy g ty = ty |> stripTyEqns g |> (function TType_var (v, _nullness) -> v | _ -> failwith "destTyparTy: not a typar type") +let destAnyParTy g ty = ty |> stripTyEqns g |> (function TType_var (v, _nullness) -> v | TType_measure unt -> destUnitParMeasure g unt | _ -> failwith "destAnyParTy: not a typar or unpar type") let destMeasureTy g ty = ty |> stripTyEqns g |> (function TType_measure m -> m | _ -> failwith "destMeasureTy: not a unit-of-measure type") let isFunTy g ty = ty |> stripTyEqns g |> (function TType_fun _ -> true | _ -> false) let isForallTy g ty = ty |> stripTyEqns g |> (function TType_forall _ -> true | _ -> false) @@ -829,14 +833,14 @@ let isAppTy g ty = ty |> stripTyEqns g |> (function TType_app _ -> true | _ -> let tryAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> ValueSome (tcref, tinst) | _ -> ValueNone) let destAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> tcref, tinst | _ -> failwith "destAppTy") let tcrefOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tcref | _ -> failwith "tcrefOfAppTy") -let nullnessOfTy g ty = ty |> stripTyEqns g |> (function TType_app(_, _, nullness) | TType_fun (_, _, nullness) -> nullness | _ -> failwith "nullnessOfTy") +let nullnessOfTy g ty = ty |> stripTyEqns g |> (function TType_app(_, _, nullness) | TType_fun (_, _, nullness) | TType_var (_, nullness) -> nullness | _ -> KnownNonNull) let argsOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(_, tinst, _) -> tinst | _ -> []) -let tryDestTyparTy g ty = ty |> stripTyEqns g |> (function TType_var v -> ValueSome v | _ -> ValueNone) +let tryDestTyparTy g ty = ty |> stripTyEqns g |> (function TType_var (v, _nullness) -> ValueSome v | _ -> ValueNone) let tryDestFunTy g ty = ty |> stripTyEqns g |> (function TType_fun (tyv, tau, _nullness) -> ValueSome(tyv, tau) | _ -> ValueNone) let tryDestAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> ValueSome tcref | _ -> ValueNone) -let tryAnyParTy g ty = ty |> stripTyEqns g |> (function TType_var v -> ValueSome v | TType_measure unt when isUnitParMeasure g unt -> ValueSome(destUnitParMeasure g unt) | _ -> ValueNone) -let tryAnyParTyOption g ty = ty |> stripTyEqns g |> (function TType_var v -> Some v | TType_measure unt when isUnitParMeasure g unt -> Some(destUnitParMeasure g unt) | _ -> None) +let tryAnyParTy g ty = ty |> stripTyEqns g |> (function TType_var (v, _nullness) -> ValueSome v | TType_measure unt when isUnitParMeasure g unt -> ValueSome(destUnitParMeasure g unt) | _ -> ValueNone) +let tryAnyParTyOption g ty = ty |> stripTyEqns g |> (function TType_var (v, _nullness) -> Some v | TType_measure unt when isUnitParMeasure g unt -> Some(destUnitParMeasure g unt) | _ -> None) let (|AppTy|_|) g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> Some (tcref, tinst) | _ -> None) let (|RefTupleTy|_|) g ty = ty |> stripTyEqns g |> (function TType_tuple(tupInfo, tys) when not (evalTupInfoIsStruct tupInfo) -> Some tys | _ -> None) let (|FunTy|_|) g ty = ty |> stripTyEqns g |> (function TType_fun(dty, rty, _nullness) -> Some (dty, rty) | _ -> None) @@ -979,13 +983,13 @@ and typeAEquivAux erasureFlag g aenv ty1 ty2 = match ty1, ty2 with | TType_forall(tps1, rty1), TType_forall(tps2, rty2) -> typarsAEquivAux erasureFlag g aenv tps1 tps2 && typeAEquivAux erasureFlag g (aenv.BindEquivTypars tps1 tps2) rty1 rty2 - | TType_var tp1, TType_var tp2 when typarEq tp1 tp2 -> + | TType_var (tp1, _nullness1), TType_var (tp2, _nullness2) when typarEq tp1 tp2 -> // NOTE: nullness annotations are ignored for type equivalence true - | TType_var tp1, _ -> + | TType_var (tp1, _nullness1), _ -> match aenv.EquivTypars.TryFind tp1 with | Some v -> typeEquivAux erasureFlag g v ty2 | None -> false - | TType_app (tc1, b1, _nullness1) , TType_app (tc2, b2, _nullness2) -> + | TType_app (tc1, b1, _nullness1) , TType_app (tc2, b2, _nullness2) -> // NOTE: nullness annotations are ignored for type equivalence tcrefAEquiv g aenv tc1 tc2 && typesAEquivAux erasureFlag g aenv b1 b2 | TType_ucase (UCRef(tc1, n1), b1) , TType_ucase (UCRef(tc2, n2), b2) -> @@ -994,7 +998,7 @@ and typeAEquivAux erasureFlag g aenv ty1 ty2 = typesAEquivAux erasureFlag g aenv b1 b2 | TType_tuple (s1, l1), TType_tuple (s2, l2) -> structnessAEquiv s1 s2 && typesAEquivAux erasureFlag g aenv l1 l2 - | TType_fun (dtys1, rty1, _nullness1), TType_fun (dtys2, rty2, _nullness2) -> + | TType_fun (dtys1, rty1, _nullness1), TType_fun (dtys2, rty2, _nullness2) -> // NOTE: nullness annotations are ignored for type equivalence typeAEquivAux erasureFlag g aenv dtys1 dtys2 && typeAEquivAux erasureFlag g aenv rty1 rty2 | TType_measure m1, TType_measure m2 -> match erasureFlag with @@ -1046,8 +1050,10 @@ let rec getErasedTypes g ty = match ty with | TType_forall(_, rty) -> getErasedTypes g rty - | TType_var tp -> - if tp.IsErased then [ty] else [] + | TType_var (tp, nullness) -> + match nullness.Evaluate() with + | NullnessInfo.WithNull -> [ty] // with-null annotations can't be tested at runtime (TODO: for value types Nullable<_> they can be) + | _ -> if tp.IsErased then [ty] else [] | TType_app (_, b, nullness) -> match nullness.Evaluate() with | NullnessInfo.WithNull -> [ty] @@ -2088,7 +2094,7 @@ and accFreeInType opts ty acc = | TType_fun (d, r, _nullness) -> // note, nullness variables are _not_ part of the type system proper accFreeInType opts d (accFreeInType opts r acc) - | TType_var r -> accFreeTyparRef opts r acc + | TType_var (r, _nullness) -> accFreeTyparRef opts r acc | TType_forall (tps, r) -> unionFreeTyvars (boundTypars opts tps (freeInType opts r)) acc | TType_measure unt -> accFreeInMeasure opts unt acc @@ -2175,7 +2181,7 @@ and accFreeInTypeLeftToRight g cxFlag thruFlag acc ty = | TType_app (_, tinst, _nullness) -> accFreeInTypesLeftToRight g cxFlag thruFlag acc tinst | TType_ucase (_, tinst) -> accFreeInTypesLeftToRight g cxFlag thruFlag acc tinst | TType_fun (d, r, _nullness) -> accFreeInTypeLeftToRight g cxFlag thruFlag (accFreeInTypeLeftToRight g cxFlag thruFlag acc d ) r - | TType_var r -> accFreeTyparRefLeftToRight g cxFlag thruFlag acc r + | TType_var (r, _nullness) -> accFreeTyparRefLeftToRight g cxFlag thruFlag acc r | TType_forall (tps, r) -> unionFreeTyparsLeftToRight (boundTyparsLeftToRight g cxFlag thruFlag tps (accFreeInTypeLeftToRight g cxFlag thruFlag emptyFreeTyparsLeftToRight r)) acc | TType_measure unt -> List.foldBack (fun (tp, _) acc -> accFreeTyparRefLeftToRight g cxFlag thruFlag acc tp) (ListMeasureVarOccsWithNonZeroExponents unt) acc @@ -2574,7 +2580,7 @@ module SimplifyTypes = let accTyparCounts z ty = // Walk type to determine typars and their counts (for pprinting decisions) - foldTypeButNotConstraints (fun z ty -> match ty with | TType_var tp when tp.Rigidity = TyparRigidity.Rigid -> incM tp z | _ -> z) z ty + foldTypeButNotConstraints (fun z ty -> match ty with | TType_var (tp, _nullness) when tp.Rigidity = TyparRigidity.Rigid -> incM tp z | _ -> z) z ty let emptyTyparCounts = Zmap.empty typarOrder @@ -3236,24 +3242,34 @@ module DebugPrint = begin else tupleL tinstL ^^ tcL + and auxAddNullness coreL (nullness: Nullness) = + match nullness.Evaluate() with + | NullnessInfo.WithNull -> coreL ^^ wordL (tagText "?") + | NullnessInfo.WithoutNull -> coreL + | NullnessInfo.Oblivious -> coreL ^^ wordL (tagText "%") + and auxTypeWrapL env isAtomic ty = let wrap x = bracketIfL isAtomic x in // wrap iff require atomic expr match stripTyparEqns ty with | TType_forall (typars, rty) -> (leftL (tagText "!") ^^ layoutTyparDecls typars --- auxTypeL env rty) |> wrap - | TType_ucase (UCRef(tcref, _), tinst) - | TType_app (tcref, tinst, _) -> + | TType_ucase (UCRef(tcref, _), tinst) -> let prefix = tcref.IsPrefixDisplay let tcL = layoutTyconRef tcref auxTyparsL env tcL prefix tinst - | TType_tuple (_tupInfo, tys) -> sepListL (wordL (tagText "*")) (List.map (auxTypeAtomL env) tys) |> wrap + | TType_app (tcref, tinst, nullness) -> + let prefix = tcref.IsPrefixDisplay + let tcL = layoutTyconRef tcref + let coreL = auxTyparsL env tcL prefix tinst + auxAddNullness coreL nullness + | TType_tuple (_tupInfo, tys) -> + sepListL (wordL (tagText "*")) (List.map (auxTypeAtomL env) tys) |> wrap | TType_fun (f, x, nullness) -> - let core = ((auxTypeAtomL env f ^^ wordL (tagText "->")) --- auxTypeL env x) |> wrap - match nullness.Evaluate() with - | NullnessInfo.WithNull -> core ^^ wordL (tagText "| null") - | NullnessInfo.WithoutNull -> core - | NullnessInfo.Oblivious -> core ^^ wordL (tagText "| lol") - | TType_var typar -> auxTyparWrapL env isAtomic typar + let coreL = ((auxTypeAtomL env f ^^ wordL (tagText "->")) --- auxTypeL env x) |> wrap + auxAddNullness coreL nullness + | TType_var (typar, nullness) -> + let coreL = auxTyparWrapL env isAtomic typar + auxAddNullness coreL nullness | TType_measure unt -> #if DEBUG leftL (tagText "{") ^^ @@ -7382,7 +7398,7 @@ let rec typeEnc g (gtpsType, gtpsMethod) ty = sprintf "System.Tuple%s"(tyargsEnc g (gtpsType, gtpsMethod) tys) | TType_fun (f, x, _nullness) -> "Microsoft.FSharp.Core.FSharpFunc" + tyargsEnc g (gtpsType, gtpsMethod) [f;x] - | TType_var typar -> + | TType_var (typar, _nullness) -> typarEnc g (gtpsType, gtpsMethod) typar | TType_measure _ -> "?" diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index 8bc7e9e8678..64987f62710 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -1083,7 +1083,7 @@ val isArray1DTy : TcGlobals -> TType -> bool val destArrayTy : TcGlobals -> TType -> TType val destListTy : TcGlobals -> TType -> TType -val mkArrayTy : TcGlobals -> int -> TType -> range -> TType +val mkArrayTy : TcGlobals -> int -> Nullness -> TType -> range -> TType val isArrayTyconRef : TcGlobals -> TyconRef -> bool val rankOfArrayTyconRef : TcGlobals -> TyconRef -> int diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index 6429f638462..dafa6249ef1 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -689,7 +689,7 @@ let p_nleref x st = p_int (encode_nleref st.occus st.ostrings st.onlerefs st.osc // Simple types are types like "int", represented as TType(Ref_nonlocal(...,"int"),[]). // A huge number of these occur in pickled F# data, so make them unique. -let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], ObliviousToNull) +let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], ObliviousToNull) // TODO should simpletyps hold obvlious or non-null etc.? let lookup_simpletyp st simpleTyTab x = lookup_uniq st simpleTyTab x let u_encoded_simpletyp st = u_int st let u_simpletyp st = lookup_uniq st st.isimpletys (u_int st) @@ -698,7 +698,7 @@ let p_encoded_simpletyp x st = p_int x st let p_simpletyp x st = p_int (encode_simpletyp st.occus st.ostrings st.onlerefs st.osimpletys st.oscope x) st type sizes = int * int * int -let pickleObjWithDanglingCcus inMem file g scope p x = +let pickleObjWithDanglingCcus inMem file (g: TcGlobals) scope p x = let ccuNameTab,(sizes: sizes),stringTab,pubpathTab,nlerefTab,simpleTyTab,phase1bytes = let st1 = { os = ByteBuffer.Create 100000 @@ -713,7 +713,7 @@ let pickleObjWithDanglingCcus inMem file g scope p x = osimpletys=Table<_>.Create "osimpletys" oglobals=g ofile=file - oInMem=inMem } + oInMem=inMem } p x st1 let sizes = st1.otycons.Size, @@ -1571,22 +1571,78 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> p_byte 8 st; p_tys l st else p_byte 0 st; p_tys l st - // TODO - nullness - | TType_app(ERefNonLocal nleref,[], _nullness) -> p_byte 1 st; p_simpletyp nleref st - | TType_app (tc,tinst, _nullness) -> p_byte 2 st; p_tup2 (p_tcref "typ") p_tys (tc,tinst) st - | TType_fun (d,r,_nullness) -> - p_byte 3 st - // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value - p_ty2 isStructThisArgPos d st - p_ty r st - | TType_var r -> p_byte 4 st; p_tpref r st - | TType_forall (tps,r) -> + + | TType_app(ERefNonLocal nleref,[], nullness) -> + if st.oglobals.langFeatureNullness() then + match nullness.Evaluate() with + | NullnessInfo.WithNull -> + p_byte 9 st; p_simpletyp nleref st // TODO: compatible emitting nullness in F# metadata + | NullnessInfo.WithoutNull -> + p_byte 10 st; p_simpletyp nleref st // TODO: compatible emitting nullness in F# metadata + | NullnessInfo.Oblivious -> + p_byte 11 st; p_simpletyp nleref st + else + p_byte 1 st; p_simpletyp nleref st + + | TType_app (tc,tinst, nullness) -> + if st.oglobals.langFeatureNullness() then + match nullness.Evaluate() with + | NullnessInfo.WithNull -> + p_byte 12 st; p_tcref "typ" tc st; p_tys tinst st // TODO: compatible emitting nullness in F# metadata + | NullnessInfo.WithoutNull -> + p_byte 13 st; p_tcref "typ" tc st; p_tys tinst st // TODO: compatible emitting nullness in F# metadata + | NullnessInfo.Oblivious -> + p_byte 14 st; p_tcref "typ" tc st; p_tys tinst st + else + p_byte 2 st; p_tcref "typ" tc st; p_tys tinst st + + | TType_fun (d,r,nullness) -> // TODO: not emitting nullness in F# metadata + if st.oglobals.langFeatureNullness() then + match nullness.Evaluate() with + | NullnessInfo.WithNull -> + p_byte 15 st + p_ty2 isStructThisArgPos d st + p_ty r st + | NullnessInfo.WithoutNull -> + p_byte 16 st + p_ty2 isStructThisArgPos d st + p_ty r st + | NullnessInfo.Oblivious -> + p_byte 17 st + // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value + p_ty2 isStructThisArgPos d st + p_ty r st + else + p_byte 3 st + // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value + p_ty2 isStructThisArgPos d st + p_ty r st + + | TType_var (r, nullness) -> + if st.oglobals.langFeatureNullness() then + match nullness.Evaluate() with + | NullnessInfo.WithNull -> + p_byte 18 st + p_tpref r st + | NullnessInfo.WithoutNull -> + p_byte 19 st + p_tpref r st + | NullnessInfo.Oblivious -> + p_byte 20 st + p_tpref r st + else + p_byte 4 st + p_tpref r st + + | TType_forall (tps,r) -> p_byte 5 st p_tyar_specs tps st // Note, the "this" argument may be found in the body of a generic forall type, so propagate the isStructThisArgPos value p_ty2 isStructThisArgPos r st - | TType_measure unt -> p_byte 6 st; p_measure_expr unt st - | TType_ucase (uc,tinst) -> p_byte 7 st; p_tup2 p_ucref p_tys (uc,tinst) st) + + | TType_measure unt -> p_byte 6 st; p_measure_expr unt st + + | TType_ucase (uc,tinst) -> p_byte 7 st; p_tup2 p_ucref p_tys (uc,tinst) st) let _ = fill_u_ty (fun st -> let tag = u_byte st @@ -1600,6 +1656,57 @@ let _ = fill_u_ty (fun st -> | 6 -> let unt = u_measure_expr st in TType_measure unt | 7 -> let uc = u_ucref st in let tinst = u_tys st in TType_ucase (uc,tinst) | 8 -> let l = u_tys st in TType_tuple (tupInfoStruct, l) + | 9 -> + let sty = u_simpletyp st + match sty with + | TType_app(_tcref, [], Nullness.Known NullnessInfo.WithNull) -> sty // keep the unique + | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownNull) + | _ -> ufailwith st "u_ty - 9" + | 10 -> + let sty = u_simpletyp st + match sty with + | TType_app(_tcref, [], Nullness.Known NullnessInfo.WithoutNull) -> sty // keep the unique + | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownNonNull) + | _ -> ufailwith st "u_ty - 9" + | 11 -> + let sty = u_simpletyp st + match sty with + | TType_app(_tcref, [], Nullness.Known NullnessInfo.Oblivious) -> sty // keep the unique + | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], ObliviousToNull) + | _ -> ufailwith st "u_ty - 9" + | 12 -> + let tc = u_tcref st + let tinst = u_tys st + TType_app (tc, tinst, KnownNull) + | 13 -> + let tc = u_tcref st + let tinst = u_tys st + TType_app (tc, tinst, KnownNonNull) + | 14 -> + let tc = u_tcref st + let tinst = u_tys st + TType_app (tc, tinst, ObliviousToNull) + | 15 -> + let d = u_ty st + let r = u_ty st + TType_fun (d,r, KnownNull) + | 16 -> + let d = u_ty st + let r = u_ty st + TType_fun (d,r, KnownNonNull) + | 17 -> + let d = u_ty st + let r = u_ty st + TType_fun (d,r, ObliviousToNull) + | 18 -> + let r = u_tpref st + TType_var (r, KnownNull) + | 19 -> + let r = u_tpref st + r.AsType + | 20 -> + let r = u_tpref st + TType_var (r, ObliviousToNull) | _ -> ufailwith st "u_ty") diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 8d367faa2d7..4d75db00d9e 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -176,7 +176,7 @@ let tname_IAsyncResult = "System.IAsyncResult" //------------------------------------------------------------------------- type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, directoryToResolveRelativePaths, - mlCompatibility: bool, isInteractive:bool, assumeNullOnImport: bool, + mlCompatibility: bool, isInteractive:bool, assumeNullOnImport: bool, checkNullness: bool, langVersion: double, // The helper to find system types amongst referenced DLLs tryFindSysTypeCcu, emitDebugInfoInQuotations: bool, noDebugData: bool) = @@ -897,6 +897,9 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d // A table of all intrinsics that the compiler cares about member __.knownIntrinsics = v_knownIntrinsics member __.assumeNullOnImport = assumeNullOnImport + member __.checkNullness = checkNullness + member __.langFeatureNullness() = langVersion >= 5.0 + member __.langVersion = langVersion // A table of known modules in FSharp.Core. Not all modules are necessarily listed, but the more we list the // better the job we do of mapping from provided expressions back to FSharp.Core F# functions and values. member __.knownFSharpCoreModules = v_knownFSharpCoreModules diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index e9cee506d34..34fa8341aeb 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -4606,7 +4606,7 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped | SynType.Array (n, elemTy, m) -> let elemTy, tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv elemTy - mkArrayTy cenv.g n elemTy m, tpenv + mkArrayTy cenv.g n KnownNonNull elemTy m, tpenv | SynType.Var (tp, _) -> let tp', tpenv = TcTyparOrMeasurePar optKind cenv env newOk tpenv tp @@ -4650,17 +4650,21 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped | SynType.WithNull(innerTy, m) -> let innerTyC, tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv innerTy - if TypeNullNever cenv.g innerTyC then - let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC - errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString, tyString), m)) - match tryAddNullToTy innerTyC with - | None -> - let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC - errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString, tyString), m)) + if cenv.g.langFeatureNullness() then + if TypeNullNever cenv.g innerTyC then + let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC + errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString), m)) + match tryAddNullToTy innerTyC with + | None -> + let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC + errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString), m)) + innerTyC, tpenv + | Some innerTyCWithNull -> + AddCxTypeMustSupportNull env.DisplayEnv cenv.css m NoTrace innerTyCWithNull + innerTyCWithNull, tpenv + else + warning(Error(FSComp.SR.tcNullnessCheckingNotEnabled(), m)) innerTyC, tpenv - | Some innerTyNull -> - AddCxTypeMustSupportNull env.DisplayEnv cenv.css m NoTrace innerTyNull - innerTyNull, tpenv | SynType.MeasurePower(ty, exponent, m) -> match optKind with diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs index 96de23749d4..62988451ba4 100644 --- a/src/fsharp/import.fs +++ b/src/fsharp/import.fs @@ -161,12 +161,13 @@ let rec ImportILType (env:ImportMap) m tinst ty = | ILType.Array(bounds,ty) -> let n = bounds.Rank let elementType = ImportILType env m tinst ty - mkArrayTy env.g n elementType m + let nullness = if env.g.langFeatureNullness() && env.g.assumeNullOnImport then KnownNull else ObliviousToNull + mkArrayTy env.g n nullness elementType m | ILType.Boxed tspec | ILType.Value tspec -> let tcref = ImportILTypeRef env m tspec.TypeRef let inst = tspec.GenericArgs |> List.map (ImportILType env m tinst) - let nullness = if env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownNull else ObliviousToNull + let nullness = if env.g.langFeatureNullness() && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownNull else ObliviousToNull ImportTyconRefApp env tcref inst nullness | ILType.Modified(_,tref,ILType.Byref ty) when tref.Name = "System.Runtime.InteropServices.InAttribute" -> mkInByrefTy env.g (ImportILType env m tinst ty) @@ -257,7 +258,8 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: let g = env.g if st.PUntaint((fun st -> st.IsArray),m) then let elemTy = (ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()),m))) - mkArrayTy g (st.PUntaint((fun st -> st.GetArrayRank()),m)) elemTy m + let nullness = if env.g.langFeatureNullness() && env.g.assumeNullOnImport then KnownNull else ObliviousToNull + mkArrayTy g (st.PUntaint((fun st -> st.GetArrayRank()),m)) nullness elemTy m elif st.PUntaint((fun st -> st.IsByRef),m) then let elemTy = (ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()),m))) mkByrefTy g elemTy @@ -314,7 +316,7 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: else genericArg) - let nullness = if env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownNull else ObliviousToNull + let nullness = if env.g.langFeatureNullness() && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownNull else ObliviousToNull ImportTyconRefApp env tcref genericArgs nullness diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy index f72b2926cb2..8b628abdc7f 100644 --- a/src/fsharp/pars.fsy +++ b/src/fsharp/pars.fsy @@ -4378,9 +4378,10 @@ appType: | appType QMARK { SynType.WithNull($1,lhs parseState) } - | appType OR NULL +/* +| appType OR NULL { SynType.WithNull($1,lhs parseState) } - +*/ | appType arrayTypeSuffix { SynType.Array($2,$1,lhs parseState) } diff --git a/src/fsharp/symbols/Symbols.fs b/src/fsharp/symbols/Symbols.fs index a619e460c02..859767f9c35 100644 --- a/src/fsharp/symbols/Symbols.fs +++ b/src/fsharp/symbols/Symbols.fs @@ -2032,6 +2032,7 @@ and FSharpType(cenv, ty:TType) = member __.HasNullAnnotation = protect <| fun () -> match stripTyparEqns ty with + | TType_var (_, nullness) | TType_app (_, _, nullness) | TType_fun(_, _, nullness) -> match nullness.Evaluate() with NullnessInfo.WithNull -> true | _ -> false | TType_tuple (_, _) -> false @@ -2089,7 +2090,8 @@ and FSharpType(cenv, ty:TType) = member __.GenericParameter = protect <| fun () -> match stripTyparEqns ty with - | TType_var tp + | TType_var (tp, _nullness) -> + FSharpGenericParameter (cenv, tp) | TType_measure (Measure.Var tp) -> FSharpGenericParameter (cenv, tp) | _ -> invalidOp "not a generic parameter type" @@ -2127,7 +2129,7 @@ and FSharpType(cenv, ty:TType) = let ty = stripTyEqnsWrtErasure EraseNone cenv.g ty match ty with | TType_forall _ -> 10000 - | TType_var tp -> 10100 + int32 tp.Stamp + | TType_var (tp, _nullness) -> 10100 + int32 tp.Stamp | TType_app (tc1, b1, _) -> 10200 + int32 tc1.Stamp + List.sumBy hashType b1 | TType_ucase _ -> 10300 // shouldn't occur in symbols | TType_tuple (_, l1) -> 10400 + List.sumBy hashType l1 diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 18b43dd768f..fd5dca9b93a 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -2258,7 +2258,7 @@ and let ty = x.typar_astype match box ty with | null -> - let ty2 = TType_var x + let ty2 = TType_var (x, Nullness.Known NullnessInfo.WithoutNull) // TODO pass in a nullness thing here? x.typar_astype <- ty2 ty2 | _ -> ty @@ -3906,7 +3906,7 @@ and Nullness = | Known info -> info | Variable v -> v.Evaluate() - override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.Oblivious -> " lol" + override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.Oblivious -> "%" and NullnessVar = { mutable solution: Nullness option } @@ -3973,7 +3973,7 @@ and | TType_ucase of UnionCaseRef * TypeInst /// Indicates the type is a variable type, whether declared, generalized or an inference type parameter - | TType_var of Typar + | TType_var of Typar * Nullness /// Indicates the type is a unit-of-measure expression being used as an argument to a type or member | TType_measure of Measure @@ -3985,10 +3985,10 @@ and match x with | TType_forall (_tps, ty) -> ty.GetAssemblyName() | TType_app (tcref, _tinst, _) -> tcref.CompilationPath.ILScopeRef.QualifiedName - | TType_tuple (_tupInfo, _tinst) -> "" + | TType_tuple _ -> "" | TType_fun _ -> "" | TType_measure _ms -> "" - | TType_var tp -> tp.Solution |> function Some sln -> sln.GetAssemblyName() | None -> "" + | TType_var (tp, _nullness) -> tp.Solution |> function Some sln -> sln.GetAssemblyName() | None -> "" | TType_ucase (_uc,_tinst) -> let (TILObjectReprData(scope,_nesting,_definition)) = _uc.Tycon.ILTyconInfo scope.QualifiedName @@ -4007,7 +4007,7 @@ and + String.concat "," (List.map string tinst) + ")" | TType_fun (d,r,nullness) -> "(" + string d + " -> " + string r + ")" + nullness.ToString() | TType_ucase (uc,tinst) -> "ucase " + uc.CaseName + (match tinst with [] -> "" | tys -> "<" + String.concat "," (List.map string tys) + ">") - | TType_var tp -> + | TType_var (tp, _nullness) -> match tp.Solution with | None -> tp.DisplayName | Some _ -> tp.DisplayName + " (solved)" @@ -5330,7 +5330,7 @@ let rec stripUnitEqnsAux canShortcut unt = let rec stripTyparEqnsAux canShortcut ty = match ty with - | TType_var r -> + | TType_var (r, _nullness) -> match r.Solution with | Some soln -> if canShortcut then @@ -5339,7 +5339,7 @@ let rec stripTyparEqnsAux canShortcut ty = // This is only because IterType likes to walk _all_ the constraints _everywhere_ in a type, including // those attached to _solved_ type variables. In an ideal world this would never be needed - see the notes // on IterType. - | TType_var r2 when r2.Constraints.IsEmpty -> + | TType_var (r2, _) when r2.Constraints.IsEmpty -> match r2.Solution with | None -> () | Some _ as soln2 -> diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index ba18cb1447f..7bc5daa817e 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index fe13cbcf756..413bebec877 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.en.xlf b/src/fsharp/xlf/FSComp.txt.en.xlf index 70d58e0b3e4..aa330d47d51 100644 --- a/src/fsharp/xlf/FSComp.txt.en.xlf +++ b/src/fsharp/xlf/FSComp.txt.en.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index b43e4500937..709b09e6e79 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index 0390ea98f16..b3bf07200e2 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 5f3b18a56d6..4022aefa888 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index 202068aafb5..f71b7eae4ca 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index dbc18fa92c7..a262935fa82 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index d5f79ea3d1f..5ebf1bb6ee3 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 00b3cc60f10..6c9d46daefb 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index 3b8cc784699..d3a062b568a 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index c397103417e..526c87bd429 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index 2cc1078cd28..ce1cc77b9b7 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index 41ac5e7b2eb..05827121697 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -7068,8 +7068,8 @@ - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> - The type '{0}' never has 'null' as a value. To specify a nullable value type use Nullable<{1}> + The type '{0}' does not support a nullness qualitification. + The type '{0}' does not support a nullness qualitification. @@ -7087,6 +7087,21 @@ The constructor does not have a field named '{0}'. + + Enable nullness declarations and checks + Enable nullness declarations and checks + + + + The /checknulls language feature is not enabled + The /checknulls language feature is not enabled + + + + Specify the language version + Specify the language version + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.cs.xlf b/src/fsharp/xlf/FSStrings.cs.xlf index 85df6314254..ec3cdbeb1e9 100644 --- a/src/fsharp/xlf/FSStrings.cs.xlf +++ b/src/fsharp/xlf/FSStrings.cs.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.de.xlf b/src/fsharp/xlf/FSStrings.de.xlf index 535775c20c9..617c2217ced 100644 --- a/src/fsharp/xlf/FSStrings.de.xlf +++ b/src/fsharp/xlf/FSStrings.de.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.en.xlf b/src/fsharp/xlf/FSStrings.en.xlf index 5bb4d7cc941..8b1cd327214 100644 --- a/src/fsharp/xlf/FSStrings.en.xlf +++ b/src/fsharp/xlf/FSStrings.en.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.es.xlf b/src/fsharp/xlf/FSStrings.es.xlf index 48b340161fb..8bd360c324b 100644 --- a/src/fsharp/xlf/FSStrings.es.xlf +++ b/src/fsharp/xlf/FSStrings.es.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.fr.xlf b/src/fsharp/xlf/FSStrings.fr.xlf index 7ff2af814e3..79db1b5097c 100644 --- a/src/fsharp/xlf/FSStrings.fr.xlf +++ b/src/fsharp/xlf/FSStrings.fr.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.it.xlf b/src/fsharp/xlf/FSStrings.it.xlf index 722116dd3e7..0c72898fe77 100644 --- a/src/fsharp/xlf/FSStrings.it.xlf +++ b/src/fsharp/xlf/FSStrings.it.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ja.xlf b/src/fsharp/xlf/FSStrings.ja.xlf index d52573c01fa..00b557e3ee9 100644 --- a/src/fsharp/xlf/FSStrings.ja.xlf +++ b/src/fsharp/xlf/FSStrings.ja.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ko.xlf b/src/fsharp/xlf/FSStrings.ko.xlf index f807a267341..6786ae0cad6 100644 --- a/src/fsharp/xlf/FSStrings.ko.xlf +++ b/src/fsharp/xlf/FSStrings.ko.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.pl.xlf b/src/fsharp/xlf/FSStrings.pl.xlf index b113738d3c6..0a47fba5e08 100644 --- a/src/fsharp/xlf/FSStrings.pl.xlf +++ b/src/fsharp/xlf/FSStrings.pl.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.pt-BR.xlf b/src/fsharp/xlf/FSStrings.pt-BR.xlf index c2bd4489806..c59e5c7cec7 100644 --- a/src/fsharp/xlf/FSStrings.pt-BR.xlf +++ b/src/fsharp/xlf/FSStrings.pt-BR.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ru.xlf b/src/fsharp/xlf/FSStrings.ru.xlf index 216dd7ff060..2128ca740be 100644 --- a/src/fsharp/xlf/FSStrings.ru.xlf +++ b/src/fsharp/xlf/FSStrings.ru.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.tr.xlf b/src/fsharp/xlf/FSStrings.tr.xlf index 9f455ddbcb1..6f653757b69 100644 --- a/src/fsharp/xlf/FSStrings.tr.xlf +++ b/src/fsharp/xlf/FSStrings.tr.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.zh-Hans.xlf b/src/fsharp/xlf/FSStrings.zh-Hans.xlf index 81b4477e1c6..e9b6edd772f 100644 --- a/src/fsharp/xlf/FSStrings.zh-Hans.xlf +++ b/src/fsharp/xlf/FSStrings.zh-Hans.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.zh-Hant.xlf b/src/fsharp/xlf/FSStrings.zh-Hant.xlf index af7b3962fb1..c67de7a197d 100644 --- a/src/fsharp/xlf/FSStrings.zh-Hant.xlf +++ b/src/fsharp/xlf/FSStrings.zh-Hant.xlf @@ -1618,8 +1618,8 @@ - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. - Nullness warning: The types '{0}' and '{1}' do not have compatible nullability. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have compatible nullability '{2}' and '{3}'. @@ -1627,6 +1627,11 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + \ No newline at end of file diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl index 13b4b256425..2a833479ba4 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl @@ -75,6 +75,7 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. --nowarn: Disable specific warning messages --warnon: Enable specific warnings that may be off by default +--checknulls[+|-] Enable nullness declarations and checks --consolecolors[+|-] Output warning and error messages in color diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl index 04316704114..6acee0f652b 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl @@ -33,6 +33,7 @@ Usage: fsharpi [script.fsx []] --nowarn: Disable specific warning messages --warnon: Enable specific warnings that may be off by default +--checknulls[+|-] Enable nullness declarations and checks --consolecolors[+|-] Output warning and error messages in color diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl index aa99117d3b8..9ba2c8a22ce 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl @@ -33,6 +33,7 @@ Usage: fsi.exe [script.fsx []] --nowarn: Disable specific warning messages --warnon: Enable specific warnings that may be off by default +--checknulls[+|-] Enable nullness declarations and checks --consolecolors[+|-] Output warning and error messages in color diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl index 4164bf41696..2cf72f6212e 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl @@ -35,6 +35,7 @@ Usage: fsi.exe [script.fsx []] --nowarn: Disable specific warning messages --warnon: Enable specific warnings that may be off by default +--checknulls[+|-] Enable nullness declarations and checks --consolecolors[+|-] Output warning and error messages in color From dc8a8922ff0b97b7f36bfbe80e2fa5bcfd5ea64f Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 1 Nov 2018 00:42:56 +0000 Subject: [PATCH 009/137] more on nullness variable inference --- src/fsharp/ConstraintSolver.fs | 58 ++++++++++++++++++---------------- src/fsharp/NameResolution.fs | 2 +- src/fsharp/TastPickle.fs | 4 +-- src/fsharp/TcGlobals.fs | 2 -- src/fsharp/TypeChecker.fs | 2 +- src/fsharp/tast.fs | 51 ++++++++++++++++-------------- 6 files changed, 62 insertions(+), 57 deletions(-) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 5dc7bee00a9..b7dfdee1ebc 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -76,7 +76,11 @@ let NewInferenceMeasurePar () = NewCompGenTypar (TyparKind.Measure, TyparRigidit let NewErrorTypar () = NewCompGenTypar (TyparKind.Type, TyparRigidity.Flexible, NoStaticReq, TyparDynamicReq.No, true) let NewErrorMeasureVar () = NewCompGenTypar (TyparKind.Measure, TyparRigidity.Flexible, NoStaticReq, TyparDynamicReq.No, true) -let NewInferenceType () = mkTyparTy (NewTypar (TyparKind.Type, TyparRigidity.Flexible, Typar(compgenId, NoStaticReq, true), false, TyparDynamicReq.No, [], false, false)) +let NewInferenceType () = + let tp = NewTypar (TyparKind.Type, TyparRigidity.Flexible, Typar(compgenId, NoStaticReq, true), false, TyparDynamicReq.No, [], false, false) + let nullness = NewNullnessVar() + TType_var (tp, nullness) + let NewErrorType () = mkTyparTy (NewErrorTypar ()) let NewErrorMeasure () = Measure.Var (NewErrorMeasureVar ()) @@ -784,18 +788,16 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 match nullness1, nullness2 with | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> CompleteD - | Nullness.Variable nv1, _ -> - if nv1.IsSolved then - SolveNullnessEquiv csenv m2 trace ty1 ty2 nv1.Solution nullness2 - else - trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) - CompleteD + | Nullness.Variable nv1, _ when nv1.IsSolved -> + SolveNullnessEquiv csenv m2 trace ty1 ty2 nv1.Solution nullness2 + | _, Nullness.Variable nv2 when nv2.IsSolved -> + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nv2.Solution + | Nullness.Variable nv1, _ -> + trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) + CompleteD | _, Nullness.Variable nv2 -> - if nv2.IsSolved then - SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nv2.Solution - else - trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) - CompleteD + trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) + CompleteD | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with | NullnessInfo.Oblivious, _ -> CompleteD @@ -812,18 +814,16 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona match nullness1, nullness2 with | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> CompleteD + | Nullness.Variable nv1, _ when nv1.IsSolved -> + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nv1.Solution nullness2 + | _, Nullness.Variable nv2 when nv2.IsSolved -> + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nv2.Solution | Nullness.Variable nv1, _ -> - if nv1.IsSolved then - SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nv1.Solution nullness2 - else - trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) - CompleteD + trace.Exec (fun () -> nv1.Set nullness2) (fun () -> nv1.Unset()) + CompleteD | _, Nullness.Variable nv2 -> - if nv2.IsSolved then - SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nv2.Solution - else - trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) - CompleteD + trace.Exec (fun () -> nv2.Set nullness1) (fun () -> nv2.Unset()) + CompleteD | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with | NullnessInfo.Oblivious, _ -> CompleteD @@ -870,11 +870,11 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 ) - | TType_var (r, nullness1), _ when (r.Rigidity <> TyparRigidity.Rigid) -> + | TType_var (tp1, nullness1), _ when (tp1.Rigidity <> TyparRigidity.Rigid) -> SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 ++ (fun () -> SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 (nullnessOfTy g sty2) ) - | _, TType_var (r, nullness2) when (r.Rigidity <> TyparRigidity.Rigid) && not csenv.MatchingOnly -> + | _, TType_var (tp2, nullness2) when (tp2.Rigidity <> TyparRigidity.Rigid) && not csenv.MatchingOnly -> SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> SolveNullnessEquiv csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullness2 ) @@ -1807,10 +1807,12 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio let m = csenv.m let denv = csenv.DisplayEnv match nullness with - | Nullness.Variable nv1 when not nv1.IsSolved -> - trace.Exec (fun () -> nv1.Set KnownNull) (fun () -> nv1.Unset()) - CompleteD - | Nullness.Variable nv -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nv.Solution + | Nullness.Variable nv -> + if nv.IsSolved then + SolveNullnessSupportsNull csenv ndeep m2 trace ty nv.Solution + else + trace.Exec (fun () -> printfn "NV %d --> KnownNull" (nv.GetHashCode()); nv.Set KnownNull) (fun () -> nv.Unset()) + CompleteD | Nullness.Known n1 -> match n1 with | NullnessInfo.Oblivious -> CompleteD diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs index d9d47fe69b2..beadf2fd582 100644 --- a/src/fsharp/NameResolution.fs +++ b/src/fsharp/NameResolution.fs @@ -4099,7 +4099,7 @@ and ResolvePartialLongIdentToClassOrRecdFieldsImpl (ncenv: NameResolver) (nenv: nenv.eFieldLabels |> Seq.collect (fun (KeyValue(_, v)) -> v) |> Seq.map (fun fref -> - let typeInsts = fref.TyconRef.TyparsNoRange |> List.map (fun tyar -> tyar.AsType) + let typeInsts = fref.TyconRef.TyparsNoRange |> List.map mkTyparTy Item.RecdField(RecdFieldInfo(typeInsts, fref))) |> List.ofSeq diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index dafa6249ef1..226717fabff 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -1651,7 +1651,7 @@ let _ = fill_u_ty (fun st -> | 1 -> u_simpletyp st | 2 -> let tc = u_tcref st in let tinst = u_tys st in TType_app (tc, tinst, ObliviousToNull) | 3 -> let d = u_ty st in let r = u_ty st in TType_fun (d,r, ObliviousToNull) - | 4 -> let r = u_tpref st in r.AsType + | 4 -> let r = u_tpref st in r.AsType ObliviousToNull | 5 -> let tps = u_tyar_specs st in let r = u_ty st in TType_forall (tps,r) | 6 -> let unt = u_measure_expr st in TType_measure unt | 7 -> let uc = u_ucref st in let tinst = u_tys st in TType_ucase (uc,tinst) @@ -1703,7 +1703,7 @@ let _ = fill_u_ty (fun st -> TType_var (r, KnownNull) | 19 -> let r = u_tpref st - r.AsType + TType_var (r, KnownNonNull) | 20 -> let r = u_tpref st TType_var (r, ObliviousToNull) diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 4d75db00d9e..9cf523be5bd 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -342,8 +342,6 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let v_system_Reflection_MethodInfo_ty = mkSysNonGenericTy ["System";"Reflection"] "MethodInfo" let v_nullable_tcr = findSysTyconRef sys "Nullable`1" - let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) - (* local helpers to build value infos *) let mkNullableTy ty = TType_app(v_nullable_tcr, [ty], KnownNonNull) let mkByrefTy ty = TType_app(v_byref_tcr, [ty], KnownNonNull) diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index 34fa8341aeb..a6af31c7ea7 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -4631,7 +4631,7 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped let tp = TcAnonTypeOrMeasure (Some TyparKind.Type) cenv TyparRigidity.WarnIfNotRigid TyparDynamicReq.Yes newOk m let ty', tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv ty AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css m NoTrace ty' (mkTyparTy tp) - tp.AsType, tpenv + tp.AsType AssumeNonNull, tpenv | SynType.StaticConstant (c, m) -> match c, optKind with diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index fd5dca9b93a..1b5cc9f95bb 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -2254,14 +2254,18 @@ and | None -> () /// Links a previously unlinked type variable to the given data. Only used during unpickling of F# metadata. - member x.AsType = - let ty = x.typar_astype - match box ty with - | null -> - let ty2 = TType_var (x, Nullness.Known NullnessInfo.WithoutNull) // TODO pass in a nullness thing here? - x.typar_astype <- ty2 - ty2 - | _ -> ty + member x.AsType nullness = + match nullness with + | Nullness.Known NullnessInfo.Oblivious -> + let ty = x.typar_astype + match box ty with + | null -> + let ty2 = TType_var (x, Nullness.Known NullnessInfo.Oblivious) + x.typar_astype <- ty2 + ty2 + | _ -> ty + | _ -> + TType_var (x, nullness) /// Indicates if a type variable has been linked. Only used during unpickling of F# metadata. member x.IsLinked = x.typar_stamp <> -1L @@ -3908,27 +3912,27 @@ and Nullness = override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.Oblivious -> "%" -and NullnessVar = - { mutable solution: Nullness option } +and NullnessVar() = + let mutable solution: Nullness option = None member nv.Evaluate() = - match nv.solution with + match solution with | None -> NullnessInfo.WithoutNull | Some soln -> soln.Evaluate() - member nv.IsSolved = nv.solution.IsSome + member nv.IsSolved = solution.IsSome member nv.Set(nullness) = assert (not nv.IsSolved) - nv.solution <- Some nullness + solution <- Some nullness member nv.Unset() = assert nv.IsSolved - nv.solution <- None + solution <- None member nv.Solution = assert nv.IsSolved - nv.solution.Value + solution.Value and [] @@ -5286,9 +5290,17 @@ let ccuOfTyconRef eref = // Type parameters and inference unknowns //------------------------------------------------------------------------- + +let NewNullnessVar() = Nullness.Variable (NullnessVar()) // we don't known (and if we never find out then it's non-null) + +let ObliviousToNull = Nullness.Known NullnessInfo.Oblivious +let KnownNull = Nullness.Known NullnessInfo.WithNull +let KnownNonNull = Nullness.Known NullnessInfo.WithoutNull +let AssumeNonNull = KnownNonNull + let mkTyparTy (tp:Typar) = match tp.Kind with - | TyparKind.Type -> tp.AsType + | TyparKind.Type -> tp.AsType AssumeNonNull // this is by no means always right!? | TyparKind.Measure -> TType_measure (Measure.Var tp) let copyTypar (tp: Typar) = @@ -5818,10 +5830,3 @@ let FSharpSignatureDataResourceName = "FSharpSignatureData." let FSharpOptimizationDataResourceName2 = "FSharpOptimizationInfo." let FSharpSignatureDataResourceName2 = "FSharpSignatureInfo." - -let NewNullnessVar() = Nullness.Variable { solution = None } // we don't known (and if we never find out then it's non-null) - -let ObliviousToNull = Nullness.Known NullnessInfo.Oblivious -let KnownNull = Nullness.Known NullnessInfo.WithNull -let KnownNonNull = Nullness.Known NullnessInfo.WithoutNull -let AssumeNonNull = KnownNonNull From acdcf709d351c50b317687584f48a2d052a48bf4 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 2 Nov 2018 16:28:00 +0000 Subject: [PATCH 010/137] try to get into shape --- src/fsharp/ConstraintSolver.fs | 17 +++++++- src/fsharp/TastOps.fs | 53 +++++++++++++---------- src/fsharp/TastOps.fsi | 3 +- src/fsharp/TcGlobals.fs | 77 +++++++++++++++++++++------------- src/fsharp/TypeChecker.fs | 4 +- src/fsharp/infos.fs | 31 +++++++++----- 6 files changed, 121 insertions(+), 64 deletions(-) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index b7dfdee1ebc..8b2320caa05 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -784,6 +784,8 @@ and solveTypMeetsTyparConstraints (csenv:ConstraintSolverEnv) ndeep m2 trace ty SolveMemberConstraint csenv false false ndeep m2 trace traitInfo |> OperationResult.ignore } +// nullness1: actual +// nullness2: expected and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 ty2 nullness1 nullness2 = match nullness1, nullness2 with | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> @@ -804,12 +806,17 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 | _, NullnessInfo.Oblivious -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD - | _, _ -> + // Allow expected of WithNull and actual of WithoutNull + // TODO: this is not sound in contravariant cases etc. + | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD + | _ -> if csenv.g.checkNullness then WarnD(ConstraintSolverNullnessWarningEquivWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) else CompleteD +// nullness1: target +// nullness2: source and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 ty2 nullness1 nullness2 = match nullness1, nullness2 with | Nullness.Variable nv1, Nullness.Variable nv2 when nv1 === nv2 -> @@ -830,6 +837,7 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona | _, NullnessInfo.Oblivious -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD + // Allow target of WithNull and actual of WithoutNull | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> if csenv.g.checkNullness then @@ -839,6 +847,8 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona /// Add the constraint "ty1 = ty2" to the constraint problem. /// Propagate all effects of adding this constraint, e.g. to solve type variables +// ty1: actual +// ty2: expected and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) (cxsln:(TraitConstraintInfo * TraitConstraintSln) option) ty1 ty2 = let ndeep = ndeep + 1 let aenv = csenv.EquivEnv @@ -920,7 +930,8 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra | _ -> localAbortD -and SolveTypeEqualsTypeKeepAbbrevs csenv ndeep m2 trace ty1 ty2 = SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace None ty1 ty2 +and SolveTypeEqualsTypeKeepAbbrevs csenv ndeep m2 trace ty1 ty2 = + SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace None ty1 ty2 and private SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ty1 ty2 = // Back out of expansions of type abbreviations to give improved error messages. @@ -944,6 +955,7 @@ and SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln origl1 origl2 = loop origl1 origl2 and SolveFunTypeEqn csenv ndeep m2 trace cxsln d1 d2 r1 r2 = trackErrors { + // TODO: consider flipping the actual and expected in argument position do! SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln d1 d2 return! SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln r1 r2 } @@ -1075,6 +1087,7 @@ and SolveTypeSubsumesTypeKeepAbbrevs csenv ndeep m2 trace cxsln ty1 ty2 = //------------------------------------------------------------------------- +// 'T :> ty and SolveTyparSubtypeOfType (csenv:ConstraintSolverEnv) ndeep m2 trace tp ty1 = let g = csenv.g if isObjTy g ty1 then CompleteD diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index b11e3e9cd13..a206b8679e1 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -160,34 +160,45 @@ let mkTyparInst (typars: Typars) tyargs = let generalizeTypar tp = mkTyparTy tp let generalizeTypars tps = List.map generalizeTypar tps -let tryAddNullToTy (ty:TType) = +let combineNullness (nullnessOrig: Nullness) (nullnessNew: Nullness) = + match nullnessOrig.Evaluate() with + | NullnessInfo.WithoutNull -> nullnessNew + | NullnessInfo.Oblivious -> nullnessOrig + | NullnessInfo.WithNull -> + match nullnessNew.Evaluate() with + | NullnessInfo.WithoutNull -> nullnessOrig // TODO - ? + | NullnessInfo.Oblivious -> nullnessNew + | NullnessInfo.WithNull -> nullnessNew + + +let tryAddNullnessToTy nullnessNew (ty:TType) = let ty = stripTyparEqns ty match ty with - | TType_var (tp, _nullness) -> Some (TType_var (tp, KnownNull)) - | TType_app (tcr, tinst, _nullness) -> Some (TType_app (tcr, tinst, KnownNull)) - | TType_ucase _ -> None - | TType_tuple _ -> None - | TType_fun (d, r, _nullness) -> Some (TType_fun (d, r, KnownNull)) + | TType_var (tp, nullnessOrig) -> + // TODO: make this avoid allocation if no change + Some (TType_var (tp, combineNullness nullnessOrig nullnessNew)) + | TType_app (tcr, tinst, nullnessOrig) -> + // TODO: make this avoid allocation if no change + Some (TType_app (tcr, tinst, combineNullness nullnessOrig nullnessNew)) + | TType_ucase _ -> None // TODO + | TType_tuple _ -> None // TODO + | TType_fun (d, r, nullnessOrig) -> + // TODO: make this avoid allocation if no change + Some (TType_fun (d, r, combineNullness nullnessOrig nullnessNew)) | TType_forall _ -> None | TType_measure _ -> None -// TODO NULLNESS: Assess for completeness -let applyNullness nullness (ty:TType) = - match nullness with - | NullnessInfo.WithoutNull - | NullnessInfo.Oblivious -> ty - | NullnessInfo.WithNull -> - match tryAddNullToTy ty with - | None -> ty - | Some ty -> ty +let addNullnessToTy nullness (ty:TType) = + match tryAddNullnessToTy nullness ty with + | None -> ty + | Some ty -> ty let rec remapTypeAux (tyenv : Remap) (ty:TType) = let ty = stripTyparEqns ty match ty with - | TType_var (tp, nullnessInfo) as ty -> - let nullness = nullnessInfo.Evaluate() // TODO - nullness inference variables are never attached to type variables + | TType_var (tp, nullness) as ty -> let res = instTyparRef tyenv.tpinst ty tp - applyNullness nullness res + addNullnessToTy nullness res | TType_app (tcr, tinst, nullness) as ty -> match tyenv.tyconRefRemap.TryFind tcr with @@ -736,7 +747,7 @@ let rec stripTyEqnsA g canShortcut ty = match tycon.TypeAbbrev with | Some abbrevTy -> let reducedTy = applyTyconAbbrev abbrevTy tycon tinst - let reducedTy2 = applyNullness (nullness.Evaluate()) reducedTy + let reducedTy2 = addNullnessToTy nullness reducedTy stripTyEqnsA g canShortcut reducedTy2 | None -> // This is the point where we get to add additional coditional normalizing equations @@ -750,7 +761,7 @@ let rec stripTyEqnsA g canShortcut ty = // Add the equation double<1> = double for units of measure. elif tycon.IsMeasureableReprTycon && List.forall (isDimensionless g) tinst then let reducedTy = reduceTyconMeasureableOrProvided g tycon tinst - let reducedTy2 = applyNullness (nullness.Evaluate()) reducedTy + let reducedTy2 = addNullnessToTy nullness reducedTy stripTyEqnsA g canShortcut reducedTy2 else ty @@ -773,7 +784,7 @@ let rec stripTyEqnsAndErase eraseFuncAndTuple (g:TcGlobals) ty = let tycon = tcref.Deref if tycon.IsErased then let reducedTy = reduceTyconMeasureableOrProvided g tycon args - let reducedTy2 = applyNullness (nullness.Evaluate()) reducedTy + let reducedTy2 = addNullnessToTy nullness reducedTy stripTyEqnsAndErase eraseFuncAndTuple g reducedTy2 elif tyconRefEq g tcref g.nativeptr_tcr && eraseFuncAndTuple then stripTyEqnsAndErase eraseFuncAndTuple g g.nativeint_ty diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index 64987f62710..100c9e4d951 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -80,7 +80,8 @@ val valsOfBinds : Bindings -> Vals val (|ExprValWithPossibleTypeInst|_|) : Expr -> (ValRef * ValUseFlag * TType list * range) option /// Ensure that a type admits nullness -val tryAddNullToTy: TType -> TType option +val tryAddNullnessToTy: Nullness -> TType -> TType option +val addNullnessToTy: Nullness -> TType -> TType //------------------------------------------------------------------------- // Build decision trees imperatively diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 9cf523be5bd..221d5184f32 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -83,7 +83,8 @@ module FSharpLib = // Access the initial environment: helpers to build references //------------------------------------------------------------------------- -let private mkNonGenericTy tcref = TType_app(tcref, [], AssumeNonNull) +let private mkNonGenericTy tcref = TType_app(tcref, [], AssumeNonNull) // TODO - does this deault for all these types cause problems? +let private mkNonGenericTyWithNullness tcref nullness = TType_app(tcref, [], nullness) let mkNonLocalTyconRef2 ccu path n = mkNonLocalTyconRef (mkNonLocalEntityRef ccu path) n @@ -518,15 +519,18 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d | _ -> TType_tuple (tupInfo, l) |> Some - let decodeTupleTy tupInfo l = - match tryDecodeTupleTy tupInfo l with + let decodeTupleTyAndNullness tupInfo tinst _nullness = // TODO nullness + match tryDecodeTupleTy tupInfo tinst with | Some ty -> ty | None -> failwith "couldn't decode tuple ty" - let decodeTupleTyIfPossible tcref tupInfo l = - match tryDecodeTupleTy tupInfo l with + let decodeTupleTyAndNullnessIfPossible tcref tupInfo tinst nullness = // TODO nullness + match tryDecodeTupleTy tupInfo tinst with | Some ty -> ty - | None -> TType_app(tcref, l, KnownNonNull) + | None -> TType_app(tcref, tinst, nullness) + + let decodeTupleTy tupInfo tinst = + decodeTupleTyAndNullness tupInfo tinst KnownNonNull let mk_MFCore_attrib nm : BuiltinAttribInfo = AttribInfo(mkILTyRef(IlxSettings.ilxFsharpCoreLibScopeRef (), FSharpLib.Core + "." + nm), mk_MFCore_tcref fslibCcu nm) @@ -794,25 +798,29 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d "Single" , v_float32_tcr |] |> Array.map (fun (nm, tcr) -> let ty = mkNonGenericTy tcr - nm, findSysTyconRef sys nm, (fun _ -> ty)) + nm, findSysTyconRef sys nm, (fun _ nullness -> + match nullness with + | Nullness.Known NullnessInfo.WithoutNull -> ty + | _ -> mkNonGenericTyWithNullness tcr nullness)) let decompileTyconEntries = [| - "FSharpFunc`2" , v_fastFunc_tcr , (fun tinst -> mkFunTy (List.item 0 tinst) (List.item 1 tinst)) - "Tuple`2" , v_ref_tuple2_tcr , decodeTupleTy tupInfoRef - "Tuple`3" , v_ref_tuple3_tcr , decodeTupleTy tupInfoRef - "Tuple`4" , v_ref_tuple4_tcr , decodeTupleTy tupInfoRef - "Tuple`5" , v_ref_tuple5_tcr , decodeTupleTy tupInfoRef - "Tuple`6" , v_ref_tuple6_tcr , decodeTupleTy tupInfoRef - "Tuple`7" , v_ref_tuple7_tcr , decodeTupleTy tupInfoRef - "Tuple`8" , v_ref_tuple8_tcr , decodeTupleTyIfPossible v_ref_tuple8_tcr tupInfoRef - "ValueTuple`2" , v_struct_tuple2_tcr , decodeTupleTy tupInfoStruct - "ValueTuple`3" , v_struct_tuple3_tcr , decodeTupleTy tupInfoStruct - "ValueTuple`4" , v_struct_tuple4_tcr , decodeTupleTy tupInfoStruct - "ValueTuple`5" , v_struct_tuple5_tcr , decodeTupleTy tupInfoStruct - "ValueTuple`6" , v_struct_tuple6_tcr , decodeTupleTy tupInfoStruct - "ValueTuple`7" , v_struct_tuple7_tcr , decodeTupleTy tupInfoStruct - "ValueTuple`8" , v_struct_tuple8_tcr , decodeTupleTyIfPossible v_struct_tuple8_tcr tupInfoStruct |] + // TODO: nullness here + "FSharpFunc`2" , v_fastFunc_tcr , (fun tinst _nullness -> mkFunTy (List.item 0 tinst) (List.item 1 tinst)) + "Tuple`2" , v_ref_tuple2_tcr , decodeTupleTyAndNullness tupInfoRef + "Tuple`3" , v_ref_tuple3_tcr , decodeTupleTyAndNullness tupInfoRef + "Tuple`4" , v_ref_tuple4_tcr , decodeTupleTyAndNullness tupInfoRef + "Tuple`5" , v_ref_tuple5_tcr , decodeTupleTyAndNullness tupInfoRef + "Tuple`6" , v_ref_tuple6_tcr , decodeTupleTyAndNullness tupInfoRef + "Tuple`7" , v_ref_tuple7_tcr , decodeTupleTyAndNullness tupInfoRef + "Tuple`8" , v_ref_tuple8_tcr , decodeTupleTyAndNullnessIfPossible v_ref_tuple8_tcr tupInfoRef + "ValueTuple`2" , v_struct_tuple2_tcr , decodeTupleTyAndNullness tupInfoStruct + "ValueTuple`3" , v_struct_tuple3_tcr , decodeTupleTyAndNullness tupInfoStruct + "ValueTuple`4" , v_struct_tuple4_tcr , decodeTupleTyAndNullness tupInfoStruct + "ValueTuple`5" , v_struct_tuple5_tcr , decodeTupleTyAndNullness tupInfoStruct + "ValueTuple`6" , v_struct_tuple6_tcr , decodeTupleTyAndNullness tupInfoStruct + "ValueTuple`7" , v_struct_tuple7_tcr , decodeTupleTyAndNullness tupInfoStruct + "ValueTuple`8" , v_struct_tuple8_tcr , decodeTupleTyAndNullnessIfPossible v_struct_tuple8_tcr tupInfoStruct |] let betterEntries = Array.append betterTyconEntries decompileTyconEntries @@ -842,7 +850,12 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let entries = betterEntries let t = Dictionary.newWithSize entries.Length for nm, tcref, builder in entries do - t.Add(nm, fun tcref2 tinst2 nullness -> if tyconRefEq tcref tcref2 then builder tinst2 else TType_app (tcref2, tinst2, nullness)) + t.Add(nm, + (fun tcref2 tinst2 nullness -> + if tyconRefEq tcref tcref2 then + builder tinst2 nullness + else + TType_app (tcref2, tinst2, nullness))) betterTypeDict1 <- t t | t -> t @@ -871,8 +884,10 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d else let dict = getDecompileTypeDict() let mutable builder = Unchecked.defaultof<_> - if dict.TryGetValue(tcref.Stamp, &builder) then builder tinst - else TType_app (tcref, tinst, nullness) + if dict.TryGetValue(tcref.Stamp, &builder) then + builder tinst nullness + else + TType_app (tcref, tinst, nullness) /// For cosmetic purposes "improve" some .NET types, e.g. Int32 --> int32. /// Doing this normalization is a fairly performance critical piece of code as it is frequently invoked @@ -881,13 +896,17 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d if compilingFslib then let dict = getBetterTypeDict1() let mutable builder = Unchecked.defaultof<_> - if dict.TryGetValue(tcref.LogicalName, &builder) then builder tcref tinst nullness - else TType_app (tcref, tinst, nullness) + if dict.TryGetValue(tcref.LogicalName, &builder) then + builder tcref tinst nullness + else + TType_app (tcref, tinst, nullness) else let dict = getBetterTypeDict2() let mutable builder = Unchecked.defaultof<_> - if dict.TryGetValue(tcref.Stamp, &builder) then builder tinst - else TType_app (tcref, tinst, nullness) + if dict.TryGetValue(tcref.Stamp, &builder) then + builder tinst nullness + else + TType_app (tcref, tinst, nullness) override x.ToString() = "" diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index a6af31c7ea7..8b9640c56a5 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -4654,7 +4654,9 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped if TypeNullNever cenv.g innerTyC then let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString), m)) - match tryAddNullToTy innerTyC with + // TODO - doesn't feel right - it will add KnownNotNull + KnownNull --> KnownNull, e.g. + // let f (x: string) = (x = null) + match tryAddNullnessToTy KnownNull innerTyC with | None -> let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString), m)) diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs index 13a4789fb9b..48b51484709 100755 --- a/src/fsharp/infos.fs +++ b/src/fsharp/infos.fs @@ -57,25 +57,29 @@ let GetSuperTypeOfType g amap m ty = let ty = stripTyEqnsAndMeasureEqns g ty #endif - match metadataOfTy g ty with + let resBeforeNull = + match metadataOfTy g ty with #if !NO_EXTENSIONTYPING - | ProvidedTypeMetadata info -> + | ProvidedTypeMetadata info -> let st = info.ProvidedType let superOpt = st.PApplyOption((fun st -> match st.BaseType with null -> None | t -> Some t),m) match superOpt with | None -> None | Some super -> Some(Import.ImportProvidedType amap m super) #endif - | ILTypeMetadata (TILObjectReprData(scoref,_,tdef)) -> + | ILTypeMetadata (TILObjectReprData(scoref,_,tdef)) -> let tinst = argsOfAppTy g ty match tdef.Extends with | None -> None - | Some ilty -> Some (ImportILType scoref amap m tinst ilty) + | Some ilty -> + let superTy = ImportILType scoref amap m tinst ilty + Some superTy - | FSharpOrArrayOrByrefOrTupleOrExnTypeMetadata -> + | FSharpOrArrayOrByrefOrTupleOrExnTypeMetadata -> if isFSharpObjModelTy g ty || isExnDeclTy g ty then let tcref = tcrefOfAppTy g ty - Some (instType (mkInstForAppTy g ty) (superOfTycon g tcref.Deref)) + let superTy = instType (mkInstForAppTy g ty) (superOfTycon g tcref.Deref) + Some superTy elif isArrayTy g ty then Some g.system_Array_ty elif isRefTy g ty && not (isObjTy g ty) then @@ -84,22 +88,29 @@ let GetSuperTypeOfType g amap m ty = Some g.obj_ty elif isFSharpStructOrEnumTy g ty then if isFSharpEnumTy g ty then - Some(g.system_Enum_ty) + Some g.system_Enum_ty else - Some (g.system_Value_ty) + Some g.system_Value_ty elif isRecdTy g ty || isUnionTy g ty then Some g.obj_ty else None + match resBeforeNull with + | Some superTy -> + let nullness = nullnessOfTy g ty + let superTyWithNull = addNullnessToTy nullness superTy + Some superTyWithNull + | None -> + None /// Make a type for System.Collections.Generic.IList -let mkSystemCollectionsGenericIListTy (g: TcGlobals) ty = TType_app(g.tcref_System_Collections_Generic_IList,[ty],AssumeNonNull) +let mkSystemCollectionsGenericIListTy (g: TcGlobals) ty = + TType_app(g.tcref_System_Collections_Generic_IList,[ty],AssumeNonNull) [] /// Indicates whether we can skip interface types that lie outside the reference set type SkipUnrefInterfaces = Yes | No - /// Collect the set of immediate declared interface types for an F# type, but do not /// traverse the type hierarchy to collect further interfaces. let rec GetImmediateInterfacesOfType skipUnref g amap m ty = From 0c2b6db3e8d6bca94835f385c061e1c45b49f4e4 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 5 Nov 2018 14:11:13 +0000 Subject: [PATCH 011/137] disable nullness annotations and inference when feature is off --- src/fsharp/AccessibilityLogic.fs | 6 +- src/fsharp/AugmentWithHashCompare.fs | 37 +- src/fsharp/CheckFormatStrings.fs | 12 +- src/fsharp/ConstraintSolver.fs | 38 +- src/fsharp/ConstraintSolver.fsi | 5 +- src/fsharp/DetupleArgs.fs | 6 +- src/fsharp/FindUnsolved.fs | 2 +- src/fsharp/IlxGen.fs | 134 ++-- src/fsharp/InfoReader.fs | 4 +- src/fsharp/InnerLambdasToTopLevelFuncs.fs | 8 +- src/fsharp/MethodCalls.fs | 4 +- src/fsharp/MethodOverrides.fs | 4 +- src/fsharp/NameResolution.fs | 26 +- src/fsharp/NicePrint.fs | 6 +- src/fsharp/Optimizer.fs | 20 +- src/fsharp/PatternMatchCompilation.fs | 3 +- src/fsharp/PostInferenceChecks.fs | 8 +- src/fsharp/QuotationTranslator.fs | 117 ++-- src/fsharp/SignatureConformance.fs | 8 +- src/fsharp/TastOps.fs | 157 +++-- src/fsharp/TastOps.fsi | 28 +- src/fsharp/TastPickle.fs | 50 +- src/fsharp/TcGlobals.fs | 81 ++- src/fsharp/TypeChecker.fs | 661 +++++++++--------- src/fsharp/autobox.fs | 2 +- src/fsharp/import.fs | 8 +- src/fsharp/infos.fs | 8 +- src/fsharp/service/ServiceDeclarationLists.fs | 2 +- src/fsharp/service/service.fs | 4 +- src/fsharp/symbols/Exprs.fs | 108 +-- src/fsharp/symbols/SymbolHelpers.fs | 10 +- src/fsharp/symbols/Symbols.fs | 47 +- src/fsharp/tast.fs | 18 +- 33 files changed, 860 insertions(+), 772 deletions(-) diff --git a/src/fsharp/AccessibilityLogic.fs b/src/fsharp/AccessibilityLogic.fs index dcd8d5d801e..24a516e138a 100644 --- a/src/fsharp/AccessibilityLogic.fs +++ b/src/fsharp/AccessibilityLogic.fs @@ -81,7 +81,8 @@ let private IsILMemberAccessible g amap m (tcrefOfViewedItem : TyconRef) ad acce match tcrefViewedFromOption with | None -> false | Some tcrefViewedFrom -> - ExistsHeadTypeInEntireHierarchy g amap m (generalizedTyconRef tcrefViewedFrom) tcrefOfViewedItem) + let tcrefViewedFromTy = generalizedTyOfTyconRef g tcrefViewedFrom + ExistsHeadTypeInEntireHierarchy g amap m tcrefViewedFromTy tcrefOfViewedItem) let accessibleByInternalsVisibleTo = (access = ILMemberAccess.Assembly || access = ILMemberAccess.FamilyOrAssembly) && @@ -93,7 +94,8 @@ let private IsILMemberAccessible g amap m (tcrefOfViewedItem : TyconRef) ad acce match tcrefViewedFromOption with | None -> false | Some tcrefViewedFrom -> - ExistsHeadTypeInEntireHierarchy g amap m (generalizedTyconRef tcrefViewedFrom) tcrefOfViewedItem + let tcrefViewedFromTy = generalizedTyOfTyconRef g tcrefViewedFrom + ExistsHeadTypeInEntireHierarchy g amap m tcrefViewedFromTy tcrefOfViewedItem (access = ILMemberAccess.Public) || accessibleByFamily || accessibleByInternalsVisibleTo || accessibleByFamilyAndAssembly diff --git a/src/fsharp/AugmentWithHashCompare.fs b/src/fsharp/AugmentWithHashCompare.fs index 6d9abf0dc10..a1ed1f05c3b 100644 --- a/src/fsharp/AugmentWithHashCompare.fs +++ b/src/fsharp/AugmentWithHashCompare.fs @@ -43,21 +43,21 @@ let mkEqualsSlotSig (g: TcGlobals) = let mkThisTy g ty = if isStructTy g ty then mkByrefTy g ty else ty -let mkCompareObjTy g ty = (mkThisTy g ty) --> (g.obj_ty --> g.int_ty) +let mkCompareObjTy g ty = mkFunTy g (mkThisTy g ty) (mkFunTy g g.obj_ty g.int_ty) -let mkCompareTy g ty = (mkThisTy g ty) --> (ty --> g.int_ty) +let mkCompareTy g ty = mkFunTy g (mkThisTy g ty) (mkFunTy g ty g.int_ty) -let mkCompareWithComparerTy g ty = (mkThisTy g ty) --> ((mkRefTupledTy g [g.obj_ty ; g.IComparer_ty]) --> g.int_ty) +let mkCompareWithComparerTy g ty = mkFunTy g (mkThisTy g ty) (mkFunTy g (mkRefTupledTy g [g.obj_ty ; g.IComparer_ty]) g.int_ty) -let mkEqualsObjTy g ty = (mkThisTy g ty) --> (g.obj_ty --> g.bool_ty) +let mkEqualsObjTy g ty = mkFunTy g (mkThisTy g ty) (mkFunTy g g.obj_ty g.bool_ty) -let mkEqualsTy g ty = (mkThisTy g ty) --> (ty --> g.bool_ty) +let mkEqualsTy g ty = mkFunTy g (mkThisTy g ty) (mkFunTy g ty g.bool_ty) -let mkEqualsWithComparerTy g ty = (mkThisTy g ty) --> ((mkRefTupledTy g [g.obj_ty ; g.IEqualityComparer_ty]) --> g.bool_ty) +let mkEqualsWithComparerTy g ty = mkFunTy g (mkThisTy g ty) (mkFunTy g (mkRefTupledTy g [g.obj_ty ; g.IEqualityComparer_ty]) g.bool_ty) -let mkHashTy g ty = (mkThisTy g ty) --> (g.unit_ty --> g.int_ty) +let mkHashTy g ty = mkFunTy g (mkThisTy g ty) (mkFunTy g g.unit_ty g.int_ty) -let mkHashWithComparerTy g ty = (mkThisTy g ty) --> (g.IEqualityComparer_ty --> g.int_ty) +let mkHashWithComparerTy g ty = mkFunTy g (mkThisTy g ty) (mkFunTy g g.IEqualityComparer_ty g.int_ty) //------------------------------------------------------------------------- // Polymorphic comparison @@ -174,7 +174,7 @@ let mkEqualsTestConjuncts g m exprs = let mkMinimalTy (g: TcGlobals) (tcref:TyconRef) = if tcref.Deref.IsExceptionDecl then [], g.exn_ty - else generalizeTyconRef tcref + else generalizeTyconRef g tcref // check for nulls let mkBindNullComparison g m thise thate expr = @@ -783,7 +783,7 @@ let CheckAugmentationAttribs isImplementation g amap (tycon:Tycon)= errorR(Error(FSComp.SR.augInvalidAttrs(), m)) let hasNominalInterface tcref = - let ty = generalizedTyconRef (mkLocalTyconRef tycon) + let ty = generalizedTyOfTyconRef g (mkLocalTyconRef tycon) ExistsHeadTypeInEntireHierarchy g amap tycon.Range ty tcref let hasExplicitICompare = @@ -950,10 +950,10 @@ let MakeBindingsForCompareAugmentation g (tycon:Tycon) = mkApps g ((exprForValRef m vref2,vref2.Type), (if isNil tinst then [] else [tinst]), [thise;thate], m) - mkLambdas m tps [thisv;thatobjv] (comparee,g.int_ty) + mkLambdas g m tps [thisv;thatobjv] (comparee,g.int_ty) let rhs2 = let thisv,thatv,comparee = comparef g tcref tycon - mkLambdas m tps [thisv;thatv] (comparee,g.int_ty) + mkLambdas g m tps [thisv;thatv] (comparee,g.int_ty) [ // This one must come first because it may be inlined into the second mkCompGenBind vspec2 rhs2 mkCompGenBind vspec1 rhs1; ] @@ -981,7 +981,7 @@ let MakeBindingsForCompareWithComparerAugmentation g (tycon:Tycon) = let rhs = let comparee = comparef g tcref tycon (thisv,thise) (thatobjv,thate) compe let comparee = if isUnitTy g ty then mkZero g m else comparee - mkMultiLambdas m tps [[thisv];[thatobjv;compv]] (comparee,g.int_ty) + mkMultiLambdas g m tps [[thisv];[thatobjv;compv]] (comparee,g.int_ty) [mkCompGenBind vspec rhs] if tycon.IsUnionTycon then mkCompare mkUnionCompareWithComparer elif tycon.IsRecordTycon || tycon.IsStructOrEnumTycon then mkCompare mkRecdCompareWithComparer @@ -1000,7 +1000,7 @@ let MakeBindingsForEqualityWithComparerAugmentation (g: TcGlobals) (tycon:Tycon) let withcGetHashCodeExpr = let compv,compe = mkCompGenLocal m "comp" g.IEqualityComparer_ty let thisv,hashe = hashf g tcref tycon compe - mkLambdas m tps [thisv;compv] (hashe,g.int_ty) + mkLambdas g m tps [thisv;compv] (hashe,g.int_ty) // build the equals rhs let withcEqualsExpr = @@ -1010,8 +1010,7 @@ let MakeBindingsForEqualityWithComparerAugmentation (g: TcGlobals) (tycon:Tycon) let thatv,thate = mkCompGenLocal m "that" ty let compv,compe = mkCompGenLocal m "comp" g.IEqualityComparer_ty let equalse = equalsf g tcref tycon (thisv,thise) thatobje (thatv,thate) compe - mkMultiLambdas m tps [[thisv];[thatobjv;compv]] (equalse,g.bool_ty) - + mkMultiLambdas g m tps [[thisv];[thatobjv;compv]] (equalse,g.bool_ty) let objGetHashCodeExpr = let tinst,ty = mkMinimalTy g tcref @@ -1024,7 +1023,7 @@ let MakeBindingsForEqualityWithComparerAugmentation (g: TcGlobals) (tycon:Tycon) let compe = mkILCallGetEqualityComparer g m mkApps g ((exprForValRef m withcGetHashCodeVal,withcGetHashCodeVal.Type), (if isNil tinst then [] else [tinst]), [thise; compe], m) - mkLambdas m tps [thisv; unitv] (hashe,g.int_ty) + mkLambdas g m tps [thisv; unitv] (hashe,g.int_ty) [(mkCompGenBind withcGetHashCodeVal.Deref withcGetHashCodeExpr) (mkCompGenBind objGetHashCodeVal.Deref objGetHashCodeExpr) @@ -1045,7 +1044,7 @@ let MakeBindingsForEqualsAugmentation (g: TcGlobals) (tycon:Tycon) = // this is the body of the real strongly typed implementation let nocEqualsExpr = let thisv,thatv,equalse = equalsf g tcref tycon - mkLambdas m tps [thisv;thatv] (equalse,g.bool_ty) + mkLambdas g m tps [thisv;thatv] (equalse,g.bool_ty) // this is the body of the override let objEqualsExpr = @@ -1061,7 +1060,7 @@ let MakeBindingsForEqualsAugmentation (g: TcGlobals) (tycon:Tycon) = (mkApps g ((exprForValRef m nocEqualsVal,nocEqualsVal.Type), (if isNil tinst then [] else [tinst]), [thise;thate], m)) (mkFalse g m) - mkLambdas m tps [thisv;thatobjv] (equalse,g.bool_ty) + mkLambdas g m tps [thisv;thatobjv] (equalse,g.bool_ty) [ mkCompGenBind nocEqualsVal.Deref nocEqualsExpr diff --git a/src/fsharp/CheckFormatStrings.fs b/src/fsharp/CheckFormatStrings.fs index 4d532904a16..e695b4ceabc 100644 --- a/src/fsharp/CheckFormatStrings.fs +++ b/src/fsharp/CheckFormatStrings.fs @@ -257,27 +257,27 @@ let parseFormatStringInternal (m:range) (g: TcGlobals) (context: FormatStringChe | 'O' -> checkOtherFlags ch collectSpecifierLocation relLine relCol 1 - parseLoop ((posi, NewInferenceType ()) :: acc) (i+1, relLine, relCol+1) + parseLoop ((posi, NewInferenceType g) :: acc) (i+1, relLine, relCol+1) | 'A' -> match info.numPrefixIfPos with | None // %A has BindingFlags=Public, %+A has BindingFlags=Public | NonPublic | Some '+' -> collectSpecifierLocation relLine relCol 1 - parseLoop ((posi, NewInferenceType ()) :: acc) (i+1, relLine, relCol+1) + parseLoop ((posi, NewInferenceType g) :: acc) (i+1, relLine, relCol+1) | Some _ -> failwithf "%s" <| FSComp.SR.forDoesNotSupportPrefixFlag(ch.ToString(), (Option.get info.numPrefixIfPos).ToString()) | 'a' -> checkOtherFlags ch - let xty = NewInferenceType () - let fty = bty --> (xty --> cty) + let xty = NewInferenceType g + let fty = mkFunTy g bty (mkFunTy g xty cty) collectSpecifierLocation relLine relCol 2 parseLoop ((Option.map ((+)1) posi, xty) :: (posi, fty) :: acc) (i+1, relLine, relCol+1) | 't' -> checkOtherFlags ch collectSpecifierLocation relLine relCol 1 - parseLoop ((posi, bty --> cty) :: acc) (i+1, relLine, relCol+1) + parseLoop ((posi, mkFunTy g bty cty) :: acc) (i+1, relLine, relCol+1) | c -> failwithf "%s" <| FSComp.SR.forBadFormatSpecifierGeneral(String.make 1 c) @@ -289,7 +289,7 @@ let parseFormatStringInternal (m:range) (g: TcGlobals) (context: FormatStringChe let ParseFormatString m g formatStringCheckContext fmt bty cty dty = let argtys, specifierLocations = parseFormatStringInternal m g formatStringCheckContext fmt bty cty - let aty = List.foldBack (-->) argtys dty + let aty = List.foldBack (mkFunTy g) argtys dty let ety = mkRefTupledTy g argtys (aty, ety), specifierLocations diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 8b2320caa05..668bf4d8015 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -74,23 +74,28 @@ let NewNamedInferenceMeasureVar (_m, rigid, var, id) = let NewInferenceMeasurePar () = NewCompGenTypar (TyparKind.Measure, TyparRigidity.Flexible, NoStaticReq, TyparDynamicReq.No, false) -let NewErrorTypar () = NewCompGenTypar (TyparKind.Type, TyparRigidity.Flexible, NoStaticReq, TyparDynamicReq.No, true) -let NewErrorMeasureVar () = NewCompGenTypar (TyparKind.Measure, TyparRigidity.Flexible, NoStaticReq, TyparDynamicReq.No, true) -let NewInferenceType () = +let NewErrorTypar () = + NewCompGenTypar (TyparKind.Type, TyparRigidity.Flexible, NoStaticReq, TyparDynamicReq.No, true) + +let NewErrorMeasureVar () = + NewCompGenTypar (TyparKind.Measure, TyparRigidity.Flexible, NoStaticReq, TyparDynamicReq.No, true) + +let NewInferenceType (g: TcGlobals) = let tp = NewTypar (TyparKind.Type, TyparRigidity.Flexible, Typar(compgenId, NoStaticReq, true), false, TyparDynamicReq.No, [], false, false) - let nullness = NewNullnessVar() + let nullness = if g.langFeatureNullness then NewNullnessVar() else KnownObliviousToNull TType_var (tp, nullness) let NewErrorType () = mkTyparTy (NewErrorTypar ()) + let NewErrorMeasure () = Measure.Var (NewErrorMeasureVar ()) let NewByRefKindInferenceType (g: TcGlobals) m = let tp = NewTypar (TyparKind.Type, TyparRigidity.Flexible, Typar(compgenId, HeadTypeStaticReq, true), false, TyparDynamicReq.No, [], false, false) if g.byrefkind_InOut_tcr.CanDeref then - tp.SetConstraints [TyparConstraint.DefaultsTo(10, TType_app(g.byrefkind_InOut_tcr, [], KnownNonNull), m)] + tp.SetConstraints [TyparConstraint.DefaultsTo(10, TType_app(g.byrefkind_InOut_tcr, [], g.knownWithoutNull), m)] mkTyparTy tp -let NewInferenceTypes l = l |> List.map (fun _ -> NewInferenceType ()) +let NewInferenceTypes g l = l |> List.map (fun _ -> NewInferenceType g) // QUERY: should 'rigid' ever really be 'true'? We set this when we know // we are going to have to generalize a typar, e.g. when implementing a @@ -103,8 +108,11 @@ let FreshenAndFixupTypars m rigid fctps tinst tpsorig = let renaming, tinst = FixupNewTypars m fctps tinst tpsorig tps tps, renaming, tinst -let FreshenTypeInst m tpsorig = FreshenAndFixupTypars m TyparRigidity.Flexible [] [] tpsorig -let FreshMethInst m fctps tinst tpsorig = FreshenAndFixupTypars m TyparRigidity.Flexible fctps tinst tpsorig +let FreshenTypeInst m tpsorig = + FreshenAndFixupTypars m TyparRigidity.Flexible [] [] tpsorig + +let FreshMethInst m fctps tinst tpsorig = + FreshenAndFixupTypars m TyparRigidity.Flexible fctps tinst tpsorig let FreshenTypars m tpsorig = match tpsorig with @@ -802,8 +810,8 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 CompleteD | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with - | NullnessInfo.Oblivious, _ -> CompleteD - | _, NullnessInfo.Oblivious -> CompleteD + | NullnessInfo.ObliviousToNull, _ -> CompleteD + | _, NullnessInfo.ObliviousToNull -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD // Allow expected of WithNull and actual of WithoutNull @@ -833,8 +841,8 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona CompleteD | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with - | NullnessInfo.Oblivious, _ -> CompleteD - | _, NullnessInfo.Oblivious -> CompleteD + | NullnessInfo.ObliviousToNull, _ -> CompleteD + | _, NullnessInfo.ObliviousToNull -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD // Allow target of WithNull and actual of WithoutNull @@ -1525,7 +1533,7 @@ and MemberConstraintSolutionOfMethInfo css m minfo minst = let allArgVars, allArgs = minfo.GetParamTypes(amap, m, minst) |> List.concat |> List.mapi (fun i ty -> mkLocal m ("arg"+string i) ty) |> List.unzip let objArgVars, objArgs = (if minfo.IsInstance then [mkLocal m "this" minfo.ApparentEnclosingType] else []) |> List.unzip let callMethInfoOpt, callExpr, callExprTy = ProvidedMethodCalls.BuildInvokerExpressionForProvidedMethodCall css.TcVal (g, amap, mi, objArgs, NeverMutates, false, ValUseFlag.NormalValUse, allArgs, m) - let closedExprSln = ClosedExprSln (mkLambdas m [] (objArgVars@allArgVars) (callExpr, callExprTy) ) + let closedExprSln = ClosedExprSln (mkLambdas g m [] (objArgVars@allArgVars) (callExpr, callExprTy) ) // If the call is a simple call to an IL method with all the arguments in the natural order, then revert to use ILMethSln. // This is important for calls to operators on generated provided types. There is an (unchecked) condition // that generative providers do not re=order arguments or insert any more information into operator calls. @@ -1824,11 +1832,11 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio if nv.IsSolved then SolveNullnessSupportsNull csenv ndeep m2 trace ty nv.Solution else - trace.Exec (fun () -> printfn "NV %d --> KnownNull" (nv.GetHashCode()); nv.Set KnownNull) (fun () -> nv.Unset()) + trace.Exec (fun () -> printfn "NV %d --> KnownWithNull" (nv.GetHashCode()); nv.Set KnownWithNull) (fun () -> nv.Unset()) CompleteD | Nullness.Known n1 -> match n1 with - | NullnessInfo.Oblivious -> CompleteD + | NullnessInfo.ObliviousToNull -> CompleteD | NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull -> if csenv.g.checkNullness then diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi index 3fad04fd039..f47a45e30c0 100644 --- a/src/fsharp/ConstraintSolver.fsi +++ b/src/fsharp/ConstraintSolver.fsi @@ -1,3 +1,4 @@ + // Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. /// Solves constraints using a mutable constraint-solver state @@ -20,7 +21,7 @@ open Microsoft.FSharp.Compiler.InfoReader val NewAnonTypar : TyparKind * range * TyparRigidity * TyparStaticReq * TyparDynamicReq -> Typar /// Create an inference type variable -val NewInferenceType : unit -> TType +val NewInferenceType : TcGlobals -> TType /// Create an inference type variable for the kind of a byref pointer val NewByRefKindInferenceType : TcGlobals -> range -> TType @@ -32,7 +33,7 @@ val NewErrorType : unit -> TType val NewErrorMeasure : unit -> Measure /// Create a list of inference type variables, one for each element in the input list -val NewInferenceTypes : 'a list -> TType list +val NewInferenceTypes : TcGlobals -> 'a list -> TType list /// Given a set of formal type parameters and their constraints, make new inference type variables for /// each and ensure that the constraints on the new type variables are adjusted to refer to these. diff --git a/src/fsharp/DetupleArgs.fs b/src/fsharp/DetupleArgs.fs index bf56deeeb7f..88e0f840874 100644 --- a/src/fsharp/DetupleArgs.fs +++ b/src/fsharp/DetupleArgs.fs @@ -482,7 +482,7 @@ let mkTransform g (f:Val) m tps x1Ntys rty (callPattern, tyfringes: (TType list let tys1r = List.collect fst tyfringes (* types for collapsed initial r args *) let tysrN = List.drop tyfringes.Length x1Ntys (* types for remaining args *) let argtys = tys1r @ tysrN - let fCty = mkLambdaTy tps argtys rty + let fCty = mkLambdaTy g tps argtys rty let transformedVal = mkLocalVal f.Range (globalNng.FreshCompilerGeneratedName (f.LogicalName, f.Range)) fCty topValInfo { transformCallPattern = callPattern transformedFormals = transformedFormals @@ -798,8 +798,8 @@ let passBind penv (TBind(fOrig, repr, letSeqPtOpt) as bind) = let rebinds = List.concat (List.map2 transRebind transformedFormals x1ps) // fCBody - rebuild // fCBody = TLambda tps. Lam formals. let rebinds in body - let rbody, rt = mkLetsBind m rebinds body, rty - let bind = mkMultiLambdaBind transformedVal letSeqPtOpt m tps formals (rbody, rt) + let rbody, rt = mkLetsBind m rebinds body, rty + let bind = mkMultiLambdaBind penv.g transformedVal letSeqPtOpt m tps formals (rbody, rt) // result bind diff --git a/src/fsharp/FindUnsolved.fs b/src/fsharp/FindUnsolved.fs index e78e41212dd..4d3c707de7f 100644 --- a/src/fsharp/FindUnsolved.fs +++ b/src/fsharp/FindUnsolved.fs @@ -65,7 +65,7 @@ let rec accExpr (cenv:cenv) (env:env) expr = // REVIEW: fold the next two cases together | Expr.Lambda(_,_ctorThisValOpt,_baseValOpt,argvs,_body,m,rty) -> let topValInfo = ValReprInfo ([],[argvs |> List.map (fun _ -> ValReprInfo.unnamedTopArg1)],ValReprInfo.unnamedRetVal) - let ty = mkMultiLambdaTy m argvs rty + let ty = mkMultiLambdaTy cenv.g m argvs rty accLambdas cenv env topValInfo expr ty | Expr.TyLambda(_,tps,_body,_m,rty) -> let topValInfo = ValReprInfo (ValReprInfo.InferTyparInfo tps,[],ValReprInfo.unnamedRetVal) diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs index 962c0b8a7c9..aaed1d9f763 100644 --- a/src/fsharp/IlxGen.fs +++ b/src/fsharp/IlxGen.fs @@ -6177,29 +6177,30 @@ and GenAbstractBinding cenv eenv tref (vref:ValRef) = [],[],[] and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = + let g = cenv.g let genToString ilThisTy = [ - match (eenv.valsInScope.TryFind cenv.g.sprintf_vref.Deref, - eenv.valsInScope.TryFind cenv.g.new_format_vref.Deref) with + match (eenv.valsInScope.TryFind g.sprintf_vref.Deref, + eenv.valsInScope.TryFind g.new_format_vref.Deref) with | Some(Lazy(Method(_,_,sprintfMethSpec,_,_,_,_))), Some(Lazy(Method(_,_,newFormatMethSpec,_,_,_,_))) -> // The type returned by the 'sprintf' call - let funcTy = EraseClosures.mkILFuncTy cenv.g.ilxPubCloEnv ilThisTy cenv.g.ilg.typ_String + let funcTy = EraseClosures.mkILFuncTy g.ilxPubCloEnv ilThisTy g.ilg.typ_String // Give the instantiation of the printf format object, i.e. a Format`5 object compatible with StringFormat let newFormatMethSpec = mkILMethSpec(newFormatMethSpec.MethodRef,AsObject, [// 'T -> string' funcTy // rest follow from 'StringFormat' GenUnitTy cenv eenv m - cenv.g.ilg.typ_String - cenv.g.ilg.typ_String + g.ilg.typ_String + g.ilg.typ_String ilThisTy],[]) // Instantiate with our own type let sprintfMethSpec = mkILMethSpec(sprintfMethSpec.MethodRef,AsObject,[],[funcTy]) // Here's the body of the method. Call printf, then invoke the function it returns - let callInstrs = EraseClosures.mkCallFunc cenv.g.ilxPubCloEnv (fun _ -> 0us) eenv.tyenv.Count Normalcall (Apps_app(ilThisTy, Apps_done cenv.g.ilg.typ_String)) + let callInstrs = EraseClosures.mkCallFunc g.ilxPubCloEnv (fun _ -> 0us) eenv.tyenv.Count Normalcall (Apps_app(ilThisTy, Apps_done g.ilg.typ_String)) let mdef = mkILNonGenericVirtualMethod ("ToString",ILMemberAccess.Public,[], - mkILReturn cenv.g.ilg.typ_String, + mkILReturn g.ilg.typ_String, mkMethodBody (true,[],2,nonBranchingInstrsToCode ([ // load the hardwired format string yield I_ldstr "%+A" @@ -6213,7 +6214,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = yield mkNormalLdobj ilThisTy ] @ callInstrs), None)) - let mdef = mdef.With(customAttrs = mkILCustomAttrs [ cenv.g.CompilerGeneratedAttribute ]) + let mdef = mdef.With(customAttrs = mkILCustomAttrs [ g.CompilerGeneratedAttribute ]) yield mdef | None,_ -> () | _,None -> () @@ -6229,7 +6230,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = | TAsmRepr _ | TILObjectRepr _ | TMeasureableRepr _ -> () | TFSharpObjectRepr _ | TRecdRepr _ | TUnionRepr _ -> let eenvinner = ReplaceTyenv (TypeReprEnv.ForTycon tycon) eenv - let thisTy = generalizedTyconRef tcref + let thisTy = generalizedTyOfTyconRef g tcref let ilThisTy = GenType cenv.amap m eenvinner.tyenv thisTy let tref = ilThisTy.TypeRef @@ -6253,8 +6254,8 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = (if Option.isNone tycon.GeneratedCompareToValues && Option.isNone tycon.GeneratedHashAndEqualsValues && - tycon.HasInterface cenv.g cenv.g.mk_IComparable_ty && - not (tycon.HasOverride cenv.g "Equals" [cenv.g.obj_ty]) && + tycon.HasInterface g g.mk_IComparable_ty && + not (tycon.HasOverride g "Equals" [g.obj_ty]) && not tycon.IsFSharpInterfaceTycon then [ GenEqualsOverrideCallingIComparable cenv (tcref,ilThisTy,ilThisTy) ] @@ -6283,17 +6284,17 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = [ for vref in tycon.MembersOfFSharpTyconByName |> NameMultiMap.range do assert(vref.IsMember) let memberInfo = vref.MemberInfo.Value - if memberInfo.MemberFlags.IsOverrideOrExplicitImpl && not (CompileAsEvent cenv.g vref.Attribs) then + if memberInfo.MemberFlags.IsOverrideOrExplicitImpl && not (CompileAsEvent g vref.Attribs) then for slotsig in memberInfo.ImplementedSlotSigs do - if isInterfaceTy cenv.g slotsig.ImplementedType then + if isInterfaceTy g slotsig.ImplementedType then match vref.ValReprInfo with | Some _ -> let memberParentTypars,memberMethodTypars = - match PartitionValRefTypars cenv.g vref with + match PartitionValRefTypars g vref with | Some(_,memberParentTypars,memberMethodTypars,_,_) -> memberParentTypars,memberMethodTypars | None -> [],[] @@ -6315,33 +6316,33 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = | None -> None | Some memberInfo -> match name, memberInfo.MemberFlags.MemberKind with - | ("Item" | "op_IndexedLookup"), (MemberKind.PropertyGet | MemberKind.PropertySet) when not (isNil (ArgInfosOfPropertyVal cenv.g vref.Deref)) -> - Some( mkILCustomAttribute cenv.g.ilg (cenv.g.FindSysILTypeRef "System.Reflection.DefaultMemberAttribute",[cenv.g.ilg.typ_String],[ILAttribElem.String(Some(name))],[]) ) + | ("Item" | "op_IndexedLookup"), (MemberKind.PropertyGet | MemberKind.PropertySet) when not (isNil (ArgInfosOfPropertyVal g vref.Deref)) -> + Some( mkILCustomAttribute g.ilg (g.FindSysILTypeRef "System.Reflection.DefaultMemberAttribute",[g.ilg.typ_String],[ILAttribElem.String(Some(name))],[]) ) | _ -> None) |> Option.toList let tyconRepr = tycon.TypeReprInfo // DebugDisplayAttribute gets copied to the subtypes generated as part of DU compilation - let debugDisplayAttrs,normalAttrs = tycon.Attribs |> List.partition (IsMatchingFSharpAttribute cenv.g cenv.g.attrib_DebuggerDisplayAttribute) - let securityAttrs,normalAttrs = normalAttrs |> List.partition (fun a -> IsSecurityAttribute cenv.g cenv.amap cenv.casApplied a m) - let generateDebugDisplayAttribute = not cenv.g.compilingFslib && tycon.IsUnionTycon && isNil debugDisplayAttrs - let generateDebugProxies = (not (tyconRefEq cenv.g tcref cenv.g.unit_tcr_canon) && - not (HasFSharpAttribute cenv.g cenv.g.attrib_DebuggerTypeProxyAttribute tycon.Attribs)) + let debugDisplayAttrs,normalAttrs = tycon.Attribs |> List.partition (IsMatchingFSharpAttribute g g.attrib_DebuggerDisplayAttribute) + let securityAttrs,normalAttrs = normalAttrs |> List.partition (fun a -> IsSecurityAttribute g cenv.amap cenv.casApplied a m) + let generateDebugDisplayAttribute = not g.compilingFslib && tycon.IsUnionTycon && isNil debugDisplayAttrs + let generateDebugProxies = (not (tyconRefEq g tcref g.unit_tcr_canon) && + not (HasFSharpAttribute g g.attrib_DebuggerTypeProxyAttribute tycon.Attribs)) - let permissionSets = CreatePermissionSets cenv.g cenv.amap eenv securityAttrs + let permissionSets = CreatePermissionSets g cenv.amap eenv securityAttrs let secDecls = if List.isEmpty securityAttrs then emptyILSecurityDecls else mkILSecurityDecls permissionSets let ilDebugDisplayAttributes = [ yield! GenAttrs cenv eenv debugDisplayAttrs if generateDebugDisplayAttribute then - yield cenv.g.mkDebuggerDisplayAttribute ("{" + debugDisplayMethodName + "(),nq}") ] + yield g.mkDebuggerDisplayAttribute ("{" + debugDisplayMethodName + "(),nq}") ] let ilCustomAttrs = [ yield! defaultMemberAttrs yield! normalAttrs - |> List.filter (IsMatchingFSharpAttribute cenv.g cenv.g.attrib_StructLayoutAttribute >> not) + |> List.filter (IsMatchingFSharpAttribute g g.attrib_StructLayoutAttribute >> not) |> GenAttrs cenv eenv yield! ilDebugDisplayAttributes ] @@ -6370,7 +6371,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = isEmptyStruct && cenv.opts.workAroundReflectionEmitBugs && not tycon.TyparsNoRange.IsEmpty // Compute a bunch of useful things for each field - let isCLIMutable = (TryFindFSharpBoolAttribute cenv.g cenv.g.attrib_CLIMutableAttribute tycon.Attribs = Some true) + let isCLIMutable = (TryFindFSharpBoolAttribute g g.attrib_CLIMutableAttribute tycon.Attribs = Some true) let fieldSummaries = [ for fspec in tycon.AllFieldsAsList do @@ -6397,7 +6398,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = [ for (useGenuineField,ilFieldName,isFSharpMutable,isStatic,_,ilPropType,isPropHidden,fspec) in fieldSummaries do let ilFieldOffset = - match TryFindFSharpAttribute cenv.g cenv.g.attrib_FieldOffsetAttribute fspec.FieldAttribs with + match TryFindFSharpAttribute g g.attrib_FieldOffsetAttribute fspec.FieldAttribs with | Some (Attrib(_,_,[ AttribInt32Arg(fieldOffset) ],_,_,_,_)) -> Some fieldOffset | Some (Attrib(_,_,_,_,_,_,m)) -> @@ -6414,14 +6415,14 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = yield! fspec.FieldAttribs ] - let ilNotSerialized = HasFSharpAttributeOpt cenv.g cenv.g.attrib_NonSerializedAttribute attribs + let ilNotSerialized = HasFSharpAttributeOpt g g.attrib_NonSerializedAttribute attribs let fattribs = attribs // Do not generate FieldOffset as a true CLI custom attribute, since it is implied by other corresponding CLI metadata - |> List.filter (IsMatchingFSharpAttribute cenv.g cenv.g.attrib_FieldOffsetAttribute >> not) + |> List.filter (IsMatchingFSharpAttribute g g.attrib_FieldOffsetAttribute >> not) // Do not generate NonSerialized as a true CLI custom attribute, since it is implied by other corresponding CLI metadata - |> List.filter (IsMatchingFSharpAttributeOpt cenv.g cenv.g.attrib_NonSerializedAttribute >> not) + |> List.filter (IsMatchingFSharpAttributeOpt g g.attrib_NonSerializedAttribute >> not) let ilFieldMarshal, fattribs = GenMarshal cenv fattribs @@ -6431,7 +6432,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = let extraAttribs = match tyconRepr with - | TRecdRepr _ when not useGenuineField -> [ cenv.g.DebuggerBrowsableNeverAttribute ] // hide fields in records in debug display + | TRecdRepr _ when not useGenuineField -> [ g.DebuggerBrowsableNeverAttribute ] // hide fields in records in debug display | _ -> [] // don't hide fields in classes in debug display let access = ComputeMemberAccess isFieldHidden @@ -6455,7 +6456,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = yield fdef if requiresExtraField then - yield mkILInstanceField("__dummy",cenv.g.ilg.typ_Int32,None,ILMemberAccess.Assembly) ] + yield mkILInstanceField("__dummy",g.ilg.typ_Int32,None,ILMemberAccess.Assembly) ] // Generate property definitions for the fields compiled as properties let ilPropertyDefsForFields = @@ -6464,7 +6465,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = let ilCallingConv = if isStatic then ILCallingConv.Static else ILCallingConv.Instance let ilPropName = fspec.Name let ilHasSetter = isCLIMutable || isFSharpMutable - let ilFieldAttrs = GenAttrs cenv eenv propAttribs @ [mkCompilationMappingAttrWithSeqNum cenv.g (int SourceConstructFlags.Field) i] + let ilFieldAttrs = GenAttrs cenv eenv propAttribs @ [mkCompilationMappingAttrWithSeqNum g (int SourceConstructFlags.Field) i] yield ILPropertyDef(name= ilPropName, attributes= PropertyAttributes.None, @@ -6508,26 +6509,26 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = if generateDebugDisplayAttribute then let (|Lazy|) (x:Lazy<_>) = x.Force() - match (eenv.valsInScope.TryFind cenv.g.sprintf_vref.Deref, - eenv.valsInScope.TryFind cenv.g.new_format_vref.Deref) with + match (eenv.valsInScope.TryFind g.sprintf_vref.Deref, + eenv.valsInScope.TryFind g.new_format_vref.Deref) with | Some(Lazy(Method(_,_,sprintfMethSpec,_,_,_,_))), Some(Lazy(Method(_,_,newFormatMethSpec,_,_,_,_))) -> // The type returned by the 'sprintf' call - let funcTy = EraseClosures.mkILFuncTy cenv.g.ilxPubCloEnv ilThisTy cenv.g.ilg.typ_String + let funcTy = EraseClosures.mkILFuncTy g.ilxPubCloEnv ilThisTy g.ilg.typ_String // Give the instantiation of the printf format object, i.e. a Format`5 object compatible with StringFormat let newFormatMethSpec = mkILMethSpec(newFormatMethSpec.MethodRef,AsObject, [// 'T -> string' funcTy // rest follow from 'StringFormat' GenUnitTy cenv eenv m - cenv.g.ilg.typ_String - cenv.g.ilg.typ_String - cenv.g.ilg.typ_String],[]) + g.ilg.typ_String + g.ilg.typ_String + g.ilg.typ_String],[]) // Instantiate with our own type let sprintfMethSpec = mkILMethSpec(sprintfMethSpec.MethodRef,AsObject,[],[funcTy]) // Here's the body of the method. Call printf, then invoke the function it returns - let callInstrs = EraseClosures.mkCallFunc cenv.g.ilxPubCloEnv (fun _ -> 0us) eenv.tyenv.Count Normalcall (Apps_app(ilThisTy, Apps_done cenv.g.ilg.typ_String)) + let callInstrs = EraseClosures.mkCallFunc g.ilxPubCloEnv (fun _ -> 0us) eenv.tyenv.Count Normalcall (Apps_app(ilThisTy, Apps_done g.ilg.typ_String)) let ilMethodDef = mkILNonGenericInstanceMethod (debugDisplayMethodName,ILMemberAccess.Assembly,[], - mkILReturn cenv.g.ilg.typ_Object, + mkILReturn g.ilg.typ_Object, mkMethodBody (true,[],2, nonBranchingInstrsToCode @@ -6543,7 +6544,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = yield mkNormalLdobj ilThisTy ] @ callInstrs), None)) - yield ilMethodDef.WithSpecialName |> AddNonUserCompilerGeneratedAttribs cenv.g + yield ilMethodDef.WithSpecialName |> AddNonUserCompilerGeneratedAttribs g | None,_ -> //printfn "sprintf not found" () @@ -6571,17 +6572,17 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = let isStructRecord = tycon.IsStructRecordOrUnionTycon // No type spec if the record is a value type - let spec = if isStructRecord then None else Some(cenv.g.ilg.typ_Object.TypeSpec) + let spec = if isStructRecord then None else Some(g.ilg.typ_Object.TypeSpec) let ilMethodDef = mkILSimpleStorageCtorWithParamNames(None, spec, ilThisTy, [], ChooseParamNames fieldNamesAndTypes, reprAccess) yield ilMethodDef // FSharp 1.0 bug 1988: Explicitly setting the ComVisible(true) attribute on an F# type causes an F# record to be emitted in a way that enables mutation for COM interop scenarios // FSharp 3.0 feature: adding CLIMutable to a record type causes emit of default constructor, and all fields get property setters // Records that are value types do not create a default constructor with CLIMutable or ComVisible - if not isStructRecord && (isCLIMutable || (TryFindFSharpBoolAttribute cenv.g cenv.g.attrib_ComVisibleAttribute tycon.Attribs = Some true)) then - yield mkILSimpleStorageCtor(None, Some cenv.g.ilg.typ_Object.TypeSpec, ilThisTy, [], [], reprAccess) + if not isStructRecord && (isCLIMutable || (TryFindFSharpBoolAttribute g g.attrib_ComVisibleAttribute tycon.Attribs = Some true)) then + yield mkILSimpleStorageCtor(None, Some g.ilg.typ_Object.TypeSpec, ilThisTy, [], [], reprAccess) - if not (tycon.HasMember cenv.g "ToString" []) then + if not (tycon.HasMember g "ToString" []) then yield! genToString ilThisTy | TFSharpObjectRepr r when tycon.IsFSharpDelegateTycon -> @@ -6594,14 +6595,14 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = let (TSlotSig(nm,ty,ctps,mtps,paraml,returnTy)) = ss let paraml = match paraml with - | [[tsp]] when isUnitTy cenv.g tsp.Type -> [] (* suppress unit arg *) + | [[tsp]] when isUnitTy g tsp.Type -> [] (* suppress unit arg *) | paraml -> paraml GenActualSlotsig m cenv eenvinner (TSlotSig(nm,ty,ctps,mtps,paraml,returnTy)) [] [] - for ilMethodDef in mkILDelegateMethods reprAccess cenv.g.ilg (cenv.g.iltyp_AsyncCallback, cenv.g.iltyp_IAsyncResult) (p,r) do + for ilMethodDef in mkILDelegateMethods reprAccess g.ilg (g.iltyp_AsyncCallback, g.iltyp_IAsyncResult) (p,r) do yield ilMethodDef | _ -> () - | TUnionRepr _ when not (tycon.HasMember cenv.g "ToString" []) -> + | TUnionRepr _ when not (tycon.HasMember g "ToString" []) -> yield! genToString ilThisTy | _ -> () ] @@ -6611,7 +6612,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = let ilFields = mkILFields ilFieldDefs let tdef, tdefDiscards = - let isSerializable = (TryFindFSharpBoolAttribute cenv.g cenv.g.attrib_AutoSerializableAttribute tycon.Attribs <> Some(false)) + let isSerializable = (TryFindFSharpBoolAttribute g g.attrib_AutoSerializableAttribute tycon.Attribs <> Some(false)) match tycon.TypeReprInfo with | TILObjectRepr _ -> @@ -6620,14 +6621,14 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = tdef, None | TRecdRepr _ | TFSharpObjectRepr _ as tyconRepr -> - let super = superOfTycon cenv.g tycon + let super = superOfTycon g tycon let ilBaseTy = GenType cenv.amap m eenvinner.tyenv super // Build a basic type definition let isObjectType = (match tyconRepr with TFSharpObjectRepr _ -> true | _ -> false) let ilAttrs = ilCustomAttrs @ - [mkCompilationMappingAttr cenv.g + [mkCompilationMappingAttr g (int (if isObjectType then SourceConstructFlags.ObjectType elif hiddenRepr then SourceConstructFlags.RecordType ||| SourceConstructFlags.NonPublicRepresentation @@ -6655,13 +6656,13 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = typeDefTrigger) // Set some the extra entries in the definition - let isTheSealedAttribute = tyconRefEq cenv.g tcref cenv.g.attrib_SealedAttribute.TyconRef + let isTheSealedAttribute = tyconRefEq g tcref g.attrib_SealedAttribute.TyconRef - let tdef = tdef.WithSealed(isSealedTy cenv.g thisTy || isTheSealedAttribute).WithSerializable(isSerializable).WithAbstract(isAbstract).WithImport(isComInteropTy cenv.g thisTy) + let tdef = tdef.WithSealed(isSealedTy g thisTy || isTheSealedAttribute).WithSerializable(isSerializable).WithAbstract(isAbstract).WithImport(isComInteropTy g thisTy) let tdef = tdef.With(methodImpls=mkILMethodImpls methodImpls) let tdLayout,tdEncoding = - match TryFindFSharpAttribute cenv.g cenv.g.attrib_StructLayoutAttribute tycon.Attribs with + match TryFindFSharpAttribute g g.attrib_StructLayoutAttribute tycon.Attribs with | Some (Attrib(_,_,[ AttribInt32Arg(layoutKind) ],namedArgs,_,_,_)) -> let decoder = AttributeDecoder namedArgs let ilPack = decoder.FindInt32 "Pack" 0x0 @@ -6729,19 +6730,19 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = tycon.UnionCasesArray |> Array.mapi (fun i ucspec -> { altName=ucspec.CompiledName altFields=GenUnionCaseRef cenv.amap m eenvinner.tyenv i ucspec.RecdFieldsArray - altCustomAttrs= mkILCustomAttrs (GenAttrs cenv eenv ucspec.Attribs @ [mkCompilationMappingAttrWithSeqNum cenv.g (int SourceConstructFlags.UnionCase) i]) }) + altCustomAttrs= mkILCustomAttrs (GenAttrs cenv eenv ucspec.Attribs @ [mkCompilationMappingAttrWithSeqNum g (int SourceConstructFlags.UnionCase) i]) }) let cuinfo = { cudReprAccess=reprAccess - cudNullPermitted=IsUnionTypeWithNullAsTrueValue cenv.g tycon + cudNullPermitted=IsUnionTypeWithNullAsTrueValue g tycon cudHelpersAccess=reprAccess - cudHasHelpers=ComputeUnionHasHelpers cenv.g tcref + cudHasHelpers=ComputeUnionHasHelpers g tcref cudDebugProxies= generateDebugProxies cudDebugDisplayAttributes= ilDebugDisplayAttributes cudAlternatives= alternatives cudWhere = None} let layout = - if isStructTy cenv.g thisTy then + if isStructTy g thisTy then if (match ilTypeDefKind with ILTypeDefKind.ValueType -> true | _ -> false) then // Structs with no instance fields get size 1, pack 0 ILTypeDefLayout.Sequential { Size=Some 1; Pack=Some 0us } @@ -6752,7 +6753,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = let cattrs = mkILCustomAttrs (ilCustomAttrs @ - [mkCompilationMappingAttr cenv.g + [mkCompilationMappingAttr g (int (if hiddenRepr then SourceConstructFlags.SumType ||| SourceConstructFlags.NonPublicRepresentation else SourceConstructFlags.SumType)) ]) @@ -6769,7 +6770,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = methodImpls= mkILMethodImpls methodImpls, nestedTypes=emptyILTypeDefs, implements = ilIntfTys, - extends= Some (if tycon.IsStructOrEnumTycon then cenv.g.iltyp_ValueType else cenv.g.ilg.typ_Object), + extends= Some (if tycon.IsStructOrEnumTycon then g.iltyp_ValueType else g.ilg.typ_Object), securityDecls= emptyILSecurityDecls) .WithLayout(layout) .WithSerializable(isSerializable) @@ -6778,7 +6779,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = .WithAccess(access) .WithInitSemantics(ILTypeInit.BeforeField) - let tdef2 = cenv.g.eraseClassUnionDef tref tdef cuinfo + let tdef2 = g.eraseClassUnionDef tref tdef cuinfo // Discard the user-supplied (i.e. prim-type.fs) implementations of the get_Empty, get_IsEmpty, get_Value and get_None and Some methods. // This is because we will replace their implementations by ones that load the unique @@ -6815,6 +6816,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = /// Generate the type for an F# exception declaration. and GenExnDef cenv mgbuf eenv m (exnc:Tycon) = + let g = cenv.g let exncref = mkLocalEntityRef exnc match exnc.ExceptionInfo with | TExnAbbrevRepr _ | TExnAsmRepr _ | TExnNone -> () @@ -6843,24 +6845,24 @@ and GenExnDef cenv mgbuf eenv m (exnc:Tycon) = propertyType = ilPropType, init = None, args = [], - customAttrs=mkILCustomAttrs (GenAttrs cenv eenv fld.PropertyAttribs @ [mkCompilationMappingAttrWithSeqNum cenv.g (int SourceConstructFlags.Field) i])) + customAttrs=mkILCustomAttrs (GenAttrs cenv eenv fld.PropertyAttribs @ [mkCompilationMappingAttrWithSeqNum g (int SourceConstructFlags.Field) i])) yield (ilMethodDef,ilFieldDef,ilPropDef,(ilPropName,ilFieldName,ilPropType)) ] |> List.unzip4 let ilCtorDef = - mkILSimpleStorageCtorWithParamNames(None, Some cenv.g.iltyp_Exception.TypeSpec, ilThisTy, [], ChooseParamNames fieldNamesAndTypes, reprAccess) + mkILSimpleStorageCtorWithParamNames(None, Some g.iltyp_Exception.TypeSpec, ilThisTy, [], ChooseParamNames fieldNamesAndTypes, reprAccess) // In compiled code, all exception types get a parameterless constructor for use with XML serialization // This does default-initialization of all fields let ilCtorDefNoArgs = if not (isNil fieldNamesAndTypes) then - [ mkILSimpleStorageCtor(None, Some cenv.g.iltyp_Exception.TypeSpec, ilThisTy, [], [], reprAccess) ] + [ mkILSimpleStorageCtor(None, Some g.iltyp_Exception.TypeSpec, ilThisTy, [], [], reprAccess) ] else [] let serializationRelatedMembers = // do not emit serialization related members if target framework lacks SerializationInfo or StreamingContext - match cenv.g.iltyp_SerializationInfo, cenv.g.iltyp_StreamingContext with + match g.iltyp_SerializationInfo, g.iltyp_StreamingContext with | Some serializationInfoType, Some streamingContextType -> let ilCtorDefForSerialziation = mkILCtor(ILMemberAccess.Family, @@ -6871,7 +6873,7 @@ and GenExnDef cenv mgbuf eenv m (exnc:Tycon) = [ mkLdarg0 mkLdarg 1us mkLdarg 2us - mkNormalCall (mkILCtorMethSpecForTy (cenv.g.iltyp_Exception,[serializationInfoType; streamingContextType])) ] + mkNormalCall (mkILCtorMethSpecForTy (g.iltyp_Exception,[serializationInfoType; streamingContextType])) ] ,None)) //#if BE_SECURITY_TRANSPARENT diff --git a/src/fsharp/InfoReader.fs b/src/fsharp/InfoReader.fs index e23673d94ee..eda63c42d5b 100644 --- a/src/fsharp/InfoReader.fs +++ b/src/fsharp/InfoReader.fs @@ -189,7 +189,7 @@ let IsIndexerType g amap ty = isListTy g ty || match tryDestAppTy g ty with | ValueSome tcref -> - let _, entityTy = generalizeTyconRef tcref + let entityTy = generalizedTyOfTyconRef g tcref let props = GetImmediateIntrinsicPropInfosOfType (None, AccessibleFromSomeFSharpCode) g amap range0 entityTy props |> List.exists (fun x -> x.PropertyName = "Item") | ValueNone -> false @@ -720,7 +720,7 @@ let GetSigOfFunctionForDelegate (infoReader:InfoReader) delty m ad = | _ -> compiledViewOfDelArgTys let delRetTy = invokeMethInfo.GetFSharpReturnTy(amap, m, minst) CheckMethInfoAttributes g m None invokeMethInfo |> CommitOperationResult - let fty = mkIteratedFunTy fsharpViewOfDelArgTys delRetTy + let fty = mkIteratedFunTy g fsharpViewOfDelArgTys delRetTy SigOfFunctionForDelegate(invokeMethInfo,compiledViewOfDelArgTys,delRetTy,fty) /// Try and interpret a delegate type as a "standard" .NET delegate type associated with an event, with a "sender" parameter. diff --git a/src/fsharp/InnerLambdasToTopLevelFuncs.fs b/src/fsharp/InnerLambdasToTopLevelFuncs.fs index da5c49f4bb7..b48d074984f 100644 --- a/src/fsharp/InnerLambdasToTopLevelFuncs.fs +++ b/src/fsharp/InnerLambdasToTopLevelFuncs.fs @@ -832,7 +832,7 @@ let CreateNewValuesForTLR g tlrS arityM fclassM envPackM = let newTps = envp.ep_etps @ tps let fHatTy = let newArgtys = List.map typeOfVal envp.ep_aenvs @ argtys - mkLambdaTy newTps newArgtys res + mkLambdaTy g newTps newArgtys res let fHatArity = MakeSimpleArityInfo newTps (envp.ep_aenvs.Length + wf) let fHatName = globalNng.FreshCompilerGeneratedName(name,m) @@ -975,7 +975,7 @@ module Pass4_RewriteAssembly = (* Why are we applying TLR if the thing already has an arity? *) let fOrig = setValHasNoArity fOrig let fBind = - mkMultiLambdaBind fOrig letSeqPtOpt m tps vss + mkMultiLambdaBind penv.g fOrig letSeqPtOpt m tps vss (mkApps penv.g ((exprForVal m fHat, fHat.Type), [List.map mkTyparTy (envp.ep_etps @ tps)], @@ -990,7 +990,7 @@ module Pass4_RewriteAssembly = // Don't take all the variables - only up to length wf let vssTake,vssDrop = List.splitAt wf vss // put the variables back on - let b,rty = mkMultiLambdasCore b.Range vssDrop (b,rty) + let b,rty = mkMultiLambdasCore penv.g b.Range vssDrop (b,rty) // fHat, args let m = fHat.Range // Add the type variables to the front @@ -1000,7 +1000,7 @@ module Pass4_RewriteAssembly = let fHat_body = mkLetsFromBindings m envp.ep_unpack b let fHat_body = mkLetsFromBindings m shortRecBinds fHat_body // bind "f" if have short recursive calls (somewhere) // fHat binding, f rebinding - let fHatBind = mkMultiLambdaBind fHat letSeqPtOpt m fHat_tps fHat_args (fHat_body,rty) + let fHatBind = mkMultiLambdaBind penv.g fHat letSeqPtOpt m fHat_tps fHat_args (fHat_body,rty) fHatBind let rebinds = binds |> List.map fRebinding let shortRecBinds = rebinds |> List.filter (fun b -> penv.recShortCallS.Contains(b.Var)) diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs index 536fc7ff7dd..c72270cb653 100644 --- a/src/fsharp/MethodCalls.fs +++ b/src/fsharp/MethodCalls.fs @@ -1098,7 +1098,7 @@ module ProvidedMethodCalls = let vsT = List.map addVar vs let delegateBodyExprT = exprToExpr delegateBodyExpr List.iter removeVar vs - let lambdaExpr = mkLambdas m [] vsT (delegateBodyExprT, tyOfExpr g delegateBodyExprT) + let lambdaExpr = mkLambdas g m [] vsT (delegateBodyExprT, tyOfExpr g delegateBodyExprT) let lambdaExprTy = tyOfExpr g lambdaExpr let infoReader = InfoReader(g, amap) let exprT = CoerceFromFSharpFuncToDelegate g amap infoReader AccessorDomain.AccessibleFromSomewhere lambdaExprTy m lambdaExpr delegateTyT @@ -1290,7 +1290,7 @@ let MethInfoChecks g amap isInstance tyargsOpt objArgs ad m (minfo:MethInfo) = match objArgs, ad with | [objArg], AccessibleFrom(paths, Some tcref) -> let objArgTy = tyOfExpr g objArg - let ty = generalizedTyconRef tcref + let ty = generalizedTyOfTyconRef g tcref // We get to keep our rights if the type we're in subsumes the object argument type if TypeFeasiblySubsumesType 0 g amap m ty CanCoerce objArgTy then ad diff --git a/src/fsharp/MethodOverrides.fs b/src/fsharp/MethodOverrides.fs index 77b98010d31..c2119d843a6 100644 --- a/src/fsharp/MethodOverrides.fs +++ b/src/fsharp/MethodOverrides.fs @@ -235,7 +235,7 @@ module DispatchSlotChecking = let OverrideImplementsDispatchSlot g amap m dispatchSlot availPriorOverride = IsExactMatch g amap m dispatchSlot availPriorOverride && // The override has to actually be in some subtype of the dispatch slot - ExistsHeadTypeInEntireHierarchy g amap m (generalizedTyconRef availPriorOverride.BoundingTyconRef) dispatchSlot.DeclaringTyconRef + ExistsHeadTypeInEntireHierarchy g amap m (generalizedTyOfTyconRef g availPriorOverride.BoundingTyconRef) dispatchSlot.DeclaringTyconRef /// Check if a dispatch slot is already implemented let DispatchSlotIsAlreadyImplemented g amap m availPriorOverridesKeyed (dispatchSlot: MethInfo) = @@ -527,7 +527,7 @@ module DispatchSlotChecking = let tcaug = tycon.TypeContents let interfaces = tycon.ImmediateInterfacesOfFSharpTycon |> List.map (fun (ity,_compgen,m) -> (ity,m)) - let overallTy = generalizedTyconRef (mkLocalTyconRef tycon) + let overallTy = generalizedTyOfTyconRef g (mkLocalTyconRef tycon) let allReqdTys = (overallTy,tycon.Range) :: interfaces diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs index beadf2fd582..d88e90a9cad 100644 --- a/src/fsharp/NameResolution.fs +++ b/src/fsharp/NameResolution.fs @@ -422,7 +422,7 @@ let private GetCSharpStyleIndexedExtensionMembersForTyconRef (amap:Import.Import // Type must be non-generic and have 'Extension' attribute if isNil(tcrefOfStaticClass.Typars(m)) && TyconRefHasAttribute g m g.attrib_ExtensionAttribute tcrefOfStaticClass then let pri = NextExtensionMethodPriority() - let ty = generalizedTyconRef tcrefOfStaticClass + let ty = generalizedTyOfTyconRef g tcrefOfStaticClass // Get the 'plain' methods, not interpreted as extension methods let minfos = GetImmediateIntrinsicMethInfosOfType (None, AccessorDomain.AccessibleFromSomeFSharpCode) g amap m ty @@ -576,8 +576,7 @@ let AddActivePatternResultTagsToNameEnv (apinfo: PrettyNaming.ActivePatternInfo) /// Generalize a union case, from Cons --> List.Cons let GeneralizeUnionCaseRef (ucref:UnionCaseRef) = - UnionCaseInfo (fst (generalizeTyconRef ucref.TyconRef), ucref) - + UnionCaseInfo (generalTyconRefInst ucref.TyconRef, ucref) /// Add type definitions to the sub-table of the environment indexed by name and arity let AddTyconsByDemangledNameAndArity (bulkAddMode: BulkAdd) (tcrefs: TyconRef[]) (tab: LayeredMap) = @@ -664,7 +663,7 @@ let private AddPartsOfTyconRefToNameEnv bulkAddMode ownDefinition (g:TcGlobals) protectAssemblyExploration false (fun () -> - let ty = generalizedTyconRef tcref + let ty = generalizedTyOfTyconRef g tcref isClassTy g ty || isStructTy g ty) if mayHaveConstruction then @@ -849,7 +848,7 @@ let AddDeclaredTyparsToNameEnv check nenv typars = /// a fresh set of inference type variables for the type parameters of the union type. let FreshenTycon (ncenv: NameResolver) m (tcref:TyconRef) = let tinst = ncenv.InstantiationGenerator m (tcref.Typars m) - let improvedTy = ncenv.g.decompileType tcref tinst KnownNonNull + let improvedTy = ncenv.g.decompileType tcref tinst ncenv.g.knownWithoutNull improvedTy /// Convert a reference to a union case into a UnionCaseInfo that includes @@ -3662,7 +3661,10 @@ let rec ResolvePartialLongIdentInType (ncenv: NameResolver) nenv isApplicableMet // e.g. .. let FullTypeOfPinfo(pinfo:PropInfo) = let rty = pinfo.GetPropertyType(amap,m) - let rty = if pinfo.IsIndexer then mkRefTupledTy g (pinfo.GetParamTypes(amap, m)) --> rty else rty + let rty = + if pinfo.IsIndexer then + mkFunTy g (mkRefTupledTy g (pinfo.GetParamTypes(amap, m))) rty + else rty rty (ty @@ -3845,7 +3847,8 @@ let rec ResolvePartialLongIdentInModuleOrNamespace (ncenv: NameResolver) nenv is |> List.collect (fun tycon -> let tcref = modref.NestedTyconRef tycon if not (IsTyconUnseenObsoleteSpec ad g ncenv.amap m tcref allowObsolete) then - tcref |> generalizedTyconRef |> ResolvePartialLongIdentInType ncenv nenv isApplicableMeth m ad true rest + let ty = generalizedTyOfTyconRef g tcref + ResolvePartialLongIdentInType ncenv nenv isApplicableMeth m ad true rest ty else [])) @@ -4331,7 +4334,11 @@ let rec ResolvePartialLongIdentInTypeForItem (ncenv: NameResolver) nenv m ad sta // e.g. .. let fullTypeOfPinfo (pinfo: PropInfo) = let rty = pinfo.GetPropertyType(amap,m) - let rty = if pinfo.IsIndexer then mkRefTupledTy g (pinfo.GetParamTypes(amap, m)) --> rty else rty + let rty = + if pinfo.IsIndexer then + mkFunTy g (mkRefTupledTy g (pinfo.GetParamTypes(amap, m))) rty + else + rty rty let pinfos = @@ -4439,7 +4446,8 @@ let rec ResolvePartialLongIdentInModuleOrNamespaceForItem (ncenv: NameResolver) for tycon in LookupTypeNameInEntityNoArity m id modref.ModuleOrNamespaceType do let tcref = modref.NestedTyconRef tycon if not (IsTyconUnseenObsoleteSpec ad g ncenv.amap m tcref true) then - yield! tcref |> generalizedTyconRef |> ResolvePartialLongIdentInTypeForItem ncenv nenv m ad true rest item + let ty = tcref |> generalizedTyOfTyconRef g + yield! ResolvePartialLongIdentInTypeForItem ncenv nenv m ad true rest item ty } let rec PartialResolveLookupInModuleOrNamespaceAsModuleOrNamespaceThenLazy f plid (modref: ModuleOrNamespaceRef) = diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs index c1a7474a517..ac1e4cc99a1 100755 --- a/src/fsharp/NicePrint.fs +++ b/src/fsharp/NicePrint.fs @@ -910,7 +910,7 @@ module private PrintTypes = match nullness.Evaluate() with | NullnessInfo.WithNull -> part2 ^^ rightL (tagText "?") | NullnessInfo.WithoutNull -> part2 - | NullnessInfo.Oblivious -> part2 ^^ wordL (tagText "%") + | NullnessInfo.ObliviousToNull -> part2 ^^ wordL (tagText "%") /// Layout a type, taking precedence into account to insert brackets where needed and layoutTypeWithInfoAndPrec denv env prec ty = @@ -1400,7 +1400,7 @@ module InfoMemberPrinting = let prettyLayoutOfPropInfoFreeStyle g amap m denv (pinfo: PropInfo) = let rty = pinfo.GetPropertyType(amap,m) - let rty = if pinfo.IsIndexer then mkRefTupledTy g (pinfo.GetParamTypes(amap, m)) --> rty else rty + let rty = if pinfo.IsIndexer then mkFunTy g (mkRefTupledTy g (pinfo.GetParamTypes(amap, m))) rty else rty let rty, _ = PrettyTypes.PrettifyType g rty let tagProp = match pinfo.ArbitraryValRef with @@ -1649,7 +1649,7 @@ module private TastDefinitionPrinting = let layoutTycon (denv:DisplayEnv) (infoReader:InfoReader) ad m simplified typewordL (tycon:Tycon) = let g = denv.g - let _,ty = generalizeTyconRef (mkLocalTyconRef tycon) + let ty = generalizedTyOfTyconRef g (mkLocalTyconRef tycon) let start, name = let n = tycon.DisplayName if isStructTy g ty then Some "struct", tagStruct n diff --git a/src/fsharp/Optimizer.fs b/src/fsharp/Optimizer.fs index a6937f36fea..72053856b5e 100644 --- a/src/fsharp/Optimizer.fs +++ b/src/fsharp/Optimizer.fs @@ -1745,7 +1745,7 @@ let TryDetectQueryQuoteAndRun cenv (expr:Expr) = let resultExprAfterConvertToResultTy = match reqdResultInfo, exprIsEnumerableInfo with | Some _, Some _ | None, None -> resultExpr // the expression is a QuerySource, the result is a QuerySource, nothing to do - | Some resultElemTy, None -> mkCallGetQuerySourceAsEnumerable cenv.g expr.Range resultElemTy (TType_app(cenv.g.tcref_System_Collections_IEnumerable, [], KnownNonNull)) resultExpr + | Some resultElemTy, None -> mkCallGetQuerySourceAsEnumerable cenv.g expr.Range resultElemTy (TType_app(cenv.g.tcref_System_Collections_IEnumerable, [], g.knownWithoutNull)) resultExpr | None, Some (resultElemTy, qTy) -> mkCallNewQuerySource cenv.g expr.Range resultElemTy qTy resultExpr Some resultExprAfterConvertToResultTy | None -> @@ -1766,10 +1766,11 @@ let TryDetectQueryQuoteAndRun cenv (expr:Expr) = //------------------------------------------------------------------------- let rec OptimizeExpr cenv (env:IncrementalOptimizationEnv) expr = + let g = cenv.g // Eliminate subsumption coercions for functions. This must be done post-typechecking because we need // complete inference types. - let expr = NormalizeAndAdjustPossibleSubsumptionExprs cenv.g expr + let expr = NormalizeAndAdjustPossibleSubsumptionExprs g expr let expr = stripExpr expr @@ -1797,13 +1798,13 @@ let rec OptimizeExpr cenv (env:IncrementalOptimizationEnv) expr = (* REVIEW: fold the next two cases together *) | Expr.Lambda(_lambdaId, _, _, argvs, _body, m, rty) -> let topValInfo = ValReprInfo ([], [argvs |> List.map (fun _ -> ValReprInfo.unnamedTopArg1)], ValReprInfo.unnamedRetVal) - let ty = mkMultiLambdaTy m argvs rty + let ty = mkMultiLambdaTy cenv.g m argvs rty OptimizeLambdas None cenv env topValInfo expr ty | Expr.TyLambda(_lambdaId, tps, _body, _m, rty) -> let topValInfo = ValReprInfo (ValReprInfo.InferTyparInfo tps, [], ValReprInfo.unnamedRetVal) let ty = mkForallTyIfNeeded tps rty OptimizeLambdas None cenv env topValInfo expr ty - | Expr.TyChoose _ -> OptimizeExpr cenv env (TypeRelations.ChooseTyparSolutionsForFreeChoiceTypars cenv.g cenv.amap expr) + | Expr.TyChoose _ -> OptimizeExpr cenv env (TypeRelations.ChooseTyparSolutionsForFreeChoiceTypars g cenv.amap expr) | Expr.Match(spMatch, exprm, dtree, targets, m, ty) -> OptimizeMatch cenv env (spMatch, exprm, dtree, targets, m, ty) | Expr.LetRec (binds, e, m, _) -> OptimizeLetRec cenv env (binds, e, m) | Expr.StaticOptimization (constraints, e2, e3, m) -> @@ -2772,7 +2773,7 @@ and OptimizeLambdas (vspec: Val option) cenv env topValInfo e ety = let env = List.foldBack (BindInternalValsToUnknown cenv) vsl env let env = BindInternalValsToUnknown cenv (Option.toList baseValOpt) env let body', bodyinfo = OptimizeExpr cenv env body - let expr' = mkMemberLambdas m tps ctorThisValOpt baseValOpt vsl (body', bodyty) + let expr' = mkMemberLambdas cenv.g m tps ctorThisValOpt baseValOpt vsl (body', bodyty) let arities = vsl.Length let arities = if isNil tps then arities else 1+arities let bsize = bodyinfo.TotalSize @@ -2813,7 +2814,7 @@ and OptimizeLambdas (vspec: Val option) cenv env topValInfo e ety = if fvs.UsesMethodLocalConstructs || fvs.FreeLocals.Contains baseVal then UnknownValue else - let expr2 = mkMemberLambdas m tps ctorThisValOpt None vsl (body', bodyty) + let expr2 = mkMemberLambdas cenv.g m tps ctorThisValOpt None vsl (body', bodyty) CurriedLambdaValue (lambdaId, arities, bsize, expr2, ety) @@ -2909,9 +2910,9 @@ and ConsiderSplitToMethod flag threshold cenv env (e, einfo) = match env.latestBoundId with | Some id -> id.idText+suffixForVariablesThatMayNotBeEliminated | None -> suffixForVariablesThatMayNotBeEliminated - let fv, fe = mkCompGenLocal m nm (cenv.g.unit_ty --> ty) + let fv, fe = mkCompGenLocal m nm (mkFunTy cenv.g cenv.g.unit_ty ty) mkInvisibleLet m fv (mkLambda m uv (e, ty)) - (primMkApp (fe, (cenv.g.unit_ty --> ty)) [] [mkUnit cenv.g m] m), + (primMkApp (fe, (mkFunTy cenv.g cenv.g.unit_ty ty)) [] [mkUnit cenv.g m] m), {einfo with FunctionSize=callSize } else e, einfo @@ -3036,6 +3037,7 @@ and OptimizeSwitchFallback cenv env (e', einfo, cases, dflt, m) = and OptimizeBinding cenv isRec env (TBind(vref, expr, spBind)) = try + let g = cenv.g // The aim here is to stop method splitting for direct-self-tailcalls. We do more than that: if an expression // occurs in the body of recursively defined values RVS, then we refuse to split @@ -3095,7 +3097,7 @@ and OptimizeBinding cenv isRec env (TBind(vref, expr, spBind)) = if ValueOption.isSome mbrTyconRef.TryDeref then // Check if this is a subtype of MarshalByRefObject assert (cenv.g.system_MarshalByRefObject_ty.IsSome) - ExistsSameHeadTypeInHierarchy cenv.g cenv.amap vref.Range (generalizedTyconRef tcref) cenv.g.system_MarshalByRefObject_ty.Value + ExistsSameHeadTypeInHierarchy cenv.g cenv.amap vref.Range (generalizedTyOfTyconRef g tcref) cenv.g.system_MarshalByRefObject_ty.Value else false | ParentNone -> false) || diff --git a/src/fsharp/PatternMatchCompilation.fs b/src/fsharp/PatternMatchCompilation.fs index 625b23a70d0..3effafe7321 100644 --- a/src/fsharp/PatternMatchCompilation.fs +++ b/src/fsharp/PatternMatchCompilation.fs @@ -538,7 +538,6 @@ let (|ListEmptyDiscrim|_|) g = function /// switches, string switches and floating point switches are treated in the /// same way as DecisionTreeTest.IsInst. let rec BuildSwitch inpExprOpt g expr edges dflt m = - if verbose then dprintf "--> BuildSwitch@%a, #edges = %A, dflt.IsSome = %A\n" outputRange m (List.length edges) (Option.isSome dflt) match edges,dflt with | [], None -> failwith "internal error: no edges and no default" | [], Some dflt -> dflt (* NOTE: first time around, edges<>[] *) @@ -768,7 +767,7 @@ let CompilePatternBasic | ThrowIncompleteMatchException -> mkThrow matchm resultTy - (mkExnExpr(mk_MFCore_tcref g.fslibCcu "MatchFailureException", + (mkExnExpr(g.MatchFailureException_tcr, [ mkString g matchm matchm.FileName mkInt g matchm matchm.StartLine mkInt g matchm matchm.StartColumn],matchm)) diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index 635fe5d47f5..8d12797991b 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -996,7 +996,7 @@ and CheckExpr (cenv:cenv) (env:env) origExpr (context:PermitByRefExpr) : Limit = | Expr.Lambda(_,_ctorThisValOpt,_baseValOpt,argvs,_,m,rty) -> let topValInfo = ValReprInfo ([],[argvs |> List.map (fun _ -> ValReprInfo.unnamedTopArg1)],ValReprInfo.unnamedRetVal) - let ty = mkMultiLambdaTy m argvs rty in + let ty = mkMultiLambdaTy cenv.g m argvs rty CheckLambdas false None cenv env false topValInfo false expr m ty PermitByRefExpr.Yes | Expr.TyLambda(_,tps,_,m,rty) -> @@ -1772,8 +1772,8 @@ let CheckModuleBinding cenv env (TBind(v,e,_) as bind) = if v.IsExtensionMember then tcref.ModuleOrNamespaceType.AllValsAndMembersByLogicalNameUncached.[v.LogicalName] |> List.iter (fun v2 -> if v2.IsExtensionMember && not (valEq v v2) && v.CompiledName = v2.CompiledName then - let minfo1 = FSMeth(g, generalizedTyconRef tcref, mkLocalValRef v, Some 0UL) - let minfo2 = FSMeth(g, generalizedTyconRef tcref, mkLocalValRef v2, Some 0UL) + let minfo1 = FSMeth(g, generalizedTyOfTyconRef g tcref, mkLocalValRef v, Some 0UL) + let minfo2 = FSMeth(g, generalizedTyOfTyconRef g tcref, mkLocalValRef v2, Some 0UL) if tyconRefEq g v.MemberApparentEntity v2.MemberApparentEntity && MethInfosEquivByNameAndSig EraseAll true g cenv.amap v.Range minfo1 minfo2 then errorR(Duplicate(kind,v.DisplayName,v.Range))) @@ -1835,7 +1835,7 @@ let CheckEntityDefn cenv env (tycon:Entity) = let g = cenv.g let m = tycon.Range let tcref = mkLocalTyconRef tycon - let ty = generalizedTyconRef tcref + let ty = generalizedTyOfTyconRef g tcref let env = { env with reflect = env.reflect || HasFSharpAttribute g g.attrib_ReflectedDefinitionAttribute tycon.Attribs } let env = BindTypars g env (tycon.Typars(m)) diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs index 2ccecc915d1..e6e87647db6 100644 --- a/src/fsharp/QuotationTranslator.fs +++ b/src/fsharp/QuotationTranslator.fs @@ -200,6 +200,7 @@ and ConvExpr cenv env (expr : Expr) = EmitDebugInfoIfNecessary cenv env expr.Range (ConvExprCore cenv env expr) and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP.ExprData = + let g = cenv.g let expr = DetectAndOptimizeForExpression cenv.g OptimizeIntRangesOnly expr @@ -215,9 +216,9 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. match expr with // Detect expression tree exprSplices | Expr.App(InnerExprPat(Expr.Val(vf,_,_)),_,_,x0::rest,m) - when isSplice cenv.g vf -> + when isSplice g vf -> let idx = cenv.exprSplices.Count - let ty = tyOfExpr cenv.g expr + let ty = tyOfExpr g expr match (freeInExpr CollectTyparsAndLocalsNoCaching x0).FreeLocals |> Seq.tryPick (fun v -> if env.vs.ContainsVal v then Some v else None) with | Some v -> errorR(Error(FSComp.SR.crefBoundVarUsedInSplice(v.DisplayName), v.Range)) @@ -227,24 +228,24 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. let hole = QP.mkHole(ConvType cenv env m ty,idx) (hole, rest) ||> List.fold (fun fR arg -> QP.mkApp (fR,ConvExpr cenv env arg)) - | ModuleValueOrMemberUse cenv.g (vref,vFlags,_f,_fty,tyargs,curriedArgs) - when not (isSplice cenv.g vref) -> + | ModuleValueOrMemberUse g (vref,vFlags,_f,_fty,tyargs,curriedArgs) + when not (isSplice g vref) -> let m = expr.Range let (numEnclTypeArgs,_,isNewObj,valUseFlags,isSelfInit,takesInstanceArg,isPropGet,isPropSet) = - GetMemberCallInfo cenv.g (vref,vFlags) + GetMemberCallInfo g (vref,vFlags) let isMember,tps,curriedArgInfos,retTy = match vref.MemberInfo with | Some _ when not vref.IsExtensionMember -> // This is an application of a member method // We only count one argument block for these. - let tps,curriedArgInfos,retTy,_ = GetTypeOfIntrinsicMemberInCompiledForm cenv.g vref + let tps,curriedArgInfos,retTy,_ = GetTypeOfIntrinsicMemberInCompiledForm g vref true,tps,curriedArgInfos,retTy | _ -> // This is an application of a module value or extension member let arities = arityOfVal vref.Deref - let tps,curriedArgInfos,retTy,_ = GetTopValTypeInCompiledForm cenv.g arities vref.Type m + let tps,curriedArgInfos,retTy,_ = GetTopValTypeInCompiledForm g arities vref.Type m false,tps,curriedArgInfos,retTy // Compute the object arguments as they appear in a compiled call @@ -274,8 +275,8 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. | None -> error(InternalError("no arity information found for F# value " + vref.LogicalName,vref.Range)) | Some a -> a - let expr,exprty = AdjustValForExpectedArity cenv.g m vref vFlags topValInfo - ConvExpr cenv env (MakeApplicationAndBetaReduce cenv.g (expr,exprty,[tyargs],curriedArgs,m)) + let expr,exprty = AdjustValForExpectedArity g m vref vFlags topValInfo + ConvExpr cenv env (MakeApplicationAndBetaReduce g (expr,exprty,[tyargs],curriedArgs,m)) else // Too many arguments? Chop let (curriedArgs:Expr list ),laterArgs = List.splitAt nCurriedArgInfos curriedArgs @@ -334,7 +335,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. // Blast type application nodes and expression application nodes apart so values are left with just their type arguments | Expr.App(f,fty,(_ :: _ as tyargs),(_ :: _ as args),m) -> - let rfty = applyForallTy cenv.g fty tyargs + let rfty = applyForallTy g fty tyargs ConvExpr cenv env (primMkApp (primMkApp (f,fty) tyargs [] m, rfty) [] args m) // Uses of possibly-polymorphic values @@ -368,7 +369,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. QP.mkLetRec(bindsR,bodyR) | Expr.Lambda(_,_,_,vs,b,_,_) -> - let v,b = MultiLambdaToTupledLambda cenv.g vs b + let v,b = MultiLambdaToTupledLambda g vs b let vR = ConvVal cenv env v let bR = ConvExpr cenv (BindVal env v) b QP.mkLambda(vR, bR) @@ -377,7 +378,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. // F# 2.0-3.1 had a bug with nested 'raw' quotations. F# 4.0 + FSharp.Core 4.4.0.0+ allows us to do the right thing. if cenv.quotationFormat = QuotationSerializationFormat.FSharp_40_Plus && // Look for a 'raw' quotation - tyconRefEq cenv.g (tcrefOfAppTy cenv.g ety) cenv.g.raw_expr_tcr + tyconRefEq g (tcrefOfAppTy g ety) g.raw_expr_tcr then QP.mkQuoteRaw40(ConvExpr cenv env ast) else @@ -391,16 +392,16 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. ConvDecisionTree cenv env tgs typR dtree // initialization check - | Expr.Sequential(ObjectInitializationCheck cenv.g, x1, NormalSeq, _, _) -> ConvExpr cenv env x1 + | Expr.Sequential(ObjectInitializationCheck g, x1, NormalSeq, _, _) -> ConvExpr cenv env x1 | Expr.Sequential (x0,x1,NormalSeq,_,_) -> QP.mkSequential(ConvExpr cenv env x0, ConvExpr cenv env x1) - | Expr.Obj (_,ty,_,_,[TObjExprMethod(TSlotSig(_,ctyp, _,_,_,_),_,tps,[tmvs],e,_) as tmethod],_,m) when isDelegateTy cenv.g ty -> - let f = mkLambdas m tps tmvs (e,GetFSharpViewOfReturnType cenv.g (returnTyOfMethod cenv.g tmethod)) + | Expr.Obj (_,ty,_,_,[TObjExprMethod(TSlotSig(_,ctyp, _,_,_,_),_,tps,[tmvs],e,_) as tmethod],_,m) when isDelegateTy g ty -> + let f = mkLambdas g m tps tmvs (e,GetFSharpViewOfReturnType g (returnTyOfMethod g tmethod)) let fR = ConvExpr cenv env f let tyargR = ConvType cenv env m ctyp QP.mkDelegate(tyargR, fR) | Expr.StaticOptimization (_,_,x,_) -> ConvExpr cenv env x - | Expr.TyChoose _ -> ConvExpr cenv env (TypeRelations.ChooseTyparSolutionsForFreeChoiceTypars cenv.g cenv.amap expr) + | Expr.TyChoose _ -> ConvExpr cenv env (TypeRelations.ChooseTyparSolutionsForFreeChoiceTypars g cenv.amap expr) | Expr.Sequential (x0,x1,ThenDoSeq,_,_) -> QP.mkSequential(ConvExpr cenv env x0, ConvExpr cenv env x1) | Expr.Obj (_lambdaId,_typ,_basev,_basecall,_overrides,_iimpls,m) -> wfail(Error(FSComp.SR.crefQuotationsCantContainObjExprs(),m)) @@ -414,7 +415,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. | TOp.Tuple tupInfo,tyargs,_ -> - let tyR = ConvType cenv env m (mkAnyTupledTy cenv.g tupInfo tyargs) + let tyR = ConvType cenv env m (mkAnyTupledTy g tupInfo tyargs) let argsR = ConvExprs cenv env args QP.mkTuple(tyR,argsR) // TODO: propagate to quotations @@ -441,7 +442,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. | TOp.TupleFieldGet(tupInfo,n),tyargs,[e] -> let eR = ConvLValueExpr cenv env e - let tyR = ConvType cenv env m (mkAnyTupledTy cenv.g tupInfo tyargs) + let tyR = ConvType cenv env m (mkAnyTupledTy g tupInfo tyargs) QP.mkTupleGet(tyR, n, eR) | TOp.ILAsm(([ I_ldfld(_,_,fspec) ] @@ -457,12 +458,12 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. QP.mkFieldSet( (parentTyconR, fspec.Name),tyargsR, argsR) | TOp.ILAsm([ AI_ceq ],_),_,[arg1;arg2] -> - let ty = tyOfExpr cenv.g arg1 - let eq = mkCallEqualsOperator cenv.g m ty arg1 arg2 + let ty = tyOfExpr g arg1 + let eq = mkCallEqualsOperator g m ty arg1 arg2 ConvExpr cenv env eq | TOp.ILAsm([ I_throw ],_),_,[arg1] -> - let raiseExpr = mkCallRaise cenv.g m (tyOfExpr cenv.g expr) arg1 + let raiseExpr = mkCallRaise g m (tyOfExpr g expr) arg1 ConvExpr cenv env raiseExpr | TOp.ILAsm(_il,_),_,_ -> @@ -479,7 +480,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. QP.mkCtorCall( { ctorParent = parentTyconR ctorArgTypes = methArgTypesR }, [], argsR) - let exnTypeR = ConvType cenv env m cenv.g.exn_ty + let exnTypeR = ConvType cenv env m g.exn_ty QP.mkCoerce(exnTypeR, objR) | TOp.ValFieldSet rfref, _tinst,args -> @@ -505,19 +506,19 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. let parentTyconR = ConvTyconRef cenv tcref m let propRetTypeR = ConvType cenv env m fspec.FormalType let callArgR = ConvExpr cenv env obj - let exnTypeR = ConvType cenv env m (generalizedTyconRef tcref) + let exnTypeR = ConvType cenv env m (generalizedTyOfTyconRef g tcref) QP.mkPropGet( (parentTyconR, fspec.Name,propRetTypeR,[]),[], [QP.mkCoerce (exnTypeR, callArgR)]) | TOp.Coerce,[tgtTy;srcTy],[x] -> let xR = ConvExpr cenv env x - if typeEquiv cenv.g tgtTy srcTy then + if typeEquiv g tgtTy srcTy then xR else QP.mkCoerce(ConvType cenv env m tgtTy,xR) | TOp.Reraise,[toTy],[] -> // rebuild reraise() and Convert - mkReraiseLibCall cenv.g toTy m |> ConvExpr cenv env + mkReraiseLibCall g toTy m |> ConvExpr cenv env | TOp.LValueOp(LAddrOf _,vref),[],[] -> QP.mkAddressOf(ConvValRef false cenv env m vref []) @@ -528,7 +529,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. | TOp.LValueOp(LSet,vref),[],[e] -> // Sets of module values become property sets match vref.DeclaringEntity with - | Parent tcref when IsCompiledAsStaticProperty cenv.g vref.Deref -> + | Parent tcref when IsCompiledAsStaticProperty g vref.Deref -> let parentTyconR = ConvTyconRef cenv tcref m let propName = vref.CompiledName let propTy = ConvType cenv env m vref.Type @@ -545,10 +546,10 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. | TOp.While _,[],[Expr.Lambda(_,_,_,[_],test,_,_);Expr.Lambda(_,_,_,[_],body,_,_)] -> QP.mkWhileLoop(ConvExpr cenv env test, ConvExpr cenv env body) - | TOp.For(_, FSharpForLoopUp), [], [Expr.Lambda(_,_,_,[_], lim0,_,_); Expr.Lambda(_,_,_,[_], SimpleArrayLoopUpperBound, lm,_); SimpleArrayLoopBody cenv.g (arr, elemTy, body)] -> + | TOp.For(_, FSharpForLoopUp), [], [Expr.Lambda(_,_,_,[_], lim0,_,_); Expr.Lambda(_,_,_,[_], SimpleArrayLoopUpperBound, lm,_); SimpleArrayLoopBody g (arr, elemTy, body)] -> let lim1 = - let len = mkCallArrayLength cenv.g lm elemTy arr // Array.length arr - mkCallSubtractionOperator cenv.g lm cenv.g.int32_ty len (Expr.Const(Const.Int32 1, m, cenv.g.int32_ty)) // len - 1 + let len = mkCallArrayLength g lm elemTy arr // Array.length arr + mkCallSubtractionOperator g lm g.int32_ty len (Expr.Const(Const.Int32 1, m, g.int32_ty)) // len - 1 QP.mkForLoop(ConvExpr cenv env lim0, ConvExpr cenv env lim1, ConvExpr cenv env body) | TOp.For(_,dir),[],[Expr.Lambda(_,_,_,[_],lim0,_,_);Expr.Lambda(_,_,_,[_],lim1,_,_);body] -> @@ -578,10 +579,10 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP. QP.mkTryWith(ConvExpr cenv env e1,vfR,ConvExpr cenv envf ef,vhR,ConvExpr cenv envh eh) | TOp.Bytes bytes,[],[] -> - ConvExpr cenv env (Expr.Op(TOp.Array, [cenv.g.byte_ty], List.ofArray (Array.map (mkByte cenv.g m) bytes), m)) + ConvExpr cenv env (Expr.Op(TOp.Array, [g.byte_ty], List.ofArray (Array.map (mkByte g m) bytes), m)) | TOp.UInt16s arr,[],[] -> - ConvExpr cenv env (Expr.Op(TOp.Array, [cenv.g.uint16_ty], List.ofArray (Array.map (mkUInt16 cenv.g m) arr), m)) + ConvExpr cenv env (Expr.Op(TOp.Array, [g.uint16_ty], List.ofArray (Array.map (mkUInt16 g m) arr), m)) | TOp.UnionCaseProof _,_,[e] -> ConvExpr cenv env e // Note: we erase the union case proof conversions when converting to quotations | TOp.UnionCaseTagGet _tycr,_tinst,[_cx] -> wfail(Error(FSComp.SR.crefQuotationsCantFetchUnionIndexes(), m)) @@ -663,6 +664,7 @@ and ConvLValueExpr cenv env expr = // This function has to undo the work of mkExprAddrOfExpr and ConvLValueExprCore cenv env expr = + let g = cenv.g match expr with | Expr.Op(op,tyargs,args,m) -> match op, args, tyargs with @@ -673,10 +675,10 @@ and ConvLValueExprCore cenv env expr = | TOp.ILAsm([ I_ldsflda(fspec) ],_rtys),_,_ -> ConvLdfld cenv env m fspec tyargs args | TOp.ILAsm(([ I_ldelema(_ro,_isNativePtr,shape,_tyarg) ] ),_), (arr::idxs), [elemty] -> match shape.Rank, idxs with - | 1, [idx1] -> ConvExpr cenv env (mkCallArrayGet cenv.g m elemty arr idx1) - | 2, [idx1; idx2] -> ConvExpr cenv env (mkCallArray2DGet cenv.g m elemty arr idx1 idx2) - | 3, [idx1; idx2; idx3] -> ConvExpr cenv env (mkCallArray3DGet cenv.g m elemty arr idx1 idx2 idx3) - | 4, [idx1; idx2; idx3; idx4] -> ConvExpr cenv env (mkCallArray4DGet cenv.g m elemty arr idx1 idx2 idx3 idx4) + | 1, [idx1] -> ConvExpr cenv env (mkCallArrayGet g m elemty arr idx1) + | 2, [idx1; idx2] -> ConvExpr cenv env (mkCallArray2DGet g m elemty arr idx1 idx2) + | 3, [idx1; idx2; idx3] -> ConvExpr cenv env (mkCallArray3DGet g m elemty arr idx1 idx2 idx3) + | 4, [idx1; idx2; idx3; idx4] -> ConvExpr cenv env (mkCallArray4DGet g m elemty arr idx1 idx2 idx3 idx4) | _ -> ConvExpr cenv env expr | _ -> ConvExpr cenv env expr | _ -> ConvExpr cenv env expr @@ -715,10 +717,11 @@ and ConvModuleValueApp cenv env m (vref:ValRef) tyargs (args: Expr list list) = EmitDebugInfoIfNecessary cenv env m (ConvModuleValueAppCore cenv env m vref tyargs args) and ConvModuleValueAppCore cenv env m (vref:ValRef) tyargs (args: Expr list list) = + let g = cenv.g match vref.DeclaringEntity with | ParentNone -> failwith "ConvModuleValueApp" | Parent(tcref) -> - let isProperty = IsCompiledAsStaticProperty cenv.g vref.Deref + let isProperty = IsCompiledAsStaticProperty g vref.Deref let tcrefR = ConvTyconRef cenv tcref m let tyargsR = ConvTypes cenv env m tyargs let nm = vref.CompiledName @@ -732,10 +735,11 @@ and ConvValRef holeOk cenv env m (vref:ValRef) tyargs = EmitDebugInfoIfNecessary cenv env m (ConvValRefCore holeOk cenv env m vref tyargs) and private ConvValRefCore holeOk cenv env m (vref:ValRef) tyargs = + let g = cenv.g let v = vref.Deref if env.isinstVals.ContainsVal v then let (ty,e) = env.isinstVals.[v] - ConvExpr cenv env (mkCallUnbox cenv.g m ty e) + ConvExpr cenv env (mkCallUnbox g m ty e) elif env.substVals.ContainsVal v then let e = env.substVals.[v] ConvExpr cenv env e @@ -751,16 +755,17 @@ and private ConvValRefCore holeOk cenv env m (vref:ValRef) tyargs = // References to local values are embedded by value if not holeOk then wfail(Error(FSComp.SR.crefNoSetOfHole(),m)) let idx = cenv.exprSplices.Count - cenv.exprSplices.Add((mkCallLiftValueWithName cenv.g m vty v.LogicalName (exprForValRef m vref), m)) + cenv.exprSplices.Add((mkCallLiftValueWithName g m vty v.LogicalName (exprForValRef m vref), m)) QP.mkHole(ConvType cenv env m vty,idx) | Parent _ -> ConvModuleValueApp cenv env m vref tyargs [] and ConvUnionCaseRef cenv (ucref:UnionCaseRef) m = + let g = cenv.g let ucgtypR = ConvTyconRef cenv ucref.TyconRef m let nm = - if cenv.g.unionCaseRefEq ucref cenv.g.cons_ucref then "Cons" - elif cenv.g.unionCaseRefEq ucref cenv.g.nil_ucref then "Empty" + if g.unionCaseRefEq ucref g.cons_ucref then "Cons" + elif g.unionCaseRefEq ucref g.nil_ucref then "Empty" else ucref.CaseName (ucgtypR,nm) @@ -792,9 +797,10 @@ and FilterMeasureTyargs tys = tys |> List.filter (fun ty -> match ty with TType_measure _ -> false | _ -> true) and ConvType cenv env m ty = - match stripTyEqnsAndMeasureEqns cenv.g ty with - | TType_app(tcref,[tyarg],_) when isArrayTyconRef cenv.g tcref -> - QP.mkArrayTy(rankOfArrayTyconRef cenv.g tcref,ConvType cenv env m tyarg) + let g = cenv.g + match stripTyEqnsAndMeasureEqns g ty with + | TType_app(tcref,[tyarg],_) when isArrayTyconRef g tcref -> + QP.mkArrayTy(rankOfArrayTyconRef g tcref,ConvType cenv env m tyarg) | TType_ucase(UCRef(tcref,_),tyargs) // Note: we erase union case 'types' when converting to quotations | TType_app(tcref,tyargs,_) -> @@ -806,7 +812,7 @@ and ConvType cenv env m ty = QP.mkILNamedTy(ConvTyconRef cenv tcref m, ConvTypes cenv env m tyargs) | TType_fun(a,b,_nullness) -> QP.mkFunTy(ConvType cenv env m a,ConvType cenv env m b) - | TType_tuple(tupInfo,l) -> ConvType cenv env m (mkCompiledTupleTy cenv.g (evalTupInfoIsStruct tupInfo) l) + | TType_tuple(tupInfo,l) -> ConvType cenv env m (mkCompiledTupleTy g (evalTupInfoIsStruct tupInfo) l) | TType_var(tp, _nullness) -> QP.mkVarTy(ConvTyparRef cenv env m tp) | TType_forall(_spec,_ty) -> wfail(Error(FSComp.SR.crefNoInnerGenericsInQuotations(),m)) | _ -> wfail(Error (FSComp.SR.crefQuotationsCantContainThisType(),m)) @@ -815,7 +821,8 @@ and ConvTypes cenv env m tys = List.map (ConvType cenv env m) (FilterMeasureTyargs tys) and ConvConst cenv env m c ty = - match TryEliminateDesugaredConstants cenv.g m c with + let g = cenv.g + match TryEliminateDesugaredConstants g m c with | Some e -> ConvExpr cenv env e | None -> let tyR = ConvType cenv env m ty @@ -835,7 +842,7 @@ and ConvConst cenv env m c ty = | Const.Char c -> QP.mkChar (c, tyR) | Const.Unit -> QP.mkUnit() | Const.Zero -> - if isRefTy cenv.g ty then + if isRefTy g ty then QP.mkNull tyR else QP.mkDefaultValue tyR @@ -843,6 +850,7 @@ and ConvConst cenv env m c ty = wfail(Error (FSComp.SR.crefQuotationsCantContainThisConstant(), m)) and ConvDecisionTree cenv env tgs typR x = + let g = cenv.g match x with | TDSwitch(e1,csl,dfltOpt,m) -> let acc = @@ -870,8 +878,8 @@ and ConvDecisionTree cenv env tgs typR x = QP.mkCond (e1R, acc, ConvDecisionTree cenv env tgs typR dtree) | DecisionTreeTest.Const c -> - let ty = tyOfExpr cenv.g e1 - let eq = mkCallEqualsOperator cenv.g m ty e1 (Expr.Const (c, m, ty)) + let ty = tyOfExpr g e1 + let eq = mkCallEqualsOperator g m ty e1 (Expr.Const (c, m, ty)) let eqR = ConvExpr cenv env eq QP.mkCond (eqR, ConvDecisionTree cenv env tgs typR dtree, acc) @@ -885,8 +893,8 @@ and ConvDecisionTree cenv env tgs typR x = // note: reverse the branches - a null test is a failure of an isinst test QP.mkCond (QP.mkTypeTest (tyR,eR), acc, ConvDecisionTree cenv env tgs typR dtree) | _ -> - let ty = tyOfExpr cenv.g e1 - let eq = mkCallEqualsOperator cenv.g m ty e1 (Expr.Const (Const.Zero, m, ty)) + let ty = tyOfExpr g e1 + let eq = mkCallEqualsOperator g m ty e1 (Expr.Const (Const.Zero, m, ty)) let eqR = ConvExpr cenv env eq QP.mkCond (eqR, ConvDecisionTree cenv env tgs typR dtree, acc) @@ -920,12 +928,13 @@ and ConvDecisionTree cenv env tgs typR x = // Check if this is an provider-generated assembly that will be statically linked and IsILTypeRefStaticLinkLocal cenv m (tr:ILTypeRef) = + let g = cenv.g ignore cenv; ignore m match tr.Scope with #if !NO_EXTENSIONTYPING | ILScopeRef.Assembly aref - when not cenv.g.isInteractive && - aref.Name <> cenv.g.ilg.primaryAssemblyName && // optimization to avoid this check in the common case + when not g.isInteractive && + aref.Name <> g.ilg.primaryAssemblyName && // optimization to avoid this check in the common case // Explanation: This represents an unchecked invariant in the hosted compiler: that any operations // which import types (and resolve assemblies from the tcImports tables) happen on the compilation thread. @@ -967,7 +976,9 @@ and ConvILTypeRef cenv (tr:ILTypeRef) = QP.Named(tr.BasicQualifiedName, assref) -and ConvVoidType cenv m = QP.mkILNamedTy(ConvTyconRef cenv cenv.g.system_Void_tcref m, []) +and ConvVoidType cenv m = + let g = cenv.g + QP.mkILNamedTy(ConvTyconRef cenv g.system_Void_tcref m, []) and ConvILType cenv env m ty = match ty with diff --git a/src/fsharp/SignatureConformance.fs b/src/fsharp/SignatureConformance.fs index a118e2b0cb4..ebf91bfcc7e 100644 --- a/src/fsharp/SignatureConformance.fs +++ b/src/fsharp/SignatureConformance.fs @@ -201,8 +201,8 @@ type Checker(g, amap, denv, remapInfo: SignatureRepackageInfo, checkingSig) = false else - let aNull2 = TypeNullIsExtraValueOld g m (generalizedTyconRef (mkLocalTyconRef implTycon)) - let fNull2 = TypeNullIsExtraValueOld g m (generalizedTyconRef (mkLocalTyconRef implTycon)) + let aNull2 = TypeNullIsExtraValueOld g m (generalizedTyOfTyconRef g (mkLocalTyconRef implTycon)) + let fNull2 = TypeNullIsExtraValueOld g m (generalizedTyOfTyconRef g (mkLocalTyconRef sigTycon)) if aNull2 && not fNull2 then errorR(Error(FSComp.SR.DefinitionsInSigAndImplNotCompatibleImplementationSaysNull2(implTycon.TypeOrMeasureKind.ToString(),implTycon.DisplayName),m)) false @@ -211,8 +211,8 @@ type Checker(g, amap, denv, remapInfo: SignatureRepackageInfo, checkingSig) = false else - let aSealed = isSealedTy g (generalizedTyconRef (mkLocalTyconRef implTycon)) - let fSealed = isSealedTy g (generalizedTyconRef (mkLocalTyconRef sigTycon)) + let aSealed = isSealedTy g (generalizedTyOfTyconRef g (mkLocalTyconRef implTycon)) + let fSealed = isSealedTy g (generalizedTyOfTyconRef g (mkLocalTyconRef sigTycon)) if aSealed && not fSealed then errorR(Error(FSComp.SR.DefinitionsInSigAndImplNotCompatibleImplementationSealed(implTycon.TypeOrMeasureKind.ToString(),implTycon.DisplayName),m)) false diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index a206b8679e1..3f3b82b2467 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -163,11 +163,11 @@ let generalizeTypars tps = List.map generalizeTypar tps let combineNullness (nullnessOrig: Nullness) (nullnessNew: Nullness) = match nullnessOrig.Evaluate() with | NullnessInfo.WithoutNull -> nullnessNew - | NullnessInfo.Oblivious -> nullnessOrig + | NullnessInfo.ObliviousToNull -> nullnessOrig | NullnessInfo.WithNull -> match nullnessNew.Evaluate() with | NullnessInfo.WithoutNull -> nullnessOrig // TODO - ? - | NullnessInfo.Oblivious -> nullnessNew + | NullnessInfo.ObliviousToNull -> nullnessNew | NullnessInfo.WithNull -> nullnessNew @@ -598,21 +598,21 @@ let tryNormalizeMeasureInType g ty = let mkNativePtrTy (g:TcGlobals) ty = assert g.nativeptr_tcr.CanDeref // this should always be available, but check anyway - TType_app (g.nativeptr_tcr, [ty], KnownNonNull) + TType_app (g.nativeptr_tcr, [ty], g.knownWithoutNull) let mkByrefTy (g:TcGlobals) ty = assert g.byref_tcr.CanDeref // this should always be available, but check anyway - TType_app (g.byref_tcr, [ty], KnownNonNull) + TType_app (g.byref_tcr, [ty], g.knownWithoutNull) let mkInByrefTy (g:TcGlobals) ty = if g.inref_tcr.CanDeref then // If not using sufficient FSharp.Core, then inref = byref, see RFC FS-1053.md - TType_app (g.inref_tcr, [ty], KnownNonNull) + TType_app (g.inref_tcr, [ty], g.knownWithoutNull) else mkByrefTy g ty let mkOutByrefTy (g:TcGlobals) ty = if g.outref_tcr.CanDeref then // If not using sufficient FSharp.Core, then outref = byref, see RFC FS-1053.md - TType_app (g.outref_tcr, [ty], KnownNonNull) + TType_app (g.outref_tcr, [ty], g.knownWithoutNull) else mkByrefTy g ty @@ -624,17 +624,17 @@ let mkByrefTyWithFlag g readonly ty = let mkByref2Ty (g:TcGlobals) ty1 ty2 = assert g.byref2_tcr.CanDeref // check we are using sufficient FSharp.Core, caller should check this - TType_app (g.byref2_tcr, [ty1; ty2], KnownNonNull) + TType_app (g.byref2_tcr, [ty1; ty2], g.knownWithoutNull) let mkVoidPtrTy (g:TcGlobals) = assert g.voidptr_tcr.CanDeref // check we are using sufficient FSharp.Core , caller should check this - TType_app (g.voidptr_tcr, [], KnownNonNull) + TType_app (g.voidptr_tcr, [], g.knownWithoutNull) let mkByrefTyWithInference (g:TcGlobals) ty1 ty2 = if g.byref2_tcr.CanDeref then // If not using sufficient FSharp.Core, then inref = byref, see RFC FS-1053.md - TType_app (g.byref2_tcr, [ty1; ty2], KnownNonNull) + TType_app (g.byref2_tcr, [ty1; ty2], g.knownWithoutNull) else - TType_app (g.byref_tcr, [ty1], KnownNonNull) + TType_app (g.byref_tcr, [ty1], g.knownWithoutNull) let mkArrayTy (g:TcGlobals) rank nullness ty m = if rank < 1 || rank > 32 then @@ -683,16 +683,16 @@ let mkCompiledTupleTyconRef (g:TcGlobals) isStruct n = let rec mkCompiledTupleTy g isStruct tupElemTys = let n = List.length tupElemTys if n < maxTuple then - TType_app (mkCompiledTupleTyconRef g isStruct n, tupElemTys, KnownNonNull) + TType_app (mkCompiledTupleTyconRef g isStruct n, tupElemTys, g.knownWithoutNull) else let tysA, tysB = List.splitAfter goodTupleFields tupElemTys - TType_app ((if isStruct then g.struct_tuple8_tcr else g.ref_tuple8_tcr), tysA@[mkCompiledTupleTy g isStruct tysB], KnownNonNull) + TType_app ((if isStruct then g.struct_tuple8_tcr else g.ref_tuple8_tcr), tysA@[mkCompiledTupleTy g isStruct tysB], g.knownWithoutNull) /// Convert from F# tuple types to .NET tuple types, but only the outermost level let mkOuterCompiledTupleTy g isStruct tupElemTys = let n = List.length tupElemTys if n < maxTuple then - TType_app (mkCompiledTupleTyconRef g isStruct n, tupElemTys, KnownNonNull) + TType_app (mkCompiledTupleTyconRef g isStruct n, tupElemTys, g.knownWithoutNull) else let tysA, tysB = List.splitAfter goodTupleFields tupElemTys let tcref = (if isStruct then g.struct_tuple8_tcr else g.ref_tuple8_tcr) @@ -700,10 +700,10 @@ let mkOuterCompiledTupleTy g isStruct tupElemTys = // as a regular F# tuple type. match tysB with | [ tyB ] -> - let marker = TType_app (mkCompiledTupleTyconRef g isStruct 1, [tyB], KnownNonNull) - TType_app (tcref, tysA@[marker], KnownNonNull) + let marker = TType_app (mkCompiledTupleTyconRef g isStruct 1, [tyB], g.knownWithoutNull) + TType_app (tcref, tysA@[marker], g.knownWithoutNull) | _ -> - TType_app (tcref, tysA@[TType_tuple (TupInfo.Const isStruct, tysB)], KnownNonNull) + TType_app (tcref, tysA@[TType_tuple (TupInfo.Const isStruct, tysB)], g.knownWithoutNull) //--------------------------------------------------------------------------- // Remove inference equations and abbreviations from types @@ -756,7 +756,7 @@ let rec stripTyEqnsA g canShortcut ty = // Add the equation byref<'T> = byref<'T, ByRefKinds.InOut> for when using sufficient FSharp.Core // See RFC FS-1053.md if tyconRefEq g tcref g.byref_tcr && g.byref2_tcr.CanDeref && g.byrefkind_InOut_tcr.CanDeref then - mkByref2Ty g tinst.[0] (TType_app(g.byrefkind_InOut_tcr, [], KnownNonNull)) + mkByref2Ty g tinst.[0] (TType_app(g.byrefkind_InOut_tcr, [], g.knownWithoutNull)) // Add the equation double<1> = double for units of measure. elif tycon.IsMeasureableReprTycon && List.forall (isDimensionless g) tinst then @@ -838,13 +838,13 @@ let isMeasureTy g ty = ty |> stripTyEqns g |> (function TType_measure _ -> tr let isProvenUnionCaseTy ty = match ty with TType_ucase _ -> true | _ -> false -let mkAppTy tcref tyargs = TType_app(tcref, tyargs, KnownNonNull) // TODO +let mkAppTy tcref tyargs = TType_app(tcref, tyargs, KnownWithoutNull) // TODO let mkProvenUnionCaseTy ucref tyargs = TType_ucase(ucref, tyargs) let isAppTy g ty = ty |> stripTyEqns g |> (function TType_app _ -> true | _ -> false) let tryAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> ValueSome (tcref, tinst) | _ -> ValueNone) let destAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> tcref, tinst | _ -> failwith "destAppTy") let tcrefOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> tcref | _ -> failwith "tcrefOfAppTy") -let nullnessOfTy g ty = ty |> stripTyEqns g |> (function TType_app(_, _, nullness) | TType_fun (_, _, nullness) | TType_var (_, nullness) -> nullness | _ -> KnownNonNull) +let nullnessOfTy g ty = ty |> stripTyEqns g |> (function TType_app(_, _, nullness) | TType_fun (_, _, nullness) | TType_var (_, nullness) -> nullness | _ -> g.knownWithoutNull) let argsOfAppTy g ty = ty |> stripTyEqns g |> (function TType_app(_, tinst, _) -> tinst | _ -> []) let tryDestTyparTy g ty = ty |> stripTyEqns g |> (function TType_var (v, _nullness) -> ValueSome v | _ -> ValueNone) let tryDestFunTy g ty = ty |> stripTyEqns g |> (function TType_fun (tyv, tau, _nullness) -> ValueSome(tyv, tau) | _ -> ValueNone) @@ -1103,12 +1103,12 @@ let unionCaseRefOrder = // Make some common types //--------------------------------------------------------------------------- -let mkFunTy d r = TType_fun (d, r, NewNullnessVar()) -let (-->) d r = mkFunTy d r +let mkFunTy (g: TcGlobals) d r = TType_fun (d, r, g.knownWithoutNull) let mkForallTy d r = TType_forall (d, r) let mkForallTyIfNeeded d r = if isNil d then r else mkForallTy d r let (+->) d r = mkForallTyIfNeeded d r -let mkIteratedFunTy dl r = List.foldBack (-->) dl r +let mkIteratedFunTy g dl r = List.foldBack (mkFunTy g) dl r +let mkLambdaTy g tps tys rty = mkForallTyIfNeeded tps (mkIteratedFunTy g tys rty) let mkLambdaArgTy m tys = match tys with @@ -1117,8 +1117,8 @@ let mkLambdaArgTy m tys = | _ -> mkRawRefTupleTy tys let typeOfLambdaArg m vs = mkLambdaArgTy m (typesOfVals vs) -let mkMultiLambdaTy m vs rty = mkFunTy (typeOfLambdaArg m vs) rty -let mkLambdaTy tps tys rty = mkForallTyIfNeeded tps (mkIteratedFunTy tys rty) + +let mkMultiLambdaTy g m vs rty = mkFunTy g (typeOfLambdaArg m vs) rty /// When compiling FSharp.Core.dll we have to deal with the non-local references into /// the library arising from env.fs. Part of this means that we have to be able to resolve these @@ -1228,29 +1228,29 @@ let mkTypeChoose m vs b = match vs with [] -> b | _ -> Expr.TyChoose (vs, b, m) let mkObjExpr (ty, basev, basecall, overrides, iimpls, m) = Expr.Obj (newUnique(), ty, basev, basecall, overrides, iimpls, m) -let mkLambdas m tps (vs:Val list) (b, rty) = - mkTypeLambda m tps (List.foldBack (fun v (e, ty) -> mkLambda m v (e, ty), v.Type --> ty) vs (b, rty)) +let mkLambdas g m tps (vs:Val list) (b, rty) = + mkTypeLambda m tps (List.foldBack (fun v (e, ty) -> mkLambda m v (e, ty), mkFunTy g v.Type ty) vs (b, rty)) -let mkMultiLambdasCore m vsl (b, rty) = - List.foldBack (fun v (e, ty) -> mkMultiLambda m v (e, ty), typeOfLambdaArg m v --> ty) vsl (b, rty) +let mkMultiLambdasCore g m vsl (b, rty) = + List.foldBack (fun v (e, ty) -> mkMultiLambda m v (e, ty), mkFunTy g (typeOfLambdaArg m v) ty) vsl (b, rty) -let mkMultiLambdas m tps vsl (b, rty) = - mkTypeLambda m tps (mkMultiLambdasCore m vsl (b, rty) ) +let mkMultiLambdas g m tps vsl (b, rty) = + mkTypeLambda m tps (mkMultiLambdasCore g m vsl (b, rty) ) -let mkMemberLambdas m tps ctorThisValOpt baseValOpt vsl (b, rty) = +let mkMemberLambdas g m tps ctorThisValOpt baseValOpt vsl (b, rty) = let expr = match ctorThisValOpt, baseValOpt with - | None, None -> mkMultiLambdasCore m vsl (b, rty) + | None, None -> mkMultiLambdasCore g m vsl (b, rty) | _ -> match vsl with | [] -> error(InternalError("mk_basev_multi_lambdas_core: can't attach a basev to a non-lambda expression", m)) | h::t -> - let b, rty = mkMultiLambdasCore m t (b, rty) - (rebuildLambda m ctorThisValOpt baseValOpt h (b, rty), (typeOfLambdaArg m h --> rty)) + let b, rty = mkMultiLambdasCore g m t (b, rty) + (rebuildLambda m ctorThisValOpt baseValOpt h (b, rty), (mkFunTy g (typeOfLambdaArg m h) rty)) mkTypeLambda m tps expr -let mkMultiLambdaBind v letSeqPtOpt m tps vsl (b, rty) = - TBind(v, mkMultiLambdas m tps vsl (b, rty), letSeqPtOpt) +let mkMultiLambdaBind g v letSeqPtOpt m tps vsl (b, rty) = + TBind(v, mkMultiLambdas g m tps vsl (b, rty), letSeqPtOpt) let mkBind seqPtOpt v e = TBind(v, e, seqPtOpt) @@ -2184,7 +2184,6 @@ and accFreeTyparRefLeftToRight g cxFlag thruFlag acc (tp:Typar) = acc and accFreeInTypeLeftToRight g cxFlag thruFlag acc ty = - if verbose then dprintf "--> accFreeInTypeLeftToRight \n" match (if thruFlag then stripTyEqns g ty else stripTyparEqns ty) with | TType_tuple (tupInfo, l) -> let acc = accFreeInTupInfoLeftToRight g cxFlag thruFlag acc tupInfo @@ -2375,16 +2374,26 @@ let ArgInfosOfPropertyVal g (v:Val) = // Generalize type constructors to types //--------------------------------------------------------------------------- -let generalTyconRefInst (tc:TyconRef) = generalizeTypars tc.TyparsNoRange +let generalTyconRefInst (tcref:TyconRef) = + generalizeTypars tcref.TyparsNoRange -let generalizeTyconRef tc = - let tinst = generalTyconRefInst tc - tinst, TType_app(tc, tinst, KnownNonNull) // TODO: check me +let generalizeTyconRef (g:TcGlobals) tcref = + let tinst = generalTyconRefInst tcref + tinst, TType_app(tcref, tinst, g.knownWithoutNull) -let generalizedTyconRef tc = TType_app(tc, generalTyconRefInst tc, KnownNonNull) +let generalizedTyOfTyconRef (g:TcGlobals) tcref = + let tinst = generalTyconRefInst tcref + TType_app(tcref, tinst, g.knownWithoutNull) // TODO: check me -let isTTyparSupportsStaticMethod = function TyparConstraint.MayResolveMember _ -> true | _ -> false -let isTTyparCoercesToType = function TyparConstraint.CoercesTo _ -> true | _ -> false +let isTTyparSupportsStaticMethod tpc = + match tpc with + | TyparConstraint.MayResolveMember _ -> true + | _ -> false + +let isTTyparCoercesToType tpc = + match tpc with + | TyparConstraint.CoercesTo _ -> true + | _ -> false //-------------------------------------------------------------------------- // Print Signatures/Types - prelude @@ -2762,7 +2771,7 @@ let tagEntityRefName (xref: EntityRef) name = elif xref.IsRecordTycon then tagRecord name else tagClass name -let fullDisplayTextOfTyconRef r = fullNameOfEntityRef (fun (tc:TyconRef) -> tc.DisplayNameWithStaticParametersAndUnderscoreTypars) r +let fullDisplayTextOfTyconRef r = fullNameOfEntityRef (fun (tcref:TyconRef) -> tcref.DisplayNameWithStaticParametersAndUnderscoreTypars) r let fullNameOfEntityRefAsLayout nmF (xref: EntityRef) = let navigableText = @@ -2795,9 +2804,9 @@ let fullNameOfParentOfValRefAsLayout vref = let fullDisplayTextOfParentOfModRef r = fullNameOfParentOfEntityRef r let fullDisplayTextOfModRef r = fullNameOfEntityRef (fun (x:EntityRef) -> x.DemangledModuleOrNamespaceName) r -let fullDisplayTextOfTyconRefAsLayout r = fullNameOfEntityRefAsLayout (fun (tc:TyconRef) -> tc.DisplayNameWithStaticParametersAndUnderscoreTypars) r -let fullDisplayTextOfExnRef r = fullNameOfEntityRef (fun (tc:TyconRef) -> tc.DisplayNameWithStaticParametersAndUnderscoreTypars) r -let fullDisplayTextOfExnRefAsLayout r = fullNameOfEntityRefAsLayout (fun (tc:TyconRef) -> tc.DisplayNameWithStaticParametersAndUnderscoreTypars) r +let fullDisplayTextOfTyconRefAsLayout r = fullNameOfEntityRefAsLayout (fun (tcref:TyconRef) -> tcref.DisplayNameWithStaticParametersAndUnderscoreTypars) r +let fullDisplayTextOfExnRef r = fullNameOfEntityRef (fun (tcref:TyconRef) -> tcref.DisplayNameWithStaticParametersAndUnderscoreTypars) r +let fullDisplayTextOfExnRefAsLayout r = fullNameOfEntityRefAsLayout (fun (tcref:TyconRef) -> tcref.DisplayNameWithStaticParametersAndUnderscoreTypars) r let fullDisplayTextOfUnionCaseRef (ucref:UnionCaseRef) = fullDisplayTextOfTyconRef ucref.TyconRef +.+ ucref.CaseName let fullDisplayTextOfRecdFieldRef (rfref:RecdFieldRef) = fullDisplayTextOfTyconRef rfref.TyconRef +.+ rfref.FieldName @@ -3061,15 +3070,15 @@ let StripSelfRefCell(g:TcGlobals, baseOrThisInfo:ValBaseOrThisInfo, tau: TType) then destRefCellTy g tau else tau -let mkRefCellTy (g:TcGlobals) ty = TType_app(g.refcell_tcr_nice, [ty], KnownNonNull) +let mkRefCellTy (g:TcGlobals) ty = TType_app(g.refcell_tcr_nice, [ty], g.knownWithoutNull) -let mkLazyTy (g:TcGlobals) ty = TType_app(g.lazy_tcr_nice, [ty], KnownNonNull) +let mkLazyTy (g:TcGlobals) ty = TType_app(g.lazy_tcr_nice, [ty], g.knownWithoutNull) -let mkPrintfFormatTy (g:TcGlobals) aty bty cty dty ety = TType_app(g.format_tcr, [aty;bty;cty;dty; ety], KnownNonNull) +let mkPrintfFormatTy (g:TcGlobals) aty bty cty dty ety = TType_app(g.format_tcr, [aty;bty;cty;dty; ety], g.knownWithoutNull) -let mkOptionTy (g:TcGlobals) ty = TType_app (g.option_tcr_nice, [ty], KnownNonNull) +let mkOptionTy (g:TcGlobals) ty = TType_app (g.option_tcr_nice, [ty], g.knownWithoutNull) -let mkListTy (g:TcGlobals) ty = TType_app (g.list_tcr_nice, [ty], KnownNonNull) +let mkListTy (g:TcGlobals) ty = TType_app (g.list_tcr_nice, [ty], g.knownWithoutNull) let isOptionTy (g:TcGlobals) ty = match tryDestAppTy g ty with @@ -3232,7 +3241,7 @@ module DebugPrint = begin let stampL _n w = w - let layoutTyconRef (tc:TyconRef) = wordL (tagText tc.DisplayNameWithStaticParameters) |> stampL tc.Stamp + let layoutTyconRef (tcref:TyconRef) = wordL (tagText tcref.DisplayNameWithStaticParameters) |> stampL tcref.Stamp let rec auxTypeL env ty = auxTypeWrapL env false ty @@ -3257,7 +3266,7 @@ module DebugPrint = begin match nullness.Evaluate() with | NullnessInfo.WithNull -> coreL ^^ wordL (tagText "?") | NullnessInfo.WithoutNull -> coreL - | NullnessInfo.Oblivious -> coreL ^^ wordL (tagText "%") + | NullnessInfo.ObliviousToNull -> coreL ^^ wordL (tagText "%") and auxTypeWrapL env isAtomic ty = let wrap x = bracketIfL isAtomic x in // wrap iff require atomic expr @@ -3292,7 +3301,7 @@ module DebugPrint = begin let negvs, posvs = ListMeasureVarOccsWithNonZeroExponents unt |> sortVars |> List.partition (fun (_, e) -> SignRational e < 0) let negcs, poscs = ListMeasureConOccsWithNonZeroExponents g false unt |> sortCons |> List.partition (fun (_, e) -> SignRational e < 0) let unparL (uv:Typar) = wordL (tagText ("'" + uv.DisplayName)) - let unconL tc = layoutTyconRef tc + let unconL tcref = layoutTyconRef tcref let rationalL e = wordL (tagText(RationalToString e)) let measureToPowerL x e = if e = OneRational then x else x -- wordL (tagText "^") -- rationalL e let prefix = spaceListL (List.map (fun (v, e) -> measureToPowerL (unparL v) e) posvs @ @@ -3689,8 +3698,8 @@ module DebugPrint = begin wordL (tagText ecref.LogicalName) ^^ bracketL (commaListL (List.map atomL args)) | Expr.Op (TOp.Tuple _, _, xs, _) -> tupleL (List.map exprL xs) - | Expr.Op (TOp.Recd (ctor, tc), _, xs, _) -> - let fields = tc.TrueInstanceFieldsAsList + | Expr.Op (TOp.Recd (ctor, tcref), _, xs, _) -> + let fields = tcref.TrueInstanceFieldsAsList let lay fs x = (wordL (tagText fs.rfield_id.idText) ^^ sepL(tagText "=")) --- (exprL x) let ctorL = match ctor with @@ -5447,8 +5456,8 @@ let ComputeFieldName tycon f = let isQuotedExprTy g ty = match tryAppTy g ty with ValueSome (tcref, _) -> tyconRefEq g tcref g.expr_tcr | _ -> false let destQuotedExprTy g ty = match tryAppTy g ty with ValueSome (_, [ty]) -> ty | _ -> failwith "destQuotedExprTy" -let mkQuotedExprTy (g:TcGlobals) ty = TType_app(g.expr_tcr, [ty], KnownNonNull) -let mkRawQuotedExprTy (g:TcGlobals) = TType_app(g.raw_expr_tcr, [], KnownNonNull) +let mkQuotedExprTy (g:TcGlobals) ty = TType_app(g.expr_tcr, [ty], g.knownWithoutNull) +let mkRawQuotedExprTy (g:TcGlobals) = TType_app(g.raw_expr_tcr, [], g.knownWithoutNull) let mkAnyTupledTy (g:TcGlobals) tupInfo tys = match tys with @@ -5457,10 +5466,13 @@ let mkAnyTupledTy (g:TcGlobals) tupInfo tys = | _ -> TType_tuple(tupInfo, tys) let mkRefTupledTy g tys = mkAnyTupledTy g tupInfoRef tys + let mkRefTupledVarsTy g vs = mkRefTupledTy g (typesOfVals vs) -let mkMethodTy g argtys rty = mkIteratedFunTy (List.map (mkRefTupledTy g) argtys) rty -let mkArrayType (g:TcGlobals) ty = TType_app (g.array_tcr_nice, [ty], KnownNonNull) +let mkMethodTy g argtys rty = mkIteratedFunTy g (List.map (mkRefTupledTy g) argtys) rty + +let mkArrayType (g:TcGlobals) ty = TType_app (g.array_tcr_nice, [ty], g.knownWithoutNull) + let mkByteArrayTy (g:TcGlobals) = mkArrayType g g.byte_ty @@ -5477,7 +5489,7 @@ let rec tyOfExpr g e = | Expr.Const(_, _, ty) -> (ty) | Expr.Val(vref, _, _) -> vref.Type | Expr.Sequential(a, b, k, _, _) -> tyOfExpr g (match k with NormalSeq -> b | ThenDoSeq -> a) - | Expr.Lambda(_, _, _, vs, _, _, rty) -> (mkRefTupledVarsTy g vs --> rty) + | Expr.Lambda(_, _, _, vs, _, _, rty) -> (mkFunTy g (mkRefTupledVarsTy g vs) rty) | Expr.TyLambda(_, tyvs, _, _, rty) -> (tyvs +-> rty) | Expr.Let(_, e, _, _) | Expr.TyChoose(_, e, _) @@ -6249,9 +6261,9 @@ let destIDelegateEventType g ty = | [ty1] -> ty1 | _ -> failwith "destIDelegateEventType: internal error" else failwith "destIDelegateEventType: not an IDelegateEvent type" -let mkIEventType (g:TcGlobals) ty1 ty2 = TType_app (g.fslib_IEvent2_tcr, [ty1;ty2], KnownNonNull) -let mkIObservableType (g:TcGlobals) ty1 = TType_app (g.tcref_IObservable, [ty1], KnownNonNull) -let mkIObserverType (g:TcGlobals) ty1 = TType_app (g.tcref_IObserver, [ty1], KnownNonNull) +let mkIEventType (g:TcGlobals) ty1 ty2 = TType_app (g.fslib_IEvent2_tcr, [ty1;ty2], g.knownWithoutNull) +let mkIObservableType (g:TcGlobals) ty1 = TType_app (g.tcref_IObservable, [ty1], g.knownWithoutNull) +let mkIObserverType (g:TcGlobals) ty1 = TType_app (g.tcref_IObserver, [ty1], g.knownWithoutNull) let mkRefCellContentsRef (g:TcGlobals) = mkRecdFieldRef g.refcell_tcr_canon "contents" @@ -6925,7 +6937,7 @@ let AdjustValForExpectedArity g m (vref:ValRef) flags topValInfo = let call = MakeApplicationAndBetaReduce g (Expr.Val(vref, flags, m), vref.Type, [tyargs'], (List.map (mkRefTupledVars g m) vsl), m) let tauexpr, tauty = List.foldBack - (fun vs (e, ty) -> mkMultiLambda m vs (e, ty), (mkRefTupledVarsTy g vs --> ty)) + (fun vs (e, ty) -> mkMultiLambda m vs (e, ty), (mkFunTy g (mkRefTupledVarsTy g vs) ty)) vsl (call, rty') // Build a type-lambda expression for the toplevel value if needed... @@ -7159,8 +7171,8 @@ let AdjustPossibleSubsumptionExpr g (expr: Expr) (suppliedArgs: Expr list) : (Ex let inpsAsVars, inpsAsExprs = inpArgTys |> List.mapi (fun j ty -> mkCompGenLocal appm ("arg"^string i^string j) ty) |> List.unzip let inpsAsActualArg = CoerceDetupled inpArgTys inpsAsExprs actualArgTys - let inpCloVarType = (mkFunTy (mkRefTupledTy g actualArgTys) cloVar.Type) - let newResTy = mkFunTy inpArgTy resTy + let inpCloVarType = mkFunTy g (mkRefTupledTy g actualArgTys) cloVar.Type + let newResTy = mkFunTy g inpArgTy resTy let inpCloVar, inpCloVarAsExpr = mkCompGenLocal appm ("clo"^string i) inpCloVarType let newRes = // For the final arg we can skip introducing the dummy variable @@ -7365,7 +7377,6 @@ let typarEnc _g (gtpsType, gtpsMethod) typar = "``0" // REVIEW: this should be ERROR not WARNING? let rec typeEnc g (gtpsType, gtpsMethod) ty = - if verbose then dprintf "--> typeEnc" let stripped = stripTyEqnsAndMeasureEqns g ty match stripped with | TType_forall _ -> @@ -7811,7 +7822,7 @@ type PrettyNaming.ActivePatternInfo with if apinfo.IsTotal then choicety else mkOptionTy g choicety member apinfo.OverallType g m dty rtys = - mkFunTy dty (apinfo.ResultType g m rtys) + mkFunTy g dty (apinfo.ResultType g m rtys) //--------------------------------------------------------------------------- // Active pattern validation @@ -8364,12 +8375,12 @@ let rec mkCompiledTuple g isStruct (argtys, args, m) = | TType_app(tn, _, _) when (isCompiledTupleTyconRef g tn) -> ty8, arg8 | _ -> - let ty8enc = TType_app((if isStruct then g.struct_tuple1_tcr else g.ref_tuple1_tcr), [ty8], KnownNonNull) + let ty8enc = TType_app((if isStruct then g.struct_tuple1_tcr else g.ref_tuple1_tcr), [ty8], g.knownWithoutNull) let v8enc = Expr.Op (TOp.Tuple (TupInfo.Const isStruct), [ty8], [arg8], m) ty8enc, v8enc | _ -> let a, b, c, d = mkCompiledTuple g isStruct (argtysB, argsB, m) - let ty8plus = TType_app(a, b, KnownNonNull) + let ty8plus = TType_app(a, b, g.knownWithoutNull) let v8plus = Expr.Op (TOp.Tuple(TupInfo.Const isStruct), b, c, d) ty8plus, v8plus let argtysAB = argtysA @ [ty8] diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index 100c9e4d951..dd10e9c5622 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -47,10 +47,7 @@ val stripTyEqnsWrtErasure: Erasure -> TcGlobals -> TType -> TType //------------------------------------------------------------------------- /// Build a function type -val mkFunTy : TType -> TType -> TType - -/// Build a function type -val ( --> ) : TType -> TType -> TType +val mkFunTy : TcGlobals -> TType -> TType -> TType /// Build a type-forall anonymous generic type if necessary val mkForallTyIfNeeded : Typars -> TType -> TType @@ -58,16 +55,16 @@ val mkForallTyIfNeeded : Typars -> TType -> TType val ( +-> ) : Typars -> TType -> TType /// Build a curried function type -val mkIteratedFunTy : TTypes -> TType -> TType +val mkIteratedFunTy : TcGlobals -> TTypes -> TType -> TType /// Get the natural type of a single argument amongst a set of curried arguments val typeOfLambdaArg : range -> Val list -> TType -/// Get the curried type corresponding to a lambda -val mkMultiLambdaTy : range -> Val list -> TType -> TType +/// Get the type corresponding to a lambda +val mkLambdaTy : TcGlobals -> Typars -> TTypes -> TType -> TType /// Get the curried type corresponding to a lambda -val mkLambdaTy : Typars -> TTypes -> TType -> TType +val mkMultiLambdaTy : TcGlobals -> range -> Val list -> TType -> TType /// Module publication, used while compiling fslib. val ensureCcuHasModuleOrNamespaceAtPath : CcuThunk -> Ident list -> CompilationPath -> XmlDoc -> unit @@ -128,10 +125,10 @@ val mkLambda : range -> Val -> Expr * TType -> Expr val mkTypeLambda : range -> Typars -> Expr * TType -> Expr val mkObjExpr : TType * Val option * Expr * ObjExprMethod list * (TType * ObjExprMethod list) list * Range.range -> Expr val mkTypeChoose : range -> Typars -> Expr -> Expr -val mkLambdas : range -> Typars -> Val list -> Expr * TType -> Expr -val mkMultiLambdasCore : range -> Val list list -> Expr * TType -> Expr * TType -val mkMultiLambdas : range -> Typars -> Val list list -> Expr * TType -> Expr -val mkMemberLambdas : range -> Typars -> Val option -> Val option -> Val list list -> Expr * TType -> Expr +val mkLambdas : TcGlobals -> range -> Typars -> Val list -> Expr * TType -> Expr +val mkMultiLambdasCore : TcGlobals -> range -> Val list list -> Expr * TType -> Expr * TType +val mkMultiLambdas : TcGlobals -> range -> Typars -> Val list list -> Expr * TType -> Expr +val mkMemberLambdas : TcGlobals -> range -> Typars -> Val option -> Val option -> Val list list -> Expr * TType -> Expr val mkWhile : TcGlobals -> SequencePointInfoForWhileLoop * SpecialWhileLoopMarker * Expr * Expr * range -> Expr val mkFor : TcGlobals -> SequencePointInfoForForLoop * Val * Expr * ForLoopStyle * Expr * Expr * range -> Expr @@ -149,7 +146,7 @@ val mkLetBind : range -> Binding -> Expr -> Expr val mkLetsBind : range -> Binding list -> Expr -> Expr val mkLetsFromBindings : range -> Bindings -> Expr -> Expr val mkLet : SequencePointInfoForBinding -> range -> Val -> Expr -> Expr -> Expr -val mkMultiLambdaBind : Val -> SequencePointInfoForBinding -> range -> Typars -> Val list list -> Expr * TType -> Binding +val mkMultiLambdaBind : TcGlobals -> Val -> SequencePointInfoForBinding -> range -> Typars -> Val list list -> Expr * TType -> Binding // Compiler generated bindings may involve a user variable. // Compiler generated bindings may give rise to a sequence point if they are part of @@ -430,9 +427,10 @@ val instTrait : TyparInst -> TraitConstraintInfo -> TraitConstraint // From typars to types //------------------------------------------------------------------------- +val generalTyconRefInst : TyconRef -> TypeInst val generalizeTypars : Typars -> TypeInst -val generalizeTyconRef : TyconRef -> TTypes * TType -val generalizedTyconRef : TyconRef -> TType +val generalizeTyconRef : TcGlobals -> TyconRef -> TTypes * TType +val generalizedTyOfTyconRef : TcGlobals -> TyconRef -> TType val mkTyparToTyparRenaming : Typars -> Typars -> TyparInst * TTypes //------------------------------------------------------------------------- diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index 226717fabff..95df4854a48 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -689,7 +689,7 @@ let p_nleref x st = p_int (encode_nleref st.occus st.ostrings st.onlerefs st.osc // Simple types are types like "int", represented as TType(Ref_nonlocal(...,"int"),[]). // A huge number of these occur in pickled F# data, so make them unique. -let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], ObliviousToNull) // TODO should simpletyps hold obvlious or non-null etc.? +let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], KnownObliviousToNull) // TODO should simpletyps hold obvlious or non-null etc.? let lookup_simpletyp st simpleTyTab x = lookup_uniq st simpleTyTab x let u_encoded_simpletyp st = u_int st let u_simpletyp st = lookup_uniq st st.isimpletys (u_int st) @@ -1573,31 +1573,31 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> p_byte 0 st; p_tys l st | TType_app(ERefNonLocal nleref,[], nullness) -> - if st.oglobals.langFeatureNullness() then + if st.oglobals.langFeatureNullness then match nullness.Evaluate() with | NullnessInfo.WithNull -> p_byte 9 st; p_simpletyp nleref st // TODO: compatible emitting nullness in F# metadata | NullnessInfo.WithoutNull -> p_byte 10 st; p_simpletyp nleref st // TODO: compatible emitting nullness in F# metadata - | NullnessInfo.Oblivious -> + | NullnessInfo.ObliviousToNull -> p_byte 11 st; p_simpletyp nleref st else p_byte 1 st; p_simpletyp nleref st | TType_app (tc,tinst, nullness) -> - if st.oglobals.langFeatureNullness() then + if st.oglobals.langFeatureNullness then match nullness.Evaluate() with | NullnessInfo.WithNull -> p_byte 12 st; p_tcref "typ" tc st; p_tys tinst st // TODO: compatible emitting nullness in F# metadata | NullnessInfo.WithoutNull -> p_byte 13 st; p_tcref "typ" tc st; p_tys tinst st // TODO: compatible emitting nullness in F# metadata - | NullnessInfo.Oblivious -> + | NullnessInfo.ObliviousToNull -> p_byte 14 st; p_tcref "typ" tc st; p_tys tinst st else p_byte 2 st; p_tcref "typ" tc st; p_tys tinst st | TType_fun (d,r,nullness) -> // TODO: not emitting nullness in F# metadata - if st.oglobals.langFeatureNullness() then + if st.oglobals.langFeatureNullness then match nullness.Evaluate() with | NullnessInfo.WithNull -> p_byte 15 st @@ -1607,7 +1607,7 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> p_byte 16 st p_ty2 isStructThisArgPos d st p_ty r st - | NullnessInfo.Oblivious -> + | NullnessInfo.ObliviousToNull -> p_byte 17 st // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value p_ty2 isStructThisArgPos d st @@ -1619,7 +1619,7 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> p_ty r st | TType_var (r, nullness) -> - if st.oglobals.langFeatureNullness() then + if st.oglobals.langFeatureNullness then match nullness.Evaluate() with | NullnessInfo.WithNull -> p_byte 18 st @@ -1627,7 +1627,7 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> | NullnessInfo.WithoutNull -> p_byte 19 st p_tpref r st - | NullnessInfo.Oblivious -> + | NullnessInfo.ObliviousToNull -> p_byte 20 st p_tpref r st else @@ -1649,9 +1649,9 @@ let _ = fill_u_ty (fun st -> match tag with | 0 -> let l = u_tys st in TType_tuple (tupInfoRef, l) | 1 -> u_simpletyp st - | 2 -> let tc = u_tcref st in let tinst = u_tys st in TType_app (tc, tinst, ObliviousToNull) - | 3 -> let d = u_ty st in let r = u_ty st in TType_fun (d,r, ObliviousToNull) - | 4 -> let r = u_tpref st in r.AsType ObliviousToNull + | 2 -> let tc = u_tcref st in let tinst = u_tys st in TType_app (tc, tinst, KnownObliviousToNull) + | 3 -> let d = u_ty st in let r = u_ty st in TType_fun (d,r, KnownObliviousToNull) + | 4 -> let r = u_tpref st in r.AsType KnownObliviousToNull | 5 -> let tps = u_tyar_specs st in let r = u_ty st in TType_forall (tps,r) | 6 -> let unt = u_measure_expr st in TType_measure unt | 7 -> let uc = u_ucref st in let tinst = u_tys st in TType_ucase (uc,tinst) @@ -1660,53 +1660,53 @@ let _ = fill_u_ty (fun st -> let sty = u_simpletyp st match sty with | TType_app(_tcref, [], Nullness.Known NullnessInfo.WithNull) -> sty // keep the unique - | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownNull) + | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownWithNull) | _ -> ufailwith st "u_ty - 9" | 10 -> let sty = u_simpletyp st match sty with | TType_app(_tcref, [], Nullness.Known NullnessInfo.WithoutNull) -> sty // keep the unique - | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownNonNull) + | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownWithoutNull) | _ -> ufailwith st "u_ty - 9" | 11 -> let sty = u_simpletyp st match sty with - | TType_app(_tcref, [], Nullness.Known NullnessInfo.Oblivious) -> sty // keep the unique - | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], ObliviousToNull) + | TType_app(_tcref, [], Nullness.Known NullnessInfo.ObliviousToNull) -> sty // keep the unique + | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownObliviousToNull) | _ -> ufailwith st "u_ty - 9" | 12 -> let tc = u_tcref st let tinst = u_tys st - TType_app (tc, tinst, KnownNull) + TType_app (tc, tinst, KnownWithNull) | 13 -> let tc = u_tcref st let tinst = u_tys st - TType_app (tc, tinst, KnownNonNull) + TType_app (tc, tinst, KnownWithoutNull) | 14 -> let tc = u_tcref st let tinst = u_tys st - TType_app (tc, tinst, ObliviousToNull) + TType_app (tc, tinst, KnownObliviousToNull) | 15 -> let d = u_ty st let r = u_ty st - TType_fun (d,r, KnownNull) + TType_fun (d,r, KnownWithNull) | 16 -> let d = u_ty st let r = u_ty st - TType_fun (d,r, KnownNonNull) + TType_fun (d,r, KnownWithoutNull) | 17 -> let d = u_ty st let r = u_ty st - TType_fun (d,r, ObliviousToNull) + TType_fun (d,r, KnownObliviousToNull) | 18 -> let r = u_tpref st - TType_var (r, KnownNull) + TType_var (r, KnownWithNull) | 19 -> let r = u_tpref st - TType_var (r, KnownNonNull) + TType_var (r, KnownWithoutNull) | 20 -> let r = u_tpref st - TType_var (r, ObliviousToNull) + TType_var (r, KnownObliviousToNull) | _ -> ufailwith st "u_ty") diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 221d5184f32..48aa9fc043a 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -83,20 +83,6 @@ module FSharpLib = // Access the initial environment: helpers to build references //------------------------------------------------------------------------- -let private mkNonGenericTy tcref = TType_app(tcref, [], AssumeNonNull) // TODO - does this deault for all these types cause problems? -let private mkNonGenericTyWithNullness tcref nullness = TType_app(tcref, [], nullness) - -let mkNonLocalTyconRef2 ccu path n = mkNonLocalTyconRef (mkNonLocalEntityRef ccu path) n - -let mk_MFCore_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.CorePathArray n -let mk_MFQuotations_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.QuotationsPath n -let mk_MFLinq_tcref ccu n = mkNonLocalTyconRef2 ccu LinqPathArray n -let mk_MFCollections_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.CollectionsPathArray n -let mk_MFCompilerServices_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.CompilerServicesPath n -let mk_MFRuntimeHelpers_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.RuntimeHelpersPath n -let mk_MFControl_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.ControlPathArray n - - type [] BuiltinAttribInfo = @@ -182,6 +168,24 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d tryFindSysTypeCcu, emitDebugInfoInQuotations: bool, noDebugData: bool) = + let v_langFeatureNullness = (langVersion >= 5.0) + + let v_knownWithoutNull = + if v_langFeatureNullness then KnownWithoutNull else KnownObliviousToNull + + let mkNonGenericTy tcref = TType_app(tcref, [], v_knownWithoutNull) + + let mkNonGenericTyWithNullness tcref nullness = TType_app(tcref, [], nullness) + + let mkNonLocalTyconRef2 ccu path n = mkNonLocalTyconRef (mkNonLocalEntityRef ccu path) n + + let mk_MFCore_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.CorePathArray n + let mk_MFQuotations_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.QuotationsPath n + let mk_MFLinq_tcref ccu n = mkNonLocalTyconRef2 ccu LinqPathArray n + let mk_MFCollections_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.CollectionsPathArray n + let mk_MFCompilerServices_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.CompilerServicesPath n + let mk_MFControl_tcref ccu n = mkNonLocalTyconRef2 ccu FSharpLib.ControlPathArray n + let vara = NewRigidTypar "a" envRange let varb = NewRigidTypar "b" envRange let varc = NewRigidTypar "c" envRange @@ -232,6 +236,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let v_fastFunc_tcr = mk_MFCore_tcref fslibCcu "FSharpFunc`2" let v_refcell_tcr_canon = mk_MFCore_tcref fslibCcu "Ref`1" let v_refcell_tcr_nice = mk_MFCore_tcref fslibCcu "ref`1" + let v_mfe_tcr = mk_MFCore_tcref fslibCcu "MatchFailureException" let dummyAssemblyNameCarryingUsefulErrorInformation path typeName = FSComp.SR.tcGlobalsSystemTypeNotFound (String.concat "." path + "." + typeName) @@ -344,10 +349,10 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let v_nullable_tcr = findSysTyconRef sys "Nullable`1" (* local helpers to build value infos *) - let mkNullableTy ty = TType_app(v_nullable_tcr, [ty], KnownNonNull) - let mkByrefTy ty = TType_app(v_byref_tcr, [ty], KnownNonNull) - let mkNativePtrTy ty = TType_app(v_nativeptr_tcr, [ty], KnownNonNull) - let mkFunTy d r = TType_fun (d, r, NewNullnessVar()) + let mkNullableTy ty = TType_app(v_nullable_tcr, [ty], v_knownWithoutNull) + let mkByrefTy ty = TType_app(v_byref_tcr, [ty], v_knownWithoutNull) + let mkNativePtrTy ty = TType_app(v_nativeptr_tcr, [ty], v_knownWithoutNull) + let mkFunTy d r = TType_fun (d, r, v_knownWithoutNull) let (-->) d r = mkFunTy d r let mkIteratedFunTy dl r = List.foldBack mkFunTy dl r let mkSmallRefTupledTy l = match l with [] -> v_unit_ty | [h] -> h | tys -> mkRawRefTupleTy tys @@ -383,22 +388,22 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let mk_compare_withc_sig ty = [[v_IComparer_ty];[ty]; [ty]], v_int_ty let mk_equality_withc_sig ty = [[v_IEqualityComparer_ty];[ty];[ty]], v_bool_ty let mk_hash_withc_sig ty = [[v_IEqualityComparer_ty]; [ty]], v_int_ty - let mkListTy ty = TType_app(v_list_tcr_nice, [ty], KnownNonNull) - let mkSeqTy ty1 = TType_app(v_seq_tcr, [ty1], KnownNonNull) - let mkRefCellTy ty = TType_app(v_refcell_tcr_canon, [ty], KnownNonNull) - let mkQuerySourceTy ty1 ty2 = TType_app(v_querySource_tcr, [ty1; ty2], KnownNonNull) + let mkListTy ty = TType_app(v_list_tcr_nice, [ty], v_knownWithoutNull) + let mkSeqTy ty1 = TType_app(v_seq_tcr, [ty1], v_knownWithoutNull) + let mkRefCellTy ty = TType_app(v_refcell_tcr_canon, [ty], v_knownWithoutNull) + let mkQuerySourceTy ty1 ty2 = TType_app(v_querySource_tcr, [ty1; ty2], v_knownWithoutNull) let v_tcref_System_Collections_IEnumerable = findSysTyconRef sysCollections "IEnumerable"; let mkArrayType rank (ty : TType) : TType = assert (rank >= 1 && rank <= 32) - TType_app(v_il_arr_tcr_map.[rank - 1], [ty], KnownNonNull) - let mkLazyTy ty = TType_app(lazy_tcr, [ty], KnownNonNull) + TType_app(v_il_arr_tcr_map.[rank - 1], [ty], v_knownWithoutNull) + let mkLazyTy ty = TType_app(lazy_tcr, [ty], v_knownWithoutNull) - let mkPrintfFormatTy aty bty cty dty ety = TType_app(v_format_tcr, [aty;bty;cty;dty; ety], KnownNonNull) - let mk_format4_ty aty bty cty dty = TType_app(v_format4_tcr, [aty;bty;cty;dty], KnownNonNull) - let mkQuotedExprTy aty = TType_app(v_expr_tcr, [aty], KnownNonNull) - let mkRawQuotedExprTy = TType_app(v_raw_expr_tcr, [], KnownNonNull) - let mkQueryBuilderTy = TType_app(v_query_builder_tcref, [], KnownNonNull) - let mkLinqExpressionTy aty = TType_app(v_linqExpression_tcr, [aty], KnownNonNull) + let mkPrintfFormatTy aty bty cty dty ety = TType_app(v_format_tcr, [aty;bty;cty;dty; ety], v_knownWithoutNull) + let mk_format4_ty aty bty cty dty = TType_app(v_format4_tcr, [aty;bty;cty;dty], v_knownWithoutNull) + let mkQuotedExprTy aty = TType_app(v_expr_tcr, [aty], v_knownWithoutNull) + let mkRawQuotedExprTy = TType_app(v_raw_expr_tcr, [], v_knownWithoutNull) + let mkQueryBuilderTy = TType_app(v_query_builder_tcref, [], v_knownWithoutNull) + let mkLinqExpressionTy aty = TType_app(v_linqExpression_tcr, [aty], v_knownWithoutNull) let v_cons_ucref = mkUnionCaseRef v_list_tcr_canon "op_ColonColon" let v_nil_ucref = mkUnionCaseRef v_list_tcr_canon "op_Nil" @@ -530,7 +535,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d | None -> TType_app(tcref, tinst, nullness) let decodeTupleTy tupInfo tinst = - decodeTupleTyAndNullness tupInfo tinst KnownNonNull + decodeTupleTyAndNullness tupInfo tinst v_knownWithoutNull let mk_MFCore_attrib nm : BuiltinAttribInfo = AttribInfo(mkILTyRef(IlxSettings.ilxFsharpCoreLibScopeRef (), FSharpLib.Core + "." + nm), mk_MFCore_tcref fslibCcu nm) @@ -692,7 +697,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let v_seq_generated_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "EnumerateWhile" , None , None , [varb], ([[v_unit_ty --> v_bool_ty]; [mkSeqTy varbTy]], mkSeqTy varbTy)) let v_seq_finally_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "EnumerateThenFinally" , None , None , [varb], ([[mkSeqTy varbTy]; [v_unit_ty --> v_unit_ty]], mkSeqTy varbTy)) let v_seq_of_functions_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "EnumerateFromFunctions" , None , None , [vara;varb], ([[v_unit_ty --> varaTy]; [varaTy --> v_bool_ty]; [varaTy --> varbTy]], mkSeqTy varbTy)) - let v_create_event_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "CreateEvent" , None , None , [vara;varb], ([[varaTy --> v_unit_ty]; [varaTy --> v_unit_ty]; [(v_obj_ty --> (varbTy --> v_unit_ty)) --> varaTy]], TType_app (v_fslib_IEvent2_tcr, [varaTy;varbTy], KnownNonNull))) + let v_create_event_info = makeIntrinsicValRef(fslib_MFRuntimeHelpers_nleref, "CreateEvent" , None , None , [vara;varb], ([[varaTy --> v_unit_ty]; [varaTy --> v_unit_ty]; [(v_obj_ty --> (varbTy --> v_unit_ty)) --> varaTy]], TType_app (v_fslib_IEvent2_tcr, [varaTy;varbTy], v_knownWithoutNull))) let v_seq_to_array_info = makeIntrinsicValRef(fslib_MFSeqModule_nleref, "toArray" , None , Some "ToArray", [varb], ([[mkSeqTy varbTy]], mkArrayType 1 varbTy)) let v_seq_to_list_info = makeIntrinsicValRef(fslib_MFSeqModule_nleref, "toList" , None , Some "ToList" , [varb], ([[mkSeqTy varbTy]], mkListTy varbTy)) let v_seq_map_info = makeIntrinsicValRef(fslib_MFSeqModule_nleref, "map" , None , Some "Map" , [vara;varb], ([[varaTy --> varbTy]; [mkSeqTy varaTy]], mkSeqTy varbTy)) @@ -911,11 +916,18 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d override x.ToString() = "" member __.ilg=ilg - // A table of all intrinsics that the compiler cares about + + /// A table of all intrinsics that the compiler cares about member __.knownIntrinsics = v_knownIntrinsics + member __.assumeNullOnImport = assumeNullOnImport + member __.checkNullness = checkNullness - member __.langFeatureNullness() = langVersion >= 5.0 + + member __.langFeatureNullness = v_langFeatureNullness + + member g.knownWithoutNull = v_knownWithoutNull + member __.langVersion = langVersion // A table of known modules in FSharp.Core. Not all modules are necessarily listed, but the more we list the // better the job we do of mapping from provided expressions back to FSharp.Core F# functions and values. @@ -976,6 +988,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d member __.voidptr_tcr = v_voidptr_tcr member __.ilsigptr_tcr = v_ilsigptr_tcr member __.fastFunc_tcr = v_fastFunc_tcr + member __.MatchFailureException_tcr = v_mfe_tcr member __.tcref_IQueryable = v_tcref_IQueryable member __.tcref_IObservable = v_tcref_IObservable member __.tcref_IObserver = v_tcref_IObserver diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index 8b9640c56a5..fc39b19e4b1 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -696,8 +696,8 @@ let UnifyRefTupleType contextInfo cenv denv m ty ps = if isRefTupleTy cenv.g ty then let ptys = destRefTupleTy cenv.g ty if List.length ps = List.length ptys then ptys - else NewInferenceTypes ps - else NewInferenceTypes ps + else NewInferenceTypes cenv.g ps + else NewInferenceTypes cenv.g ps let contextInfo = match contextInfo with @@ -714,8 +714,8 @@ let UnifyStructTupleType contextInfo cenv denv m ty ps = if isStructTupleTy cenv.g ty then let ptys = destStructTupleTy cenv.g ty if List.length ps = List.length ptys then ptys - else NewInferenceTypes ps - else NewInferenceTypes ps + else NewInferenceTypes cenv.g ps + else NewInferenceTypes cenv.g ps AddCxTypeEqualsType contextInfo denv cenv.css m ty (TType_tuple (tupInfoStruct, ptys)) ptys @@ -725,9 +725,9 @@ let UnifyStructTupleType contextInfo cenv denv m ty ps = let UnifyFunctionTypeUndoIfFailed cenv denv m ty = match tryDestFunTy cenv.g ty with | ValueNone -> - let domainTy = NewInferenceType () - let resultTy = NewInferenceType () - if AddCxTypeEqualsTypeUndoIfFailed denv cenv.css m ty (domainTy --> resultTy) then + let domainTy = NewInferenceType cenv.g + let resultTy = NewInferenceType cenv.g + if AddCxTypeEqualsTypeUndoIfFailed denv cenv.css m ty (mkFunTy cenv.g domainTy resultTy) then ValueSome(domainTy, resultTy) else ValueNone @@ -786,9 +786,9 @@ let UnifyUnitType cenv (env:TcEnv) m ty expr = if AddCxTypeEqualsTypeUndoIfFailed denv cenv.css m ty cenv.g.unit_ty then true else - let domainTy = NewInferenceType () - let resultTy = NewInferenceType () - if AddCxTypeEqualsTypeUndoIfFailed denv cenv.css m ty (domainTy --> resultTy) then + let domainTy = NewInferenceType cenv.g + let resultTy = NewInferenceType cenv.g + if AddCxTypeEqualsTypeUndoIfFailed denv cenv.css m ty (mkFunTy cenv.g domainTy resultTy) then warning (FunctionValueUnexpected(denv, ty, m)) else let reportImplicitlyDiscardError() = @@ -1860,15 +1860,15 @@ let MakeAndPublishSimpleVals cenv env m names mergeNamesInOneNameresEnv = // to C<_> occurs then generate C for a fresh type inference variable ?ty. //------------------------------------------------------------------------- -let FreshenTyconRef m rigid (tcref:TyconRef) declaredTyconTypars = +let FreshenTyconRef (g: TcGlobals) m rigid (tcref:TyconRef) declaredTyconTypars = let tpsorig = declaredTyconTypars let tps = copyTypars tpsorig if rigid <> TyparRigidity.Rigid then tps |> List.iter (fun tp -> tp.SetRigidity rigid) let renaming, tinst = FixupNewTypars m [] [] tpsorig tps - let origObjTy = TType_app(tcref, List.map mkTyparTy tpsorig, KnownNonNull) - let freshTy = TType_app(tcref, tinst, KnownNonNull) + let origObjTy = TType_app(tcref, List.map mkTyparTy tpsorig, g.knownWithoutNull) + let freshTy = TType_app(tcref, tinst, g.knownWithoutNull) (origObjTy, tps, renaming, freshTy) let FreshenPossibleForallTy g m rigid ty = @@ -1881,10 +1881,9 @@ let FreshenPossibleForallTy g m rigid ty = let tps, renaming, tinst = CopyAndFixupTypars m rigid tpsorig tpsorig, tps, tinst, instType renaming tau -let infoOfTyconRef m (tcref:TyconRef) = +let infoOfTyconRef (g:TcGlobals) m (tcref:TyconRef) = let tps, renaming, tinst = FreshenTypeInst m (tcref.Typars m) - tps, renaming, tinst, TType_app (tcref, tinst, AssumeNonNull) - + tps, renaming, tinst, TType_app (tcref, tinst, g.knownWithoutNull) /// Given a abstract method, which may be a generic method, freshen the type in preparation /// to apply it as a constraint to the method that implements the abstract slot @@ -2629,9 +2628,9 @@ module EventDeclarationNormalization = /// Also adjust the "this" type to take into account whether the type is a struct. let FreshenObjectArgType cenv m rigid tcref isExtrinsic declaredTyconTypars = #if EXTENDED_EXTENSION_MEMBERS // indicates if extension members can add additional constraints to type parameters - let tcrefObjTy, enclosingDeclaredTypars, renaming, objTy = FreshenTyconRef m (if isExtrinsic then TyparRigidity.Flexible else rigid) tcref declaredTyconTypars + let tcrefObjTy, enclosingDeclaredTypars, renaming, objTy = FreshenTyconRef cenv.g m (if isExtrinsic then TyparRigidity.Flexible else rigid) tcref declaredTyconTypars #else - let tcrefObjTy, enclosingDeclaredTypars, renaming, objTy = FreshenTyconRef m rigid tcref declaredTyconTypars + let tcrefObjTy, enclosingDeclaredTypars, renaming, objTy = FreshenTyconRef cenv.g m rigid tcref declaredTyconTypars #endif // Struct members have a byref 'this' type (unless they are extrinsic extension members) let thisTy = @@ -2898,15 +2897,16 @@ let MakeApplicableExprNoFlex cenv expr = /// first transform the tree (currently in optimization) let MakeApplicableExprWithFlex cenv (env: TcEnv) expr = + let g = cenv.g let exprTy = tyOfExpr cenv.g expr let m = expr.Range - let isNonFlexibleType ty = isSealedTy cenv.g ty + let isNonFlexibleType ty = isSealedTy g ty - let argTys, retTy = stripFunTy cenv.g exprTy - let curriedActualTypes = argTys |> List.map (tryDestRefTupleTy cenv.g) + let argTys, retTy = stripFunTy g exprTy + let curriedActualTypes = argTys |> List.map (tryDestRefTupleTy g) if (curriedActualTypes.IsEmpty || - curriedActualTypes |> List.exists (List.exists (isByrefTy cenv.g)) || + curriedActualTypes |> List.exists (List.exists (isByrefTy g)) || curriedActualTypes |> List.forall (List.forall isNonFlexibleType)) then ApplicableExpr (cenv, expr, true) @@ -2916,42 +2916,42 @@ let MakeApplicableExprWithFlex cenv (env: TcEnv) expr = if isNonFlexibleType actualType then actualType else - let flexibleType = NewInferenceType () + let flexibleType = NewInferenceType cenv.g AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css m NoTrace actualType flexibleType; flexibleType) // Create a coercion to represent the expansion of the application - let expr = mkCoerceExpr (expr, mkIteratedFunTy (List.map (mkRefTupledTy cenv.g) curriedFlexibleTypes) retTy, m, exprTy) + let expr = mkCoerceExpr (expr, mkIteratedFunTy g (List.map (mkRefTupledTy g) curriedFlexibleTypes) retTy, m, exprTy) ApplicableExpr (cenv, expr, true) - /// Checks, warnings and constraint assertions for downcasts let TcRuntimeTypeTest isCast isOperator cenv denv m tgtTy srcTy = - if TypeDefinitelySubsumesTypeNoCoercion 0 cenv.g cenv.amap m tgtTy srcTy then + let g = cenv.g + if TypeDefinitelySubsumesTypeNoCoercion 0 g cenv.amap m tgtTy srcTy then warning(TypeTestUnnecessary(m)) - if isTyparTy cenv.g srcTy && not (destTyparTy cenv.g srcTy).IsCompatFlex then + if isTyparTy g srcTy && not (destTyparTy g srcTy).IsCompatFlex then error(IndeterminateRuntimeCoercion(denv, srcTy, tgtTy, m)) - if isSealedTy cenv.g srcTy then + if isSealedTy g srcTy then error(RuntimeCoercionSourceSealed(denv, srcTy, m)) - if isSealedTy cenv.g tgtTy || isTyparTy cenv.g tgtTy || not (isInterfaceTy cenv.g srcTy) then + if isSealedTy g tgtTy || isTyparTy g tgtTy || not (isInterfaceTy g srcTy) then if isCast then AddCxTypeMustSubsumeType (ContextInfo.RuntimeTypeTest isOperator) denv cenv.css m NoTrace srcTy tgtTy else AddCxTypeMustSubsumeType ContextInfo.NoContext denv cenv.css m NoTrace srcTy tgtTy - if isErasedType cenv.g tgtTy then + if isErasedType g tgtTy then if isCast then - warning(Error(FSComp.SR.tcTypeCastErased(NicePrint.minimalStringOfType denv tgtTy, NicePrint.minimalStringOfType denv (stripTyEqnsWrtErasure EraseAll cenv.g tgtTy)), m)) + warning(Error(FSComp.SR.tcTypeCastErased(NicePrint.minimalStringOfType denv tgtTy, NicePrint.minimalStringOfType denv (stripTyEqnsWrtErasure EraseAll g tgtTy)), m)) else - error(Error(FSComp.SR.tcTypeTestErased(NicePrint.minimalStringOfType denv tgtTy, NicePrint.minimalStringOfType denv (stripTyEqnsWrtErasure EraseAll cenv.g tgtTy)), m)) + error(Error(FSComp.SR.tcTypeTestErased(NicePrint.minimalStringOfType denv tgtTy, NicePrint.minimalStringOfType denv (stripTyEqnsWrtErasure EraseAll g tgtTy)), m)) else - getErasedTypes cenv.g tgtTy |> - List.iter (fun ety -> if isMeasureTy cenv.g ety + getErasedTypes g tgtTy |> + List.iter (fun ety -> if isMeasureTy g ety then warning(Error(FSComp.SR.tcTypeTestLosesMeasures(NicePrint.minimalStringOfType denv ety), m)) - else warning(Error(FSComp.SR.tcTypeTestLossy(NicePrint.minimalStringOfType denv ety, NicePrint.minimalStringOfType denv (stripTyEqnsWrtErasure EraseAll cenv.g ety)), m))) + else warning(Error(FSComp.SR.tcTypeTestLossy(NicePrint.minimalStringOfType denv ety, NicePrint.minimalStringOfType denv (stripTyEqnsWrtErasure EraseAll g ety)), m))) /// Checks, warnings and constraint assertions for upcasts let TcStaticUpcast cenv denv m tgtTy srcTy = @@ -3348,7 +3348,7 @@ let AnalyzeArbitraryExprAsEnumerable cenv (env: TcEnv) localAlloc m exprty expr else None // Next try to typecheck the thing as a sequence - let enumElemTy = NewInferenceType () + let enumElemTy = NewInferenceType cenv.g let exprTyAsSeq = mkSeqTy cenv.g enumElemTy match probe exprTyAsSeq with @@ -3365,7 +3365,7 @@ let AnalyzeArbitraryExprAsEnumerable cenv (env: TcEnv) localAlloc m exprty expr // Used inside sequence expressions let ConvertArbitraryExprToEnumerable cenv ty (env: TcEnv) (expr:Expr) = let m = expr.Range - let enumElemTy = NewInferenceType () + let enumElemTy = NewInferenceType cenv.g if AddCxTypeMustSubsumeTypeUndoIfFailed env.DisplayEnv cenv.css m ( mkSeqTy cenv.g enumElemTy) ty then expr, enumElemTy else @@ -3383,43 +3383,43 @@ let ConvertArbitraryExprToEnumerable cenv ty (env: TcEnv) (expr:Expr) = let mkSeqEmpty cenv env m genTy = // We must discover the 'zero' of the monadic algebra being generated in order to compile failing matches. - let genResultTy = NewInferenceType () + let genResultTy = NewInferenceType cenv.g UnifyTypes cenv env m genTy (mkSeqTy cenv.g genResultTy) mkCallSeqEmpty cenv.g m genResultTy let mkSeqCollect cenv env m enumElemTy genTy lam enumExpr = - let genResultTy = NewInferenceType () + let genResultTy = NewInferenceType cenv.g UnifyTypes cenv env m genTy (mkSeqTy cenv.g genResultTy) let enumExpr = mkCoerceIfNeeded cenv.g (mkSeqTy cenv.g enumElemTy) (tyOfExpr cenv.g enumExpr) enumExpr mkCallSeqCollect cenv.g m enumElemTy genResultTy lam enumExpr let mkSeqUsing cenv (env: TcEnv) m resourceTy genTy resourceExpr lam = AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css m NoTrace cenv.g.system_IDisposable_ty resourceTy - let genResultTy = NewInferenceType () + let genResultTy = NewInferenceType cenv.g UnifyTypes cenv env m genTy (mkSeqTy cenv.g genResultTy) mkCallSeqUsing cenv.g m resourceTy genResultTy resourceExpr lam let mkSeqDelay cenv env m genTy lam = - let genResultTy = NewInferenceType () + let genResultTy = NewInferenceType cenv.g UnifyTypes cenv env m genTy (mkSeqTy cenv.g genResultTy) mkCallSeqDelay cenv.g m genResultTy (mkUnitDelayLambda cenv.g m lam) let mkSeqAppend cenv env m genTy e1 e2 = - let genResultTy = NewInferenceType () + let genResultTy = NewInferenceType cenv.g UnifyTypes cenv env m genTy (mkSeqTy cenv.g genResultTy) let e1 = mkCoerceIfNeeded cenv.g (mkSeqTy cenv.g genResultTy) (tyOfExpr cenv.g e1) e1 let e2 = mkCoerceIfNeeded cenv.g (mkSeqTy cenv.g genResultTy) (tyOfExpr cenv.g e2) e2 mkCallSeqAppend cenv.g m genResultTy e1 e2 let mkSeqFromFunctions cenv env m genTy e1 e2 = - let genResultTy = NewInferenceType () + let genResultTy = NewInferenceType cenv.g UnifyTypes cenv env m genTy (mkSeqTy cenv.g genResultTy) let e2 = mkCoerceIfNeeded cenv.g (mkSeqTy cenv.g genResultTy) (tyOfExpr cenv.g e2) e2 mkCallSeqGenerated cenv.g m genResultTy e1 e2 let mkSeqFinally cenv env m genTy e1 e2 = - let genResultTy = NewInferenceType () + let genResultTy = NewInferenceType cenv.g UnifyTypes cenv env m genTy (mkSeqTy cenv.g genResultTy) let e1 = mkCoerceIfNeeded cenv.g (mkSeqTy cenv.g genResultTy) (tyOfExpr cenv.g e1) e1 mkCallSeqFinally cenv.g m genResultTy e1 e2 @@ -3823,9 +3823,9 @@ let EliminateInitializationGraphs | _ -> let ty = v.Type let m = v.Range - let vty = (mkLazyTy g ty) + let vty = mkLazyTy g ty - let fty = (g.unit_ty --> ty) + let fty = mkFunTy g g.unit_ty ty let flazy, felazy = Tastops.mkCompGenLocal m v.LogicalName fty let frhs = mkUnitDelayLambda g m e if mustHaveArity then flazy.SetValReprInfo (Some(InferArityOfExpr g AllowTypeDirectedDetupling.Yes fty [] [] frhs)) @@ -3949,7 +3949,7 @@ let CheckAndRewriteObjectCtor g env (ctorLambaExpr:Expr) = error(expr) let body = checkAndRewrite body - mkMultiLambdas m tps vsl (body, returnTy) + mkMultiLambdas g m tps vsl (body, returnTy) @@ -3983,7 +3983,7 @@ let buildApp cenv expr resultTy arg m = | ApplicableExpr(_, Expr.App(Expr.Val(vf, _, _), _, _, [], _), _), _ when (valRefEq g vf g.nativeptr_tobyref_vref) -> - let argty = NewInferenceType() + let argty = NewInferenceType g let resultTy = mkByrefTyWithInference g argty (NewByRefKindInferenceType g m) expr.SupplyArgument(arg, m), resultTy @@ -4370,11 +4370,14 @@ and TcValSpec cenv env declKind newOk containerInfo memFlagsOpt thisTyOpt tpenv match memberFlags.MemberKind with | MemberKind.PropertyGet -> if SynInfo.HasNoArgs valSynInfo then - (cenv.g.unit_ty --> declaredTy), (SynInfo.IncorporateEmptyTupledArgForPropertyGetter valSynInfo) + let getterTy = mkFunTy cenv.g cenv.g.unit_ty declaredTy + getterTy, (SynInfo.IncorporateEmptyTupledArgForPropertyGetter valSynInfo) else declaredTy, valSynInfo | _ -> - let setterTy = (mkRefTupledTy cenv.g (List.map fst (List.concat arginfos) @ [returnTy]) --> cenv.g.unit_ty) + let setterArgTys = List.map fst (List.concat arginfos) @ [returnTy] + let setterArgTy = mkRefTupledTy cenv.g setterArgTys + let setterTy = mkFunTy cenv.g setterArgTy cenv.g.unit_ty let synInfo = SynInfo.IncorporateSetterArg valSynInfo setterTy, synInfo | MemberKind.PropertyGetSet -> @@ -4385,7 +4388,7 @@ and TcValSpec cenv env declKind newOk containerInfo memFlagsOpt thisTyOpt tpenv let ty', valSynInfo = if memberFlags.IsInstance then - (thisTy --> ty'), (SynInfo.IncorporateSelfArg valSynInfo) + (mkFunTy cenv.g thisTy ty'), (SynInfo.IncorporateSelfArg valSynInfo) else ty', valSynInfo @@ -4408,7 +4411,7 @@ and TcValSpec cenv env declKind newOk containerInfo memFlagsOpt thisTyOpt tpenv |> List.map (fun (argty, argInfo) -> if SynInfo.IsOptionalArg argInfo then mkOptionTy cenv.g argty else argty)) - mkIteratedFunTy (List.map (mkRefTupledTy cenv.g) curriedArgTys) returnTy + mkIteratedFunTy cenv.g (List.map (mkRefTupledTy cenv.g) curriedArgTys) returnTy else ty' let memberInfoOpt = @@ -4429,9 +4432,9 @@ and TcValSpec cenv env declKind newOk containerInfo memFlagsOpt thisTyOpt tpenv let delTy = FindDelegateTypeOfPropertyEvent cenv.g cenv.amap id.idText id.idRange declaredTy let ty = if memberFlags.IsInstance then - thisTy --> (delTy --> cenv.g.unit_ty) + mkFunTy cenv.g thisTy (mkFunTy cenv.g delTy cenv.g.unit_ty) else - (delTy --> cenv.g.unit_ty) + mkFunTy cenv.g delTy cenv.g.unit_ty yield reallyGenerateOneMember(ident("add_" + id.idText, id.idRange), valSynInfo, ty, memberFlags) yield reallyGenerateOneMember(ident("remove_" + id.idText, id.idRange), valSynInfo, ty, memberFlags) ] @@ -4532,11 +4535,12 @@ and TcTyparDecls cenv env synTypars = List.map (TcTyparDecl cenv env) synTypars /// If optKind=None, we need to determine the kind (we're in *synthesis* mode) /// and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscopedTyparEnv) ty = + let g = cenv.g match ty with | SynType.LongIdent(LongIdentWithDots([], _)) -> // special case when type name is absent - i.e. empty inherit part in type declaration - cenv.g.obj_ty, tpenv + g.obj_ty, tpenv | SynType.LongIdent(LongIdentWithDots(tc, _) as lidwd) -> let m = lidwd.Range let ad = env.eAccessRights @@ -4581,7 +4585,7 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped let ad = env.eAccessRights let ltyp, tpenv = TcType cenv newOk checkCxs occ env tpenv ltyp match ltyp with - | AppTy cenv.g (tcref, tinst) -> + | AppTy g (tcref, tinst) -> let tcref = ResolveTypeLongIdentInTyconRef cenv.tcSink cenv.nameResolver env.eNameResEnv (TypeNameResolutionInfo.ResolveToTypeRefs (TypeNameResolutionStaticArgsInfo.FromTyArgs args.Length)) ad m tcref longId TcTypeApp cenv newOk checkCxs occ env tpenv m tcref tinst args | _ -> error(Error(FSComp.SR.tcTypeHasNoNestedTypes(), m)) @@ -4602,11 +4606,12 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped | SynType.Fun(domainTy, resultTy, _) -> let domainTy', tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv domainTy let resultTy', tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv resultTy - (domainTy' --> resultTy'), tpenv + let ty' = mkFunTy cenv.g domainTy' resultTy' + ty', tpenv | SynType.Array (n, elemTy, m) -> let elemTy, tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv elemTy - mkArrayTy cenv.g n KnownNonNull elemTy m, tpenv + mkArrayTy g n g.knownWithoutNull elemTy m, tpenv | SynType.Var (tp, _) -> let tp', tpenv = TcTyparOrMeasurePar optKind cenv env newOk tpenv tp @@ -4630,8 +4635,9 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped | SynType.HashConstraint(ty, m) -> let tp = TcAnonTypeOrMeasure (Some TyparKind.Type) cenv TyparRigidity.WarnIfNotRigid TyparDynamicReq.Yes newOk m let ty', tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv ty - AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css m NoTrace ty' (mkTyparTy tp) - tp.AsType AssumeNonNull, tpenv + let tpTy = mkTyparTy tp + AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css m NoTrace ty' tpTy + tpTy, tpenv | SynType.StaticConstant (c, m) -> match c, optKind with @@ -4650,13 +4656,13 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped | SynType.WithNull(innerTy, m) -> let innerTyC, tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv innerTy - if cenv.g.langFeatureNullness() then - if TypeNullNever cenv.g innerTyC then + if g.langFeatureNullness then + if TypeNullNever g innerTyC then let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString), m)) - // TODO - doesn't feel right - it will add KnownNotNull + KnownNull --> KnownNull, e.g. + // TODO - doesn't feel right - it will add KnownNotNull + KnownWithNull --> KnownWithNull, e.g. // let f (x: string) = (x = null) - match tryAddNullnessToTy KnownNull innerTyC with + match tryAddNullnessToTy KnownWithNull innerTyC with | None -> let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString), m)) @@ -4766,6 +4772,7 @@ and TcTyparConstraints cenv newOk checkCxs occ env tpenv wcs = #if !NO_EXTENSIONTYPING and TcStaticConstantParameter cenv (env:TcEnv) tpenv kind (v:SynType) idOpt container = + let g = cenv.g let fail() = error(Error(FSComp.SR.etInvalidStaticArgument(NicePrint.minimalStringOfType env.DisplayEnv kind), v.Range)) let record ttype = match idOpt with @@ -4778,20 +4785,20 @@ and TcStaticConstantParameter cenv (env:TcEnv) tpenv kind (v:SynType) idOpt cont | SynType.StaticConstant(sc, _) -> let v = match sc with - | SynConst.Byte n when typeEquiv cenv.g cenv.g.byte_ty kind -> record(cenv.g.byte_ty); box (n:byte) - | SynConst.Int16 n when typeEquiv cenv.g cenv.g.int16_ty kind -> record(cenv.g.int16_ty); box (n:int16) - | SynConst.Int32 n when typeEquiv cenv.g cenv.g.int32_ty kind -> record(cenv.g.int32_ty); box (n:int) - | SynConst.Int64 n when typeEquiv cenv.g cenv.g.int64_ty kind -> record(cenv.g.int64_ty); box (n:int64) - | SynConst.SByte n when typeEquiv cenv.g cenv.g.sbyte_ty kind -> record(cenv.g.sbyte_ty); box (n:sbyte) - | SynConst.UInt16 n when typeEquiv cenv.g cenv.g.uint16_ty kind -> record(cenv.g.uint16_ty); box (n:uint16) - | SynConst.UInt32 n when typeEquiv cenv.g cenv.g.uint32_ty kind -> record(cenv.g.uint32_ty); box (n:uint32) - | SynConst.UInt64 n when typeEquiv cenv.g cenv.g.uint64_ty kind -> record(cenv.g.uint64_ty); box (n:uint64) - | SynConst.Decimal n when typeEquiv cenv.g cenv.g.decimal_ty kind -> record(cenv.g.decimal_ty); box (n:decimal) - | SynConst.Single n when typeEquiv cenv.g cenv.g.float32_ty kind -> record(cenv.g.float32_ty); box (n:single) - | SynConst.Double n when typeEquiv cenv.g cenv.g.float_ty kind -> record(cenv.g.float_ty); box (n:double) - | SynConst.Char n when typeEquiv cenv.g cenv.g.char_ty kind -> record(cenv.g.char_ty); box (n:char) - | SynConst.String (s, _) when s <> null && typeEquiv cenv.g cenv.g.string_ty kind -> record(cenv.g.string_ty); box (s:string) - | SynConst.Bool b when typeEquiv cenv.g cenv.g.bool_ty kind -> record(cenv.g.bool_ty); box (b:bool) + | SynConst.Byte n when typeEquiv g g.byte_ty kind -> record(g.byte_ty); box (n:byte) + | SynConst.Int16 n when typeEquiv g g.int16_ty kind -> record(g.int16_ty); box (n:int16) + | SynConst.Int32 n when typeEquiv g g.int32_ty kind -> record(g.int32_ty); box (n:int) + | SynConst.Int64 n when typeEquiv g g.int64_ty kind -> record(g.int64_ty); box (n:int64) + | SynConst.SByte n when typeEquiv g g.sbyte_ty kind -> record(g.sbyte_ty); box (n:sbyte) + | SynConst.UInt16 n when typeEquiv g g.uint16_ty kind -> record(g.uint16_ty); box (n:uint16) + | SynConst.UInt32 n when typeEquiv g g.uint32_ty kind -> record(g.uint32_ty); box (n:uint32) + | SynConst.UInt64 n when typeEquiv g g.uint64_ty kind -> record(g.uint64_ty); box (n:uint64) + | SynConst.Decimal n when typeEquiv g g.decimal_ty kind -> record(g.decimal_ty); box (n:decimal) + | SynConst.Single n when typeEquiv g g.float32_ty kind -> record(g.float32_ty); box (n:single) + | SynConst.Double n when typeEquiv g g.float_ty kind -> record(g.float_ty); box (n:double) + | SynConst.Char n when typeEquiv g g.char_ty kind -> record(g.char_ty); box (n:char) + | SynConst.String (s, _) when s <> null && typeEquiv g g.string_ty kind -> record(g.string_ty); box (s:string) + | SynConst.Bool b when typeEquiv g g.bool_ty kind -> record(g.bool_ty); box (b:bool) | _ -> fail() v, tpenv | SynType.StaticConstantExpr(e, _ ) -> @@ -4800,27 +4807,27 @@ and TcStaticConstantParameter cenv (env:TcEnv) tpenv kind (v:SynType) idOpt cont let te, tpenv' = TcExprNoRecover cenv kind env tpenv e // Evaluate the constant expression using static attribute argument rules - let te = EvalLiteralExprOrAttribArg cenv.g te + let te = EvalLiteralExprOrAttribArg g te let v = match stripExpr te with // Check we have a residue constant. We know the type was correct because we checked the expression with this type. | Expr.Const(c, _, _) -> match c with - | Const.Byte n -> record(cenv.g.byte_ty); box (n:byte) - | Const.Int16 n -> record(cenv.g.int16_ty); box (n:int16) - | Const.Int32 n -> record(cenv.g.int32_ty); box (n:int) - | Const.Int64 n -> record(cenv.g.int64_ty); box (n:int64) - | Const.SByte n -> record(cenv.g.sbyte_ty); box (n:sbyte) - | Const.UInt16 n -> record(cenv.g.uint16_ty); box (n:uint16) - | Const.UInt32 n -> record(cenv.g.uint32_ty); box (n:uint32) - | Const.UInt64 n -> record(cenv.g.uint64_ty); box (n:uint64) - | Const.Decimal n -> record(cenv.g.decimal_ty); box (n:decimal) - | Const.Single n -> record(cenv.g.float32_ty); box (n:single) - | Const.Double n -> record(cenv.g.float_ty); box (n:double) - | Const.Char n -> record(cenv.g.char_ty); box (n:char) + | Const.Byte n -> record(g.byte_ty); box (n:byte) + | Const.Int16 n -> record(g.int16_ty); box (n:int16) + | Const.Int32 n -> record(g.int32_ty); box (n:int) + | Const.Int64 n -> record(g.int64_ty); box (n:int64) + | Const.SByte n -> record(g.sbyte_ty); box (n:sbyte) + | Const.UInt16 n -> record(g.uint16_ty); box (n:uint16) + | Const.UInt32 n -> record(g.uint32_ty); box (n:uint32) + | Const.UInt64 n -> record(g.uint64_ty); box (n:uint64) + | Const.Decimal n -> record(g.decimal_ty); box (n:decimal) + | Const.Single n -> record(g.float32_ty); box (n:single) + | Const.Double n -> record(g.float_ty); box (n:double) + | Const.Char n -> record(g.char_ty); box (n:char) | Const.String null -> fail() - | Const.String s -> record(cenv.g.string_ty); box (s:string) - | Const.Bool b -> record(cenv.g.bool_ty); box (b:bool) + | Const.String s -> record(g.string_ty); box (s:string) + | Const.Bool b -> record(g.bool_ty); box (b:bool) | _ -> fail() | _ -> error(Error(FSComp.SR.tcInvalidConstantExpression(), v.Range)) v, tpenv' @@ -4950,8 +4957,9 @@ and TcProvidedTypeApp cenv env tpenv tcref args m = /// In this case, 'args' is only the instantiation of the suffix type arguments, and pathTypeArgs gives /// the prefix of type arguments. and TcTypeApp cenv newOk checkCxs occ env tpenv m tcref pathTypeArgs (synArgTys: SynType list) = + let g = cenv.g CheckTyconAccessible cenv.amap m env.eAccessRights tcref |> ignore - CheckEntityAttributes cenv.g tcref m |> CommitOperationResult + CheckEntityAttributes g tcref m |> CommitOperationResult #if !NO_EXTENSIONTYPING // Provided types are (currently) always non-generic. Their names may include mangled @@ -4959,7 +4967,7 @@ and TcTypeApp cenv newOk checkCxs occ env tpenv m tcref pathTypeArgs (synArgTys: if tcref.Deref.IsProvided then TcProvidedTypeApp cenv env tpenv tcref synArgTys m else #endif - let tps, _, tinst, _ = infoOfTyconRef m tcref + let tps, _, tinst = FreshenTypeInst m (tcref.Typars m) // If we're not checking constraints, i.e. when we first assert the super/interfaces of a type definition, then just // clear the constraint lists of the freshly generated type variables. A little ugly but fairly localized. @@ -4980,7 +4988,7 @@ and TcTypeApp cenv newOk checkCxs occ env tpenv m tcref pathTypeArgs (synArgTys: List.iter2 (UnifyTypes cenv env m) tinst actualArgTys // Try to decode System.Tuple --> F~ tuple types etc. - let ty = cenv.g.decompileType tcref actualArgTys KnownNonNull + let ty = g.decompileType tcref actualArgTys g.knownWithoutNull ty, tpenv @@ -5031,7 +5039,7 @@ and TcSimplePat optArgsOK checkCxs cenv ty env (tpenv, names, takenNames) p = if not optArgsOK then errorR(Error(FSComp.SR.tcOptionalArgsOnlyOnMembers(), m)) - let tyarg = NewInferenceType () + let tyarg = NewInferenceType cenv.g UnifyTypes cenv env m ty (mkOptionTy cenv.g tyarg) let _, names, takenNames = TcPatBindingName cenv env id ty isMemberThis None None (ValInline.Optional, permitInferTypars, noArgOrRetAttribs, false, None, compgen) (names, takenNames) @@ -5112,7 +5120,7 @@ and TcSimplePats cenv optArgsOK checkCxs ty env (tpenv, names, takenNames:Set<_ TcSimplePats cenv optArgsOK checkCxs ty env (tpenv, names, takenNames) p and TcSimplePatsOfUnknownType cenv optArgsOK checkCxs env tpenv spats = - let argty = NewInferenceType () + let argty = NewInferenceType cenv.g TcSimplePats cenv optArgsOK checkCxs argty env (tpenv, NameMap.empty, Set.empty) spats and TcPatBindingName cenv env id ty isMemberThis vis1 topValData (inlineFlag, declaredTypars, argAttribs, isMutable, vis2, compgen) (names, takenNames:Set) = @@ -5299,7 +5307,7 @@ and TcPat warnOnUpper cenv env topValInfo vFlags (tpenv, names, takenNames) ty p | _ -> error(Error(FSComp.SR.tcInvalidArgForParameterizedPattern(), x.Range)) let activePatArgsAsSynExprs = List.map convSynPatToSynExpr activePatArgsAsSynPats - let activePatResTys = NewInferenceTypes apinfo.Names + let activePatResTys = NewInferenceTypes cenv.g apinfo.Names let activePatType = apinfo.OverallType cenv.g m ty activePatResTys let delayed = activePatArgsAsSynExprs |> List.map (fun arg -> DelayedApp(ExprAtomicFlag.NonAtomic, arg, unionRanges (rangeOfLid longId) arg.Range)) @@ -5434,13 +5442,13 @@ and TcPat warnOnUpper cenv env topValInfo vFlags (tpenv, names, takenNames) ty p | SynPat.QuoteExpr(_, m) -> error (Error(FSComp.SR.tcInvalidPattern(), m)) | SynPat.Tuple (args, m) -> - let argTys = NewInferenceTypes args + let argTys = NewInferenceTypes cenv.g args UnifyTypes cenv env m ty (TType_tuple (tupInfoRef, argTys)) let args', acc = TcPatterns warnOnUpper cenv env vFlags (tpenv, names, takenNames) argTys args (fun values -> TPat_tuple(tupInfoRef, List.map (fun f -> f values) args', argTys, m)), acc | SynPat.StructTuple (args, m) -> - let argTys = NewInferenceTypes args + let argTys = NewInferenceTypes cenv.g args UnifyTypes cenv env m ty (TType_tuple (tupInfoStruct, argTys)) let args', acc = TcPatterns warnOnUpper cenv env vFlags (tpenv, names, takenNames) argTys args (fun values -> TPat_tuple(tupInfoStruct, List.map (fun f -> f values) args', argTys, m)), acc @@ -5449,7 +5457,7 @@ and TcPat warnOnUpper cenv env topValInfo vFlags (tpenv, names, takenNames) ty p TcPat warnOnUpper cenv env None vFlags (tpenv, names, takenNames) ty p | SynPat.ArrayOrList (isArray, args, m) -> - let argty = NewInferenceType () + let argty = NewInferenceType cenv.g UnifyTypes cenv env m ty (if isArray then mkArrayType cenv.g argty else Tastops.mkListTy cenv.g argty) let args', acc = TcPatterns warnOnUpper cenv env vFlags (tpenv, names, takenNames) (List.map (fun _ -> argty) args) args (fun values -> @@ -5460,7 +5468,7 @@ and TcPat warnOnUpper cenv env topValInfo vFlags (tpenv, names, takenNames) ty p | SynPat.Record (flds, m) -> let tcref, fldsmap, _fldsList = BuildFieldMap cenv env true ty flds m // REVIEW: use _fldsList to type check pattern in code order not field defn order - let _, inst, tinst, gtyp = infoOfTyconRef m tcref + let _, inst, tinst, gtyp = infoOfTyconRef cenv.g m tcref UnifyTypes cenv env m ty gtyp let fields = tcref.TrueInstanceFieldsAsList let ftys = fields |> List.map (fun fsp -> actualTyOfRecdField inst fsp, fsp) @@ -5536,13 +5544,13 @@ and UnifyTypesAndRecover cenv env m expectedTy actualTy = errorRecovery e m and TcExprOfUnknownType cenv env tpenv expr = - let exprty = NewInferenceType () + let exprty = NewInferenceType cenv.g let expr', tpenv = TcExpr cenv exprty env tpenv expr expr', exprty, tpenv and TcExprFlex cenv flex compat ty (env: TcEnv) tpenv (e: SynExpr) = if flex then - let argty = NewInferenceType () + let argty = NewInferenceType cenv.g if compat then (destTyparTy cenv.g argty).SetIsCompatFlex(true) AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css e.Range NoTrace ty argty @@ -5582,7 +5590,7 @@ and TcExprNoRecover cenv ty (env: TcEnv) tpenv (expr: SynExpr) = // and has been added relatively late in F# 4.0 to preserve the structure of previous code. It pushes a 'delayed' parameter // through TcExprOfUnknownType, TcExpr and TcExprNoRecover and TcExprOfUnknownTypeThen cenv env tpenv expr delayed = - let exprty = NewInferenceType () + let exprty = NewInferenceType cenv.g let expr', tpenv = try TcExprThen cenv exprty env tpenv expr delayed @@ -5688,7 +5696,7 @@ and CheckSuperInit cenv objTy m = //------------------------------------------------------------------------- and TcExprUndelayedNoType cenv env tpenv synExpr : Expr * TType * _ = - let overallTy = NewInferenceType () + let overallTy = NewInferenceType cenv.g let expr, tpenv = TcExprUndelayed cenv overallTy env tpenv synExpr expr, overallTy, tpenv @@ -5807,7 +5815,7 @@ and TcExprUndelayed cenv overallTy env tpenv (synExpr: SynExpr) = mkNull m overallTy, tpenv | SynExpr.Lazy (synInnerExpr, m) -> - let innerTy = NewInferenceType () + let innerTy = NewInferenceType cenv.g UnifyTypes cenv env m overallTy (mkLazyTy cenv.g innerTy) let innerExpr, tpenv = TcExpr cenv innerTy env tpenv synInnerExpr let expr = mkLazyDelayed cenv.g m innerTy (mkUnitDelayLambda cenv.g m innerExpr) @@ -5831,7 +5839,7 @@ and TcExprUndelayed cenv overallTy env tpenv (synExpr: SynExpr) = | SynExpr.ArrayOrList (isArray, args, m) -> CallExprHasTypeSink cenv.tcSink (m, env.NameEnv, overallTy, env.DisplayEnv, env.eAccessRights) - let argty = NewInferenceType () + let argty = NewInferenceType cenv.g UnifyTypes cenv env m overallTy (if isArray then mkArrayType cenv.g argty else Tastops.mkListTy cenv.g argty) // Always allow subsumption if a nominal type is known prior to type checking any arguments @@ -5932,7 +5940,7 @@ and TcExprUndelayed cenv overallTy env tpenv (synExpr: SynExpr) = TcExprUndelayed cenv overallTy env tpenv replacementExpr | _ -> - let genCollElemTy = NewInferenceType () + let genCollElemTy = NewInferenceType cenv.g let genCollTy = (if isArray then mkArrayType else mkListTy) cenv.g genCollElemTy @@ -6129,7 +6137,7 @@ and TcExprUndelayed cenv overallTy env tpenv (synExpr: SynExpr) = mkf n e2', tpenv | SynExpr.LibraryOnlyILAssembly (s, tyargs, args, rtys, m) -> - let argTys = NewInferenceTypes args + let argTys = NewInferenceTypes cenv.g args let tyargs', tpenv = TcTypes cenv NewTyparsOK CheckCxs ItemOccurence.UseInType env tpenv tyargs // No subsumption at uses of IL assembly code let flexes = argTys |> List.map (fun _ -> false) @@ -6540,7 +6548,7 @@ and FreshenObjExprAbstractSlot cenv (env: TcEnv) (implty:TType) virtNameAndArity = FreshenAbstractSlot cenv.g cenv.amap mBinding synTyparDecls absSlot // Work out the required type of the member - let bindingTy = implty --> (mkMethodTy cenv.g argTysFromAbsSlot retTyFromAbsSlot) + let bindingTy = mkFunTy cenv.g implty (mkMethodTy cenv.g argTysFromAbsSlot retTyFromAbsSlot) Some(typarsFromAbsSlotAreRigid, typarsFromAbsSlot, bindingTy) @@ -6579,7 +6587,7 @@ and TcObjectExprBinding cenv (env: TcEnv) implty tpenv (absSlotInfo, bind) = | Some(_, _, memberTyFromAbsSlot) -> memberTyFromAbsSlot | _ -> - implty --> NewInferenceType () + mkFunTy cenv.g implty (NewInferenceType cenv.g) let (CheckedBindingInfo(inlineFlag, bindingAttribs, _, _, ExplicitTyparInfo(_, declaredTypars, _), nameToPrelimValSchemeMap, rhsExpr, _, _, m, _, _, _, _), tpenv) = let flex, tpenv = TcNonrecBindingTyparDecls cenv env tpenv bind @@ -6823,11 +6831,11 @@ and TcConstStringExpr cenv overallTy env m tpenv s = if (AddCxTypeEqualsTypeUndoIfFailed env.DisplayEnv cenv.css m overallTy cenv.g.string_ty) then mkString cenv.g m s, tpenv else - let aty = NewInferenceType () - let bty = NewInferenceType () - let cty = NewInferenceType () - let dty = NewInferenceType () - let ety = NewInferenceType () + let aty = NewInferenceType cenv.g + let bty = NewInferenceType cenv.g + let cty = NewInferenceType cenv.g + let dty = NewInferenceType cenv.g + let ety = NewInferenceType cenv.g let ty' = mkPrintfFormatTy cenv.g aty bty cty dty ety if (not (isObjTy cenv.g overallTy) && AddCxTypeMustSubsumeTypeUndoIfFailed env.DisplayEnv cenv.css m overallTy ty') then // Parse the format string to work out the phantom types @@ -6956,7 +6964,7 @@ and TcRecdExpr cenv overallTy env tpenv (inherits, optOrigExpr, flds, mWholeExpr | [] -> [] | _ -> let tcref, _, fldsList = BuildFieldMap cenv env hasOrigExpr overallTy flds mWholeExpr - let _, _, _, gtyp = infoOfTyconRef mWholeExpr tcref + let _, _, _, gtyp = infoOfTyconRef cenv.g mWholeExpr tcref UnifyTypes cenv env mWholeExpr overallTy gtyp [ for n, v in fldsList do @@ -7115,7 +7123,7 @@ and TcForEachExpr cenv overallTy env tpenv (pat, enumSynExpr, bodySynExpr, mWhol //------------------------------------------------------------------------- and TcQuotationExpr cenv overallTy env tpenv (_oper, raw, ast, isFromQueryExpression, m) = - let astTy = NewInferenceType () + let astTy = NewInferenceType cenv.g // Assert the overall type for the domain of the quotation template UnifyTypes cenv env m overallTy (if raw then mkRawQuotedExprTy cenv.g else mkQuotedExprTy cenv.g astTy) @@ -7627,13 +7635,13 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv let varSpaceWithFirstVars = addVarsToVarSpace varSpace (fun _mCustomOp env -> use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink - let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType()) env tpenv (firstSourcePat, None) + let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType cenv.g) env tpenv (firstSourcePat, None) vspecs, envinner) let varSpaceWithSecondVars = addVarsToVarSpace varSpaceWithFirstVars (fun _mCustomOp env -> use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink - let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType()) env tpenv (secondSourcePat, None) + let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType cenv.g) env tpenv (secondSourcePat, None) vspecs, envinner) let varSpaceWithGroupJoinVars = @@ -7641,7 +7649,7 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv | Some pat3 -> addVarsToVarSpace varSpaceWithFirstVars (fun _mCustomOp env -> use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink - let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType()) env tpenv (pat3, None) + let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType cenv.g) env tpenv (pat3, None) vspecs, envinner) | None -> varSpace @@ -7774,7 +7782,7 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv let varSpace = addVarsToVarSpace varSpace (fun _mCustomOp env -> use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink - let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType()) env tpenv (pat, None) + let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType cenv.g) env tpenv (pat, None) vspecs, envinner) Some (trans true q varSpace innerComp (fun holeFill -> translatedCtxt (mkSynCall "For" mFor [wrappedSourceExpr; SynExpr.MatchLambda(false, sourceExpr.Range, [Clause(pat, None, holeFill, mPat, SequencePointAtTarget)], spBind, mFor) ])) ) @@ -8014,7 +8022,7 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv | [NormalizedBinding(_vis, NormalBinding, false, false, _, _, _, _, pat, _, _, _)] -> // successful case use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink - let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType()) env tpenv (pat, None) + let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType cenv.g) env tpenv (pat, None) vspecs, envinner | _ -> // error case @@ -8044,7 +8052,7 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv let varSpace = addVarsToVarSpace varSpace (fun _mCustomOp env -> use _holder = TemporarilySuspendReportingTypecheckResultsToSink cenv.tcSink - let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType()) env tpenv (pat, None) + let _, _, vspecs, envinner, _ = TcMatchPattern cenv (NewInferenceType cenv.g) env tpenv (pat, None) vspecs, envinner) let rhsExpr = if isFromSource then mkSourceExpr rhsExpr else rhsExpr @@ -8178,7 +8186,7 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv | SynExpr.YieldOrReturn ((_, true), _, _) -> { env with eContextInfo = ContextInfo.ReturnInComputationExpression } | _ -> env - let lambdaExpr , tpenv= TcExpr cenv (builderTy --> overallTy) env tpenv lambdaExpr + let lambdaExpr , tpenv= TcExpr cenv (mkFunTy cenv.g builderTy overallTy) env tpenv lambdaExpr // beta-var-reduce to bind the builder using a 'let' binding let coreExpr = mkApps cenv.g ((lambdaExpr, tyOfExpr cenv.g lambdaExpr), [], [interpExpr], mBuilderVal) @@ -8193,7 +8201,7 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv /// Also "ienumerable extraction" is performed on arguments to "for". and TcSequenceExpression cenv env tpenv comp overallTy m = - let genEnumElemTy = NewInferenceType () + let genEnumElemTy = NewInferenceType cenv.g UnifyTypes cenv env m overallTy (mkSeqTy cenv.g genEnumElemTy) // Allow subsumption at 'yield' if the element type is nominal prior to the analysis of the body of the sequence expression @@ -8302,8 +8310,8 @@ and TcSequenceExpression cenv env tpenv comp overallTy m = // 'use x = expr in expr' | SynExpr.LetOrUse (_isRec, true, [Binding (_vis, NormalBinding, _, _, _, _, _, pat, _, rhsExpr, _, _spBind)], innerComp, wholeExprMark) -> - let bindPatTy = NewInferenceType () - let inputExprTy = NewInferenceType () + let bindPatTy = NewInferenceType cenv.g + let inputExprTy = NewInferenceType cenv.g let pat', _, vspecs, envinner, tpenv = TcMatchPattern cenv bindPatTy env tpenv (pat, None) UnifyTypes cenv env m inputExprTy bindPatTy let inputExpr, tpenv = TcExpr cenv inputExprTy env tpenv rhsExpr @@ -8344,7 +8352,7 @@ and TcSequenceExpression cenv env tpenv comp overallTy m = Some(mkCoerceExpr(resultExpr, genOuterTy, m, genExprTy), tpenv) | SynExpr.YieldOrReturn((isYield, _), yieldExpr, m) -> - let genResultTy = NewInferenceType () + let genResultTy = NewInferenceType cenv.g if not isYield then errorR(Error(FSComp.SR.tcSeqResultsUseYield(), m)) UnifyTypes cenv env m genOuterTy (mkSeqTy cenv.g genResultTy) @@ -8568,13 +8576,14 @@ and TcLongIdentThen cenv overallTy env tpenv (LongIdentWithDots(longId, _)) dela //------------------------------------------------------------------------- *) // mItem is the textual range covered by the long identifiers that make up the item and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) delayed = + let g = cenv.g let delayed = delayRest rest mItem delayed let ad = env.eAccessRights match item with // x where x is a union case or active pattern result tag. | (Item.UnionCase _ | Item.ExnCase _ | Item.ActivePatternResult _) as item -> // ucaseAppTy is the type of the union constructor applied to its (optional) argument - let ucaseAppTy = NewInferenceType () + let ucaseAppTy = NewInferenceType g let mkConstrApp, argTys, argNames = match item with | Item.ActivePatternResult(apinfo, _, n, _) -> @@ -8584,15 +8593,15 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del let mkConstrApp _mArgs = function [arg] -> arg | _ -> error(InternalError("ApplyUnionCaseOrExn", mItem)) mkConstrApp, [ucaseAppTy], [ for (s, m) in apinfo.ActiveTagsWithRanges -> mkSynId m s ] | _ -> - let ucref = mkChoiceCaseRef cenv.g mItem aparity n - let _, _, tinst, _ = infoOfTyconRef mItem ucref.TyconRef + let ucref = mkChoiceCaseRef g mItem aparity n + let _, _, tinst = FreshenTypeInst mItem (ucref.TyconRef.Typars mItem) let ucinfo = UnionCaseInfo(tinst, ucref) ApplyUnionCaseOrExnTypes mItem cenv env ucaseAppTy (Item.UnionCase(ucinfo, false)) | _ -> ApplyUnionCaseOrExnTypes mItem cenv env ucaseAppTy item let numArgTys = List.length argTys // Subsumption at data constructions if argument type is nominal prior to equations for any arguments or return types - let flexes = argTys |> List.map (isTyparTy cenv.g >> not) + let flexes = argTys |> List.map (isTyparTy g >> not) let (|FittedArgs|_|) arg = match arg with @@ -8658,8 +8667,8 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del let isSpecialCaseForBackwardCompatibility = (currentIndex <> SEEN_NAMED_ARGUMENT) && (currentIndex < numArgTys) && - match stripTyEqns cenv.g argTys.[currentIndex] with - | TType_app(tcref, _, _) -> tyconRefEq cenv.g cenv.g.bool_tcr tcref || tyconRefEq cenv.g cenv.g.system_Bool_tcref tcref + match stripTyEqns g argTys.[currentIndex] with + | TType_app(tcref, _, _) -> tyconRefEq g g.bool_tcr tcref || tyconRefEq g g.system_Bool_tcref tcref | TType_var(_) -> true | _ -> false @@ -8696,8 +8705,8 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del // This is where the constructor is an active pattern result applied to no argument // Unit-taking active pattern result can be applied to no args if (numArgTys = 1 && match item with Item.ActivePatternResult _ -> true | _ -> false) then - UnifyTypes cenv env mItem (List.head argTys) cenv.g.unit_ty - 1, (fun () -> mkConstrApp mItem [mkUnit cenv.g mItem]) + UnifyTypes cenv env mItem (List.head argTys) g.unit_ty + 1, (fun () -> mkConstrApp mItem [mkUnit g mItem]) // This is where the constructor expects no arguments and is applied to no argument elif numArgTys = 0 then @@ -8708,11 +8717,11 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del (fun () -> let vs, args = argTys |> List.mapi (fun i ty -> mkCompGenLocal mItem ("arg" + string i) ty) |> List.unzip let constrApp = mkConstrApp mItem args - let lam = mkMultiLambda mItem vs (constrApp, tyOfExpr cenv.g constrApp) + let lam = mkMultiLambda mItem vs (constrApp, tyOfExpr g constrApp) lam) UnionCaseOrExnCheck env numArgTys numArgs mItem let expr = mkExpr() - let exprTy = tyOfExpr cenv.g expr + let exprTy = tyOfExpr g expr PropagateThenTcDelayed cenv overallTy env tpenv mItem (MakeApplicableExprNoFlex cenv expr) exprTy ExprAtomicFlag.Atomic delayed | Item.Types(nm, (ty::_)) -> @@ -8811,7 +8820,7 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del // If the type is provided and took static arguments then the constructor will have changed // to a provided constructor on the statically instantiated type. Re-resolve that constructor. match objTyAfterTyArgs with - | AppTy cenv.g (tcref, _) when tcref.Deref.IsProvided -> + | AppTy g (tcref, _) when tcref.Deref.IsProvided -> let newItem = ForceRaise (ResolveObjectConstructor cenv.nameResolver env.DisplayEnv mExprAndArg ad objTyAfterTyArgs) match newItem with | Item.CtorGroup(_, newMinfos) -> newItem, newMinfos @@ -8840,6 +8849,7 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del | Item.FakeInterfaceCtor _ -> error(Error(FSComp.SR.tcInvalidUseOfInterfaceType(), mItem)) + | Item.ImplicitOp(id, sln) -> let isPrefix = PrettyNaming.IsPrefixOperator id.idText @@ -8869,7 +8879,7 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del let traitInfo = TTrait(argTys, logicalCompiledName, memberFlags, argTys, Some retTy, sln) let expr = Expr.Op(TOp.TraitCall(traitInfo), [], ves, mItem) - let expr = mkLambdas mItem [] vs (expr, retTy) + let expr = mkLambdas g mItem [] vs (expr, retTy) let rec isSimpleArgument e = match e with @@ -8940,15 +8950,16 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del // Propagte the known application structure into function types - Propagate cenv overallTy env tpenv (MakeApplicableExprNoFlex cenv expr) (tyOfExpr cenv.g expr) delayed + Propagate cenv overallTy env tpenv (MakeApplicableExprNoFlex cenv expr) (tyOfExpr g expr) delayed // Take all simple arguments and process them before applying the constraint. let delayed1, delayed2 = let pred = (function (DelayedApp (_, arg, _)) -> isSimpleArgument arg | _ -> false) List.takeWhile pred delayed, List.skipWhile pred delayed - let intermediateTy = if isNil delayed2 then overallTy else NewInferenceType () - let resultExpr, tpenv = TcDelayed cenv intermediateTy env tpenv mItem (MakeApplicableExprNoFlex cenv expr) (tyOfExpr cenv.g expr) ExprAtomicFlag.NonAtomic delayed1 + let intermediateTy = if isNil delayed2 then overallTy else NewInferenceType g + + let resultExpr, tpenv = TcDelayed cenv intermediateTy env tpenv mItem (MakeApplicableExprNoFlex cenv expr) (tyOfExpr g expr) ExprAtomicFlag.NonAtomic delayed1 // Add the constraint after the application arguments have been checked to allow annotations to kick in on rigid type parameters AddCxMethodConstraint env.DisplayEnv cenv.css mItem NoTrace traitInfo @@ -8978,29 +8989,29 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del // Mutable value set: 'v <- e' | DelayedSet(e2, mStmt) :: otherDelayed -> if not (isNil otherDelayed) then error(Error(FSComp.SR.tcInvalidAssignment(), mStmt)) - UnifyTypes cenv env mStmt overallTy cenv.g.unit_ty + UnifyTypes cenv env mStmt overallTy g.unit_ty vref.Deref.SetHasBeenReferenced() CheckValAccessible mItem env.eAccessRights vref - CheckValAttributes cenv.g vref mItem |> CommitOperationResult + CheckValAttributes g vref mItem |> CommitOperationResult let vty = vref.Type let vty2 = - if isByrefTy cenv.g vty then - destByrefTy cenv.g vty + if isByrefTy g vty then + destByrefTy g vty else if not vref.IsMutable then error (ValNotMutable(env.DisplayEnv, vref, mStmt)) vty // Always allow subsumption on assignment to fields let e2', tpenv = TcExprFlex cenv true false vty2 env tpenv e2 let vexp = - if isInByrefTy cenv.g vty then + if isInByrefTy g vty then errorR(Error(FSComp.SR.writeToReadOnlyByref(), mStmt)) mkAddrSet mStmt vref e2' - elif isByrefTy cenv.g vty then + elif isByrefTy g vty then mkAddrSet mStmt vref e2' else mkValSet mStmt vref e2' - PropagateThenTcDelayed cenv overallTy env tpenv mStmt (MakeApplicableExprNoFlex cenv vexp) (tyOfExpr cenv.g vexp) ExprAtomicFlag.NonAtomic otherDelayed + PropagateThenTcDelayed cenv overallTy env tpenv mStmt (MakeApplicableExprNoFlex cenv vexp) (tyOfExpr g vexp) ExprAtomicFlag.NonAtomic otherDelayed // Value instantiation: v ... | (DelayedTypeApp(tys, _mTypeArgs, mExprAndTypeArgs)::otherDelayed) -> @@ -9035,11 +9046,11 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del | DelayedSet(e2, mStmt) :: otherDelayed -> if not (isNil otherDelayed) then error(Error(FSComp.SR.tcInvalidAssignment(), mStmt)) // Static Property Set (possibly indexer) - UnifyTypes cenv env mStmt overallTy cenv.g.unit_ty + UnifyTypes cenv env mStmt overallTy g.unit_ty let meths = pinfos |> SettersOfPropInfos if meths.IsEmpty then let meths = pinfos |> GettersOfPropInfos - let isByrefMethReturnSetter = meths |> List.exists (function (_,Some pinfo) -> isByrefTy cenv.g (pinfo.GetPropertyType(cenv.amap,mItem)) | _ -> false) + let isByrefMethReturnSetter = meths |> List.exists (function (_,Some pinfo) -> isByrefTy g (pinfo.GetPropertyType(cenv.amap,mItem)) | _ -> false) if isByrefMethReturnSetter then // x.P <- ... byref setter if isNil meths then error (Error (FSComp.SR.tcPropertyIsNotReadable(nm), mItem)) @@ -9060,14 +9071,14 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del | Item.ILField finfo -> - CheckILFieldInfoAccessible cenv.g cenv.amap mItem ad finfo + CheckILFieldInfoAccessible g cenv.amap mItem ad finfo if not finfo.IsStatic then error (Error (FSComp.SR.tcFieldIsNotStatic(finfo.FieldName), mItem)) - CheckILFieldAttributes cenv.g finfo mItem + CheckILFieldAttributes g finfo mItem let fref = finfo.ILFieldRef let exprty = finfo.FieldType(cenv.amap, mItem) match delayed with | DelayedSet(e2, mStmt) :: _delayed' -> - UnifyTypes cenv env mStmt overallTy cenv.g.unit_ty + UnifyTypes cenv env mStmt overallTy g.unit_ty // Always allow subsumption on assignment to fields let e2', tpenv = TcExprFlex cenv true false exprty env tpenv e2 let expr = BuildILStaticFieldSet mStmt finfo e2' @@ -9095,7 +9106,7 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del // Get static F# field or literal CheckRecdFieldInfoAccessible cenv.amap mItem ad rfinfo if not rfinfo.IsStatic then error (Error (FSComp.SR.tcFieldIsNotStatic(rfinfo.Name), mItem)) - CheckRecdFieldInfoAttributes cenv.g rfinfo mItem |> CommitOperationResult + CheckRecdFieldInfoAttributes g rfinfo mItem |> CommitOperationResult let fref = rfinfo.RecdFieldRef let fieldTy = rfinfo.FieldType match delayed with @@ -9104,7 +9115,7 @@ and TcItemThen cenv overallTy env tpenv (item, mItem, rest, afterResolution) del // Set static F# field CheckRecdFieldMutation mItem env.DisplayEnv rfinfo - UnifyTypes cenv env mStmt overallTy cenv.g.unit_ty + UnifyTypes cenv env mStmt overallTy g.unit_ty let fieldTy = rfinfo.FieldType // Always allow subsumption on assignment to fields let e2', tpenv = TcExprFlex cenv true false fieldTy env tpenv e2 @@ -9325,7 +9336,7 @@ and TcEventValueThen cenv overallTy env tpenv mItem mExprAndItem objDetails (ein (let dv, de = mkCompGenLocal mItem "eventDelegate" delegateType let callExpr, _ = BuildPossiblyConditionalMethodCall cenv env PossiblyMutates mItem false einfo.RemoveMethod NormalValUse [] objVars [de] mkLambda mItem dv (callExpr, cenv.g.unit_ty)) - (let fvty = (cenv.g.obj_ty --> (argsTy --> cenv.g.unit_ty)) + (let fvty = (mkFunTy cenv.g cenv.g.obj_ty (mkFunTy cenv.g argsTy cenv.g.unit_ty)) let fv, fe = mkCompGenLocal mItem "callback" fvty let createExpr = BuildNewDelegateExpr (Some einfo, cenv.g, cenv.amap, delegateType, invokeMethInfo, compiledViewOfDelArgTys, fe, fvty, mItem) mkLambda mItem fv (createExpr, delegateType))) @@ -9367,7 +9378,7 @@ and TcMethodApplicationThen // Work out if we know anything about the return type of the overall expression. If there are any delayed // lookups then we don't know anything. - let exprTy = if isNil delayed then overallTy else NewInferenceType () + let exprTy = if isNil delayed then overallTy else NewInferenceType cenv.g // Call the helper below to do the real checking let (expr, attributeAssignedNamedItems, delayed), tpenv = @@ -9389,11 +9400,11 @@ and GetNewInferenceTypeForMethodArg cenv env tpenv x = match x with | SynExprParen(a, _, _, _) -> GetNewInferenceTypeForMethodArg cenv env tpenv a | SynExpr.AddressOf(true, a, _, m) -> mkByrefTyWithInference cenv.g (GetNewInferenceTypeForMethodArg cenv env tpenv a) (NewByRefKindInferenceType cenv.g m) - | SynExpr.Lambda(_, _, _, a, _) -> mkFunTy (NewInferenceType ()) (GetNewInferenceTypeForMethodArg cenv env tpenv a) + | SynExpr.Lambda(_, _, _, a, _) -> mkFunTy cenv.g (NewInferenceType cenv.g) (GetNewInferenceTypeForMethodArg cenv env tpenv a) | SynExpr.Quote(_, raw, a, _, _) -> if raw then mkRawQuotedExprTy cenv.g else mkQuotedExprTy cenv.g (GetNewInferenceTypeForMethodArg cenv env tpenv a) - | _ -> NewInferenceType () + | _ -> NewInferenceType cenv.g /// Method calls, property lookups, attribute constructions etc. get checked through here and TcMethodApplication @@ -9432,7 +9443,7 @@ and TcMethodApplication let curriedCallerArgs, exprTy, delayed = match calledMeths with | [calledMeth] when not isProp && calledMeth.NumArgs.Length > 1 -> - [], NewInferenceType (), [ for x in curriedCallerArgs -> DelayedApp(ExprAtomicFlag.NonAtomic, x, x.Range) ] @ delayed + [], NewInferenceType cenv.g, [ for x in curriedCallerArgs -> DelayedApp(ExprAtomicFlag.NonAtomic, x, x.Range) ] @ delayed | _ when not isProp && calledMeths |> List.exists (fun calledMeth -> calledMeth.NumArgs.Length > 1) -> // This condition should only apply when multiple conflicting curried extension members are brought into scope error(Error(FSComp.SR.tcOverloadsCannotHaveCurriedArguments(), mMethExpr)) @@ -9506,7 +9517,7 @@ and TcMethodApplication curriedCalledArgs.Head |> List.forall isSimpleFormalArg) -> // The call lambda has function type - let exprTy = mkFunTy (NewInferenceType ()) exprTy + let exprTy = mkFunTy cenv.g (NewInferenceType cenv.g) exprTy (None, Some unnamedCurriedCallerArgs.Head.Head, exprTy) @@ -9531,7 +9542,7 @@ and TcMethodApplication let GenerateMatchingSimpleArgumentTypes (calledMeth:MethInfo) = let curriedMethodArgAttribs = calledMeth.GetParamAttribs(cenv.amap, mItem) curriedMethodArgAttribs - |> List.map (List.filter isSimpleFormalArg >> NewInferenceTypes) + |> List.map (List.filter isSimpleFormalArg >> NewInferenceTypes cenv.g) let UnifyMatchingSimpleArgumentTypes exprTy (calledMeth:MethInfo) = let curriedArgTys = GenerateMatchingSimpleArgumentTypes calledMeth @@ -10482,7 +10493,7 @@ and TcNormalizedBinding declKind (cenv:cenv) env tpenv overallTy safeThisValOpt let isFixed, rhsExpr, overallPatTy, overallExprTy = match rhsExpr with - | SynExpr.Fixed (e, _) -> true, e, NewInferenceType(), overallTy + | SynExpr.Fixed (e, _) -> true, e, NewInferenceType cenv.g, overallTy | e -> false, e, overallTy, overallTy // Check the attributes of the binding, parameters or return value @@ -10535,7 +10546,7 @@ and TcNormalizedBinding declKind (cenv:cenv) env tpenv overallTy safeThisValOpt if Option.isSome memberFlagsOpt then errorR(Error(FSComp.SR.tcEntryPointAttributeRequiresFunctionInModule(), mBinding)) else - UnifyTypes cenv env mBinding overallPatTy (mkArrayType cenv.g cenv.g.string_ty --> cenv.g.int_ty) + UnifyTypes cenv env mBinding overallPatTy (mkFunTy cenv.g (mkArrayType cenv.g cenv.g.string_ty) cenv.g.int_ty) if isMutable && isInline then errorR(Error(FSComp.SR.tcMutableValuesCannotBeInline(), mBinding)) @@ -10614,7 +10625,7 @@ and TcNormalizedBinding declKind (cenv:cenv) env tpenv overallTy safeThisValOpt // Assert the return type of an active pattern match apinfoOpt with | Some (apinfo, ty, _) -> - let activePatResTys = NewInferenceTypes apinfo.ActiveTags + let activePatResTys = NewInferenceTypes cenv.g apinfo.ActiveTags let _, rty = stripFunTy cenv.g ty UnifyTypes cenv env mBinding (apinfo.ResultType cenv.g rhsExpr.Range activePatResTys) rty | None -> @@ -10786,7 +10797,7 @@ and TcAttribute canFail cenv (env: TcEnv) attrTgt (synAttr: SynAttribute) = let meths = minfos |> List.map (fun minfo -> minfo, None) let afterResolution = ForNewConstructors cenv.tcSink env tyid.idRange methodName minfos let (expr, attributeAssignedNamedItems, _), _ = - TcMethodApplication true cenv env tpenv None [] mAttr mAttr methodName None ad PossiblyMutates false meths afterResolution NormalValUse [arg] (NewInferenceType ()) [] + TcMethodApplication true cenv env tpenv None [] mAttr mAttr methodName None ad PossiblyMutates false meths afterResolution NormalValUse [arg] (NewInferenceType cenv.g) [] UnifyTypes cenv env mAttr ty (tyOfExpr cenv.g expr) @@ -10881,7 +10892,7 @@ and TcAttributes cenv env attrTgt synAttribs = and TcLetBinding cenv isUse env containerInfo declKind tpenv (synBinds, synBindsRange, scopem) = // Typecheck all the bindings... - let checkedBinds, tpenv = List.mapFold (fun tpenv b -> TcNonRecursiveBinding declKind cenv env tpenv (NewInferenceType ()) b) tpenv synBinds + let checkedBinds, tpenv = List.mapFold (fun tpenv b -> TcNonRecursiveBinding declKind cenv env tpenv (NewInferenceType cenv.g) b) tpenv synBinds let (ContainerInfo(altActualParent, _)) = containerInfo // Canonicalize constraints prior to generalization @@ -11185,10 +11196,10 @@ and ApplyAbstractSlotInference (cenv:cenv) (envinner:TcEnv) (bindingTy, m, synTy then mkMethodTy cenv.g argTysFromAbsSlot retTyFromAbsSlot else match argTysFromAbsSlot with - | [argTysFromAbsSlot] -> mkRefTupledTy cenv.g argTysFromAbsSlot --> cenv.g.unit_ty + | [argTysFromAbsSlot] -> mkFunTy cenv.g (mkRefTupledTy cenv.g argTysFromAbsSlot) cenv.g.unit_ty | _ -> error(Error(FSComp.SR.tcInvalidSignatureForSet(), memberId.idRange)) - retTyFromAbsSlot --> cenv.g.unit_ty + mkFunTy cenv.g retTyFromAbsSlot cenv.g.unit_ty UnifyTypes cenv envinner m bindingTy absSlotTy) @@ -11269,11 +11280,11 @@ and AnalyzeRecursiveStaticMemberOrValDecl (cenv, envinner: TcEnv, tpenv, declKin | Some superTy -> MakeAndPublishBaseVal cenv envinner (match baseValOpt with None -> None | Some v -> Some v.Id) superTy | None -> None - let domainTy = NewInferenceType () + let domainTy = NewInferenceType cenv.g // This is the type we pretend a constructor has, because its implementation must ultimately appear to return a value of the given type // This is somewhat awkward later in codegen etc. - UnifyTypes cenv envinner mBinding ty (domainTy --> objTy) + UnifyTypes cenv envinner mBinding ty (mkFunTy cenv.g domainTy objTy) safeThisValOpt, baseValOpt @@ -11318,8 +11329,8 @@ and AnalyzeRecursiveInstanceMemberDecl (cenv, envinner: TcEnv, tpenv, declKind, let baseValOpt = if tcref.IsFSharpObjectModelTycon then baseValOpt else None // Apply the known type of 'this' - let bindingTy = NewInferenceType () - UnifyTypes cenv envinner mBinding ty (thisTy --> bindingTy) + let bindingTy = NewInferenceType cenv.g + UnifyTypes cenv envinner mBinding ty (mkFunTy cenv.g thisTy bindingTy) CheckForNonAbstractInterface declKind tcref memberFlags memberId.idRange @@ -11406,7 +11417,7 @@ and AnalyzeAndMakeAndPublishRecursiveValue overridesOK isGeneratedEventVal cenv let bindingAttribs = TcAttributes cenv env attrTgt bindingSynAttribs // Allocate the type inference variable for the inferred type - let ty = NewInferenceType () + let ty = NewInferenceType cenv.g let inlineFlag = ComputeInlineFlag memberFlagsOpt isInline isMutable mBinding @@ -11873,7 +11884,7 @@ and TcLetrecAdjustMemberForSpecialVals cenv (pgrbind: PostGeneralizationRecursiv | Some bind -> let m = expr.Range let tps, vsl, body, returnTy = stripTopLambda (expr, vspec.Type) - mkMultiLambdas m tps vsl (mkLetBind m bind body, returnTy) + mkMultiLambdas cenv.g m tps vsl (mkLetBind m bind body, returnTy) // Add a call to CheckInit if necessary for instance members let expr = @@ -11886,7 +11897,7 @@ and TcLetrecAdjustMemberForSpecialVals cenv (pgrbind: PostGeneralizationRecursiv let thisVar = vsl.Head.Head let thisTypeInst = argsOfAppTy cenv.g thisVar.Type let newBody = MakeCheckSafeInitField cenv.g thisTypeInst (Some thisVar) rfref (mkOne cenv.g m) body - mkMultiLambdas m tps vsl (newBody, returnTy) + mkMultiLambdas cenv.g m tps vsl (newBody, returnTy) | NoSafeInitInfo -> expr @@ -11899,7 +11910,7 @@ and TcLetrecAdjustMemberForSpecialVals cenv (pgrbind: PostGeneralizationRecursiv | _ -> let m = expr.Range let tps, vsl, body, returnTy = stripTopLambda (expr, vspec.Type) - mkMemberLambdas m tps None baseValOpt vsl (body, returnTy) + mkMemberLambdas cenv.g m tps None baseValOpt vsl (body, returnTy) { ValScheme = pgrbind.ValScheme Binding = TBind(vspec, expr, spBind) } @@ -12219,7 +12230,7 @@ module TcRecdUnionAndEnumDeclarations = begin NewRecdField true (Some v) id false thisTy false false [] attrs (xmldoc.ToXmlDoc()) vis false let TcEnumDecls cenv env parent thisTy enumCases = - let fieldTy = NewInferenceType () + let fieldTy = NewInferenceType cenv.g let enumCases' = enumCases |> List.map (TcEnumDecl cenv env parent thisTy fieldTy) |> CheckDuplicates (fun f -> f.Id) "enum element" fieldTy, enumCases' @@ -12398,7 +12409,7 @@ module IncrClassChecking = let ctorValScheme, ctorVal = let argty = mkRefTupledTy cenv.g (typesOfVals ctorArgs) // Initial type has known information - let ctorTy = mkFunTy argty objTy + let ctorTy = mkFunTy cenv.g argty objTy // REVIEW: no attributes can currently be specified for the implicit constructor let attribs = TcAttributes cenv env (AttributeTargets.Constructor ||| AttributeTargets.Method) attrs let memberFlags = CtorMemberFlags @@ -12424,7 +12435,7 @@ module IncrClassChecking = lazy (let cctorArgs = [ fst(mkCompGenLocal m "unitVar" cenv.g.unit_ty) ] - let cctorTy = mkFunTy cenv.g.unit_ty cenv.g.unit_ty + let cctorTy = mkFunTy cenv.g cenv.g.unit_ty cenv.g.unit_ty let valSynData = SynValInfo([[]], SynInfo.unnamedRetVal) let id = ident ("cctor", m) CheckForNonAbstractInterface ModuleOrMemberBinding tcref ClassCtorMemberFlags id.idRange @@ -12594,7 +12605,7 @@ module IncrClassChecking = if isStatic then tauTy, topValInfo else - let tauTy = ctorInfo.InstanceCtorThisVal.Type --> v.TauType + let tauTy = mkFunTy cenv.g ctorInfo.InstanceCtorThisVal.Type v.TauType let (ValReprInfo(tpNames, args, ret)) = topValInfo let topValInfo = ValReprInfo(tpNames, ValReprInfo.selfMetadata::args, ret) tauTy, topValInfo @@ -12803,12 +12814,13 @@ module IncrClassChecking = let denv = env.DisplayEnv - let thisVal = ctorInfo.InstanceCtorThisVal + let g = cenv.g + let thisVal = ctorInfo.InstanceCtorThisVal let m = thisVal.Range let ctorDeclaredTypars = ctorInfo.GetNormalizedInstanceCtorDeclaredTypars cenv denv m - ctorDeclaredTypars |> List.iter (SetTyparRigid cenv.g env.DisplayEnv m) + ctorDeclaredTypars |> List.iter (SetTyparRigid g env.DisplayEnv m) // Reconstitute the type with the correct quantified type variables. ctorInfo.InstanceCtorVal.SetType (mkForallTyIfNeeded ctorDeclaredTypars ctorInfo.InstanceCtorVal.TauType) @@ -12888,10 +12900,10 @@ module IncrClassChecking = | InMethod(isStatic, methodVal, _) -> let _, chooseTps, tauExpr, tauTy, m = match rhsExpr with - | Expr.TyChoose(chooseTps, b, _) -> [], chooseTps, b, (tyOfExpr cenv.g b), m + | Expr.TyChoose(chooseTps, b, _) -> [], chooseTps, b, (tyOfExpr g b), m | Expr.TyLambda (_, tps, Expr.TyChoose(chooseTps, b, _), m, returnTy) -> tps, chooseTps, b, returnTy, m | Expr.TyLambda (_, tps, b, m, returnTy) -> tps, [], b, returnTy, m - | e -> [], [], e, (tyOfExpr cenv.g e), e.Range + | e -> [], [], e, (tyOfExpr g e), e.Range let chooseTps = chooseTps @ (ListSet.subtract typarEq freeChoiceTypars methodVal.Typars) @@ -12901,7 +12913,7 @@ module IncrClassChecking = tauExpr, tauTy else let e = mkLambda m thisVal (tauExpr, tauTy) - e, tyOfExpr cenv.g e + e, tyOfExpr g e // Replace the type parameters that used to be on the rhs with // the full set of type parameters including the type parameters of the enclosing class @@ -12927,7 +12939,7 @@ module IncrClassChecking = if isStatic then match safeStaticInitInfo with | SafeInitField (rfref, _) -> - let setExpr = mkStaticRecdFieldSet (rfref, thisTyInst, mkInt cenv.g m idx, m) + let setExpr = mkStaticRecdFieldSet (rfref, thisTyInst, mkInt g m idx, m) let setExpr = reps.FixupIncrClassExprPhase2C cenv (Some(thisVal)) NoSafeInitInfo thisTyInst setExpr Some setExpr | NoSafeInitInfo -> @@ -12983,7 +12995,7 @@ module IncrClassChecking = [ match ctorInfo.InstanceCtorSafeThisValOpt with | None -> () | Some v -> - let setExpr = mkRefCellSet cenv.g m ctorInfo.InstanceCtorThisVal.Type (exprForVal m v) (exprForVal m ctorInfo.InstanceCtorThisVal) + let setExpr = mkRefCellSet g m ctorInfo.InstanceCtorThisVal.Type (exprForVal m v) (exprForVal m ctorInfo.InstanceCtorThisVal) let setExpr = reps.FixupIncrClassExprPhase2C cenv (Some(thisVal)) safeStaticInitInfo thisTyInst setExpr let binder = (fun e -> mkSequential SequencePointsAtSeq setExpr.Range setExpr e) let isPriorToSuperInit = false @@ -12997,7 +13009,7 @@ module IncrClassChecking = let binders = [ match ctorInfo.InstanceCtorSafeInitInfo with | SafeInitField (rfref, _) -> - let setExpr = mkRecdFieldSetViaExprAddr (exprForVal m thisVal, rfref, thisTyInst, mkOne cenv.g m, m) + let setExpr = mkRecdFieldSetViaExprAddr (exprForVal m thisVal, rfref, thisTyInst, mkOne g m, m) let setExpr = reps.FixupIncrClassExprPhase2C cenv (Some(thisVal)) safeStaticInitInfo thisTyInst setExpr let binder = (fun e -> mkSequential SequencePointsAtSeq setExpr.Range setExpr e) let isPriorToSuperInit = false @@ -13020,7 +13032,7 @@ module IncrClassChecking = yield b.Var.DisplayName yield b.Var.CoreDisplayName yield b.Var.LogicalName ] - let reps = IncrClassReprInfo.Empty(cenv.g, takenFieldNames) + let reps = IncrClassReprInfo.Empty(g, takenFieldNames) // Bind the IsArg(true) representations of the object constructor arguments and assign them to fields // if they escape to the members. We do this by running the instance bindings 'let x = x' through TransTrueDec @@ -13051,7 +13063,7 @@ module IncrClassChecking = let ctorInitActionsPre, ctorInitActionsPost = ctorInitActions |> List.partition (fun (isPriorToSuperInit, _) -> isPriorToSuperInit) // This is the return result - let ctorBody = mkUnit cenv.g m + let ctorBody = mkUnit g m // Add . // That is, add any that come prior to the super init constructor call, @@ -13093,7 +13105,7 @@ module IncrClassChecking = let ctorBody = List.foldBack (fun (_, binder) acc -> binder acc) ctorInitActionsPre ctorBody // Add the final wrapping to make this into a method - let ctorBody = mkMemberLambdas m [] (Some(thisVal)) ctorInfo.InstanceCtorBaseValOpt [ctorInfo.InstanceCtorArgs] (ctorBody, cenv.g.unit_ty) + let ctorBody = mkMemberLambdas g m [] (Some(thisVal)) ctorInfo.InstanceCtorBaseValOpt [ctorInfo.InstanceCtorArgs] (ctorBody, g.unit_ty) ctorBody @@ -13102,12 +13114,12 @@ module IncrClassChecking = match cctorInitActions with | [] -> None | _ -> - let cctorInitAction = List.foldBack (fun (_, binder) acc -> binder acc) cctorInitActions (mkUnit cenv.g m) + let cctorInitAction = List.foldBack (fun (_, binder) acc -> binder acc) cctorInitActions (mkUnit g m) let m = thisVal.Range let cctorArgs, cctorVal, _ = ctorInfo.StaticCtorValInfo.Force() // Reconstitute the type of the implicit class constructor with the correct quantified type variables. cctorVal.SetType (mkForallTyIfNeeded ctorDeclaredTypars cctorVal.TauType) - let cctorBody = mkMemberLambdas m [] None None [cctorArgs] (cctorInitAction, cenv.g.unit_ty) + let cctorBody = mkMemberLambdas g m [] None None [cctorArgs] (cctorInitAction, g.unit_ty) Some(cctorBody) ctorBody, cctorBodyOpt, methodBinds, reps @@ -13189,11 +13201,10 @@ module MutRecBindingChecking = type MutRecDefnsPhase2CData = MutRecShape list - - // Phase2A: create member prelimRecValues for "recursive" items, i.e. ctor val and member vals // Phase2A: also processes their arg patterns - collecting type assertions let TcMutRecBindings_Phase2A_CreateRecursiveValuesAndCheckArgumentPatterns cenv tpenv (envMutRec, mutRecDefns : MutRecDefnsPhase2Info) = + let g = cenv.g // The basic iteration over the declarations in a single type definition // State: @@ -13233,7 +13244,7 @@ module MutRecBindingChecking = if isExtrinsic then initalEnvForTycon else - AddLocalTyconRefs true cenv.g cenv.amap tcref.Range [tcref] initalEnvForTycon + AddLocalTyconRefs true g cenv.amap tcref.Range [tcref] initalEnvForTycon // Make fresh version of the class type for type checking the members and lets * let _, copyOfTyconTypars, _, objTy, thisTy = FreshenObjectArgType cenv tcref.Range TyparRigidity.WillBeRigid tcref isExtrinsic declaredTyconTypars @@ -13372,6 +13383,7 @@ module MutRecBindingChecking = /// Phase2B: check each of the bindings, convert from ast to tast and collects type assertions. /// Also generalize incrementally. let TcMutRecBindings_Phase2B_TypeCheckAndIncrementalGeneralization cenv tpenv envInitial (envMutRec, defnsAs:MutRecDefnsPhase2AData, uncheckedRecBinds: PreCheckingRecursiveBinding list, scopem) : MutRecDefnsPhase2BData * _ * _ = + let g = cenv.g let (defnsBs: MutRecDefnsPhase2BData), (tpenv, generalizedRecBinds, preGeneralizationRecBinds, _, _) = @@ -13425,7 +13437,7 @@ module MutRecBindingChecking = let isExtrinsic = (declKind = ExtrinsicExtensionBinding) let envForTycon = MakeInnerEnvForTyconRef envForDecls tcref isExtrinsic - let envForTycon = if isExtrinsic then envForTycon else AddLocalTyconRefs true cenv.g cenv.amap tcref.Range [tcref] envForTycon + let envForTycon = if isExtrinsic then envForTycon else AddLocalTyconRefs true g cenv.amap tcref.Range [tcref] envForTycon // Set up the environment so use-before-definition warnings are given, at least // until we reach a Phase2AIncrClassCtorJustAfterSuperInit. let envForTycon = { envForTycon with eCtorInfo = Some (InitialImplicitCtorInfo()) } @@ -13466,7 +13478,7 @@ module MutRecBindingChecking = // Phase2B: typecheck the argument to an 'inherits' call and build the new object expr for the inherit-call | Phase2AInherit (synBaseTy, arg, baseValOpt, m) -> let baseTy, tpenv = TcType cenv NoNewTypars CheckCxs ItemOccurence.Use envInstance tpenv synBaseTy - let baseTy = baseTy |> convertToTypeWithMetadataIfPossible cenv.g + let baseTy = baseTy |> convertToTypeWithMetadataIfPossible g let inheritsExpr, tpenv = TcNewExpr cenv envInstance tpenv baseTy (Some synBaseTy.Range) true arg m let envInstance = match baseValOpt with Some baseVal -> AddLocalVal cenv.tcSink scopem baseVal envInstance | None -> envInstance let envNonRec = match baseValOpt with Some baseVal -> AddLocalVal cenv.tcSink scopem baseVal envNonRec | None -> envNonRec @@ -13501,11 +13513,11 @@ module MutRecBindingChecking = // Check to see that local bindings and members don't have the same name and check some other adhoc conditions for bind in binds do - if not isStatic && HasFSharpAttributeOpt cenv.g cenv.g.attrib_DllImportAttribute bind.Var.Attribs then + if not isStatic && HasFSharpAttributeOpt g g.attrib_DllImportAttribute bind.Var.Attribs then errorR(Error(FSComp.SR.tcDllImportNotAllowed(), bind.Var.Range)) let nm = bind.Var.DisplayName - let ty = generalizedTyconRef tcref + let ty = generalizedTyOfTyconRef g tcref let ad = envNonRec.eAccessRights match TryFindIntrinsicMethInfo cenv.infoReader bind.Var.Range ad nm ty, TryFindPropInfo cenv.infoReader bind.Var.Range ad nm ty with @@ -13529,8 +13541,8 @@ module MutRecBindingChecking = #if OPEN_IN_TYPE_DECLARATIONS | Phase2AOpen(mp, m) -> - let envInstance = TcOpenDecl cenv.tcSink cenv.g cenv.amap m scopem envInstance mp - let envStatic = TcOpenDecl cenv.tcSink cenv.g cenv.amap m scopem envStatic mp + let envInstance = TcOpenDecl cenv.tcSink g cenv.amap m scopem envInstance mp + let envStatic = TcOpenDecl cenv.tcSink g cenv.amap m scopem envStatic mp let innerState = (tpenv, envInstance, envStatic, envNonRec, generalizedRecBinds, preGeneralizationRecBinds, uncheckedRecBindsTable) Phase2BOpen, innerState #endif @@ -13581,6 +13593,7 @@ module MutRecBindingChecking = // Choose type scheme implicit constructors and adjust their recursive types. // Fixup recursive references to members. let TcMutRecBindings_Phase2C_FixupRecursiveReferences cenv (denv, defnsBs: MutRecDefnsPhase2BData, generalizedTyparsForRecursiveBlock: Typar list, generalizedRecBinds: PostGeneralizationRecursiveBinding list, scopem) = + let g = cenv.g // Build an index ---> binding map let generalizedBindingsMap = generalizedRecBinds |> List.map (fun pgrbind -> (pgrbind.RecBindingInfo.Index, pgrbind)) |> Map.ofList @@ -13596,7 +13609,7 @@ module MutRecBindingChecking = match defnB with | Phase2BIncrClassCtor (incrClassCtorLhs, safeThisValBindOpt) -> let valscheme = incrClassCtorLhs.InstanceCtorValScheme - let valscheme = ChooseCanonicalValSchemeAfterInference cenv.g denv valscheme scopem + let valscheme = ChooseCanonicalValSchemeAfterInference g denv valscheme scopem AdjustRecType cenv incrClassCtorLhs.InstanceCtorVal valscheme Phase2CIncrClassCtor (incrClassCtorLhs, safeThisValBindOpt) @@ -13632,6 +13645,7 @@ module MutRecBindingChecking = // --- Extract method bindings from let-bindings // --- Extract bindings for implicit constructors let TcMutRecBindings_Phase2D_ExtractImplicitFieldAndMethodBindings cenv envMutRec tpenv (denv, generalizedTyparsForRecursiveBlock, defnsCs: MutRecDefnsPhase2CData) = + let g = cenv.g // let (fixupValueExprBinds, methodBinds) = (envMutRec, defnsCs) ||> MutRecShapes.mapTyconsWithEnv (fun envForDecls (TyconBindingsPhase2C(tyconOpt, tcref, defnCs)) -> @@ -13657,7 +13671,7 @@ module MutRecBindingChecking = // // REVIEW: consider allowing an optimization switch to turn off these checks - let needsSafeStaticInit = not cenv.g.compilingFslib + let needsSafeStaticInit = not g.compilingFslib // We only need safe static init checks if there are some static field bindings (actually, we look for non-method bindings) let hasStaticBindings = @@ -13670,7 +13684,7 @@ module MutRecBindingChecking = | _ -> false) if needsSafeStaticInit && hasStaticBindings then - let rfield = MakeSafeInitField cenv.g envForDecls tcref.Range true + let rfield = MakeSafeInitField g envForDecls tcref.Range true SafeInitField(mkRecdFieldRef tcref rfield.Name, rfield) else NoSafeInitInfo @@ -13687,9 +13701,9 @@ module MutRecBindingChecking = | _ -> if tcref.IsStructOrEnumTycon then - mkUnit cenv.g tcref.Range, false, None, defnCs + mkUnit g tcref.Range, false, None, defnCs else - let inheritsExpr, _ = TcNewExpr cenv envForDecls tpenv cenv.g.obj_ty None true (SynExpr.Const(SynConst.Unit, tcref.Range)) tcref.Range + let inheritsExpr, _ = TcNewExpr cenv envForDecls tpenv g.obj_ty None true (SynExpr.Const(SynConst.Unit, tcref.Range)) tcref.Range inheritsExpr, false, None, defnCs let envForTycon = MakeInnerEnvForTyconRef envForDecls tcref false @@ -13768,6 +13782,7 @@ module MutRecBindingChecking = /// Check a "module X = A.B.C" module abbreviation declaration let TcModuleAbbrevDecl (cenv:cenv) scopem env (id, p, m) = + let g = cenv.g let ad = env.eAccessRights let resolved = match p with @@ -13780,7 +13795,7 @@ module MutRecBindingChecking = errorR(Error(FSComp.SR.tcModuleAbbreviationForNamespace(fullDisplayTextOfModRef (List.head modrefs)), m)) let modrefs = modrefs |> List.filter (fun mvv -> not mvv.IsNamespace) if isNil modrefs then env else - modrefs |> List.iter (fun modref -> CheckEntityAttributes cenv.g modref m |> CommitOperationResult) + modrefs |> List.iter (fun modref -> CheckEntityAttributes g modref m |> CommitOperationResult) let env = AddModuleAbbreviationAndReport cenv.tcSink scopem id modrefs env env @@ -13800,6 +13815,7 @@ module MutRecBindingChecking = /// Compute the active environments within each nested module. let TcMutRecDefns_ComputeEnvs getTyconOpt getVals (cenv: cenv) report scopem m envInitial mutRecShape = + let g = cenv.g (envInitial, mutRecShape) ||> MutRecShapes.computeEnvs (fun envAbove (MutRecDefnsPhase2DataForModule (mtypeAcc, mspec)) -> MakeInnerEnvWithAcc envAbove mspec.Id mtypeAcc mspec.ModuleOrNamespaceType.ModuleOrNamespaceKind) (fun envAbove decls -> @@ -13832,15 +13848,15 @@ module MutRecBindingChecking = let envForDecls = envAbove // Add the modules being defined - let envForDecls = (envForDecls, mspecs) ||> List.fold ((if report then AddLocalSubModuleAndReport cenv.tcSink scopem else AddLocalSubModule) cenv.g cenv.amap m) + let envForDecls = (envForDecls, mspecs) ||> List.fold ((if report then AddLocalSubModuleAndReport cenv.tcSink scopem else AddLocalSubModule) g cenv.amap m) // Process the 'open' declarations - let envForDecls = (envForDecls, opens) ||> List.fold (fun env (mp, m) -> TcOpenDecl cenv.tcSink cenv.g cenv.amap m scopem env mp) + let envForDecls = (envForDecls, opens) ||> List.fold (fun env (mp, m) -> TcOpenDecl cenv.tcSink g cenv.amap m scopem env mp) // Add the type definitions being defined - let envForDecls = (if report then AddLocalTyconsAndReport cenv.tcSink scopem else AddLocalTycons) cenv.g cenv.amap m tycons envForDecls + let envForDecls = (if report then AddLocalTyconsAndReport cenv.tcSink scopem else AddLocalTycons) g cenv.amap m tycons envForDecls // Add the exception definitions being defined let envForDecls = (envForDecls, exns) ||> List.fold (AddLocalExnDefnAndReport cenv.tcSink scopem) // Add the modules again (but don't report them a second time) - let envForDecls = (envForDecls, mspecs) ||> List.fold (AddLocalSubModule cenv.g cenv.amap m) + let envForDecls = (envForDecls, mspecs) ||> List.fold (AddLocalSubModule g cenv.amap m) // Add the module abbreviations let envForDecls = (envForDecls, moduleAbbrevs) ||> List.fold (TcModuleAbbrevDecl cenv scopem) // Add the values and members @@ -13982,12 +13998,13 @@ module MutRecBindingChecking = /// Check and generalize the interface implementations, members, 'let' definitions in a mutually recursive group of definitions. let TcMutRecDefns_Phase2 cenv envInitial bindsm scopem mutRecNSInfo (envMutRec: TcEnv) (mutRecDefns: MutRecDefnsPhase2Data) = + let g = cenv.g let interfacesFromTypeDefn envForTycon tyconMembersData = let (MutRecDefnsPhase2DataForTycon(_, _, declKind, tcref, _, _, declaredTyconTypars, members, _, _, _)) = tyconMembersData let overridesOK = DeclKind.CanOverrideOrImplement(declKind) members |> List.collect (function | SynMemberDefn.Interface(ity, defnOpt, _) -> - let _, ty = if tcref.Deref.IsExceptionDecl then [], cenv.g.exn_ty else generalizeTyconRef tcref + let ty = if tcref.Deref.IsExceptionDecl then g.exn_ty else generalizedTyOfTyconRef g tcref let m = ity.Range if tcref.IsTypeAbbrev then error(Error(FSComp.SR.tcTypeAbbreviationsCannotHaveInterfaceDeclaration(), m)) if tcref.IsEnumTycon then error(Error(FSComp.SR.tcEnumerationsCannotHaveInterfaceDeclaration(), m)) @@ -13995,15 +14012,15 @@ let TcMutRecDefns_Phase2 cenv envInitial bindsm scopem mutRecNSInfo (envMutRec: let ity' = let envinner = AddDeclaredTypars CheckForDuplicateTypars declaredTyconTypars envForTycon TcTypeAndRecover cenv NoNewTypars CheckCxs ItemOccurence.UseInType envinner emptyUnscopedTyparEnv ity |> fst - if not (isInterfaceTy cenv.g ity') then errorR(Error(FSComp.SR.tcTypeIsNotInterfaceType0(), ity.Range)) + if not (isInterfaceTy g ity') then errorR(Error(FSComp.SR.tcTypeIsNotInterfaceType0(), ity.Range)) - if not (tcref.HasInterface cenv.g ity') then + if not (tcref.HasInterface g ity') then error(Error(FSComp.SR.tcAllImplementedInterfacesShouldBeDeclared(), ity.Range)) - if (typeEquiv cenv.g ity' cenv.g.mk_IComparable_ty && Option.isSome tcref.GeneratedCompareToValues) || - (typeEquiv cenv.g ity' cenv.g.mk_IStructuralComparable_ty && Option.isSome tcref.GeneratedCompareToWithComparerValues) || - (typeEquiv cenv.g ity' ((mkAppTy cenv.g.system_GenericIComparable_tcref [ty])) && Option.isSome tcref.GeneratedCompareToValues) || - (typeEquiv cenv.g ity' ((mkAppTy cenv.g.system_GenericIEquatable_tcref [ty])) && Option.isSome tcref.GeneratedHashAndEqualsWithComparerValues) || - (typeEquiv cenv.g ity' cenv.g.mk_IStructuralEquatable_ty && Option.isSome tcref.GeneratedHashAndEqualsWithComparerValues) then + if (typeEquiv g ity' g.mk_IComparable_ty && Option.isSome tcref.GeneratedCompareToValues) || + (typeEquiv g ity' g.mk_IStructuralComparable_ty && Option.isSome tcref.GeneratedCompareToWithComparerValues) || + (typeEquiv g ity' ((mkAppTy g.system_GenericIComparable_tcref [ty])) && Option.isSome tcref.GeneratedCompareToValues) || + (typeEquiv g ity' ((mkAppTy g.system_GenericIEquatable_tcref [ty])) && Option.isSome tcref.GeneratedHashAndEqualsWithComparerValues) || + (typeEquiv g ity' g.mk_IStructuralEquatable_ty && Option.isSome tcref.GeneratedHashAndEqualsWithComparerValues) then errorR(Error(FSComp.SR.tcDefaultImplementationForInterfaceHasAlreadyBeenAdded(), ity.Range)) if overridesOK = WarnOnOverrides then warning(IntfImplInIntrinsicAugmentation(ity.Range)) @@ -14094,17 +14111,18 @@ module AddAugmentationDeclarations = | _ -> false) let AddGenericCompareDeclarations cenv (env: TcEnv) (scSet:Set) (tycon:Tycon) = - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare cenv.g tycon && scSet.Contains tycon.Stamp then + let g = cenv.g + if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare g tycon && scSet.Contains tycon.Stamp then let tcref = mkLocalTyconRef tycon let tcaug = tycon.TypeContents - let _, ty = if tcref.Deref.IsExceptionDecl then [], cenv.g.exn_ty else generalizeTyconRef tcref + let ty = if tcref.Deref.IsExceptionDecl then g.exn_ty else generalizedTyOfTyconRef g tcref let m = tycon.Range - let genericIComparableTy = mkAppTy cenv.g.system_GenericIComparable_tcref [ty] + let genericIComparableTy = mkAppTy g.system_GenericIComparable_tcref [ty] - let hasExplicitIComparable = tycon.HasInterface cenv.g cenv.g.mk_IComparable_ty - let hasExplicitGenericIComparable = tcaugHasNominalInterface cenv.g tcaug cenv.g.system_GenericIComparable_tcref - let hasExplicitIStructuralComparable = tycon.HasInterface cenv.g cenv.g.mk_IStructuralComparable_ty + let hasExplicitIComparable = tycon.HasInterface g g.mk_IComparable_ty + let hasExplicitGenericIComparable = tcaugHasNominalInterface g tcaug g.system_GenericIComparable_tcref + let hasExplicitIStructuralComparable = tycon.HasInterface g g.mk_IStructuralComparable_ty if hasExplicitIComparable then errorR(Error(FSComp.SR.tcImplementsIComparableExplicitly(tycon.DisplayName), m)) @@ -14114,12 +14132,12 @@ module AddAugmentationDeclarations = elif hasExplicitIStructuralComparable then errorR(Error(FSComp.SR.tcImplementsIStructuralComparableExplicitly(tycon.DisplayName), m)) else - let hasExplicitGenericIComparable = tycon.HasInterface cenv.g genericIComparableTy - let cvspec1, cvspec2 = AugmentWithHashCompare.MakeValsForCompareAugmentation cenv.g tcref - let cvspec3 = AugmentWithHashCompare.MakeValsForCompareWithComparerAugmentation cenv.g tcref + let hasExplicitGenericIComparable = tycon.HasInterface g genericIComparableTy + let cvspec1, cvspec2 = AugmentWithHashCompare.MakeValsForCompareAugmentation g tcref + let cvspec3 = AugmentWithHashCompare.MakeValsForCompareWithComparerAugmentation g tcref - PublishInterface cenv env.DisplayEnv tcref m true cenv.g.mk_IStructuralComparable_ty - PublishInterface cenv env.DisplayEnv tcref m true cenv.g.mk_IComparable_ty + PublishInterface cenv env.DisplayEnv tcref m true g.mk_IStructuralComparable_ty + PublishInterface cenv env.DisplayEnv tcref m true g.mk_IComparable_ty if not tycon.IsExceptionDecl && not hasExplicitGenericIComparable then PublishInterface cenv env.DisplayEnv tcref m true genericIComparableTy tcaug.SetCompare (mkLocalValRef cvspec1, mkLocalValRef cvspec2) @@ -14131,18 +14149,19 @@ module AddAugmentationDeclarations = let AddGenericEqualityWithComparerDeclarations cenv (env: TcEnv) (seSet:Set) (tycon:Tycon) = - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals cenv.g tycon && seSet.Contains tycon.Stamp then + let g = cenv.g + if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals g tycon && seSet.Contains tycon.Stamp then let tcref = mkLocalTyconRef tycon let tcaug = tycon.TypeContents let m = tycon.Range - let hasExplicitIStructuralEquatable = tycon.HasInterface cenv.g cenv.g.mk_IStructuralEquatable_ty + let hasExplicitIStructuralEquatable = tycon.HasInterface g g.mk_IStructuralEquatable_ty if hasExplicitIStructuralEquatable then errorR(Error(FSComp.SR.tcImplementsIStructuralEquatableExplicitly(tycon.DisplayName), m)) else - let evspec1, evspec2, evspec3 = AugmentWithHashCompare.MakeValsForEqualityWithComparerAugmentation cenv.g tcref - PublishInterface cenv env.DisplayEnv tcref m true cenv.g.mk_IStructuralEquatable_ty + let evspec1, evspec2, evspec3 = AugmentWithHashCompare.MakeValsForEqualityWithComparerAugmentation g tcref + PublishInterface cenv env.DisplayEnv tcref m true g.mk_IStructuralEquatable_ty tcaug.SetHashAndEqualsWith (mkLocalValRef evspec1, mkLocalValRef evspec2, mkLocalValRef evspec3) PublishValueDefn cenv env ModuleOrMemberBinding evspec1 PublishValueDefn cenv env ModuleOrMemberBinding evspec2 @@ -14150,7 +14169,7 @@ module AddAugmentationDeclarations = let AddGenericCompareBindings cenv (tycon:Tycon) = - if (* AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare cenv.g tycon && *) Option.isSome tycon.GeneratedCompareToValues then + if (* AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare g tycon && *) Option.isSome tycon.GeneratedCompareToValues then AugmentWithHashCompare.MakeBindingsForCompareAugmentation cenv.g tycon else [] @@ -14179,15 +14198,16 @@ module AddAugmentationDeclarations = // We can only add the Equals override after we've done the augmentation because we have to wait until // tycon.HasOverride can give correct results let AddGenericEqualityBindings cenv (env: TcEnv) tycon = - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals cenv.g tycon then + let g = cenv.g + if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals g tycon then let tcref = mkLocalTyconRef tycon let tcaug = tycon.TypeContents - let _, ty = if tcref.Deref.IsExceptionDecl then [], cenv.g.exn_ty else generalizeTyconRef tcref + let ty = if tcref.Deref.IsExceptionDecl then g.exn_ty else generalizedTyOfTyconRef g tcref let m = tycon.Range // Note: tycon.HasOverride only gives correct results after we've done the type augmentation - let hasExplicitObjectEqualsOverride = tycon.HasOverride cenv.g "Equals" [cenv.g.obj_ty] - let hasExplicitGenericIEquatable = tcaugHasNominalInterface cenv.g tcaug cenv.g.system_GenericIEquatable_tcref + let hasExplicitObjectEqualsOverride = tycon.HasOverride g "Equals" [g.obj_ty] + let hasExplicitGenericIEquatable = tcaugHasNominalInterface g tcaug g.system_GenericIEquatable_tcref if hasExplicitGenericIEquatable then errorR(Error(FSComp.SR.tcImplementsIEquatableExplicitly(tycon.DisplayName), m)) @@ -14197,13 +14217,13 @@ module AddAugmentationDeclarations = if not hasExplicitObjectEqualsOverride && Option.isSome tycon.GeneratedHashAndEqualsWithComparerValues then - let vspec1, vspec2 = AugmentWithHashCompare.MakeValsForEqualsAugmentation cenv.g tcref + let vspec1, vspec2 = AugmentWithHashCompare.MakeValsForEqualsAugmentation g tcref tcaug.SetEquals (mkLocalValRef vspec1, mkLocalValRef vspec2) if not tycon.IsExceptionDecl then - PublishInterface cenv env.DisplayEnv tcref m true (mkAppTy cenv.g.system_GenericIEquatable_tcref [ty]) + PublishInterface cenv env.DisplayEnv tcref m true (mkAppTy g.system_GenericIEquatable_tcref [ty]) PublishValueDefn cenv env ModuleOrMemberBinding vspec1 PublishValueDefn cenv env ModuleOrMemberBinding vspec2 - AugmentWithHashCompare.MakeBindingsForEqualsAugmentation cenv.g tycon + AugmentWithHashCompare.MakeBindingsForEqualsAugmentation g tycon else [] else [] @@ -14221,7 +14241,7 @@ module TyconConstraintInference = // Initially, assume the equality relation is available for all structural type definitions let initialAssumedTycons = set [ for (tycon, _) in tyconsWithStructuralTypes do - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare cenv.g tycon then + if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare g tycon then yield tycon.Stamp ] // Initially, don't assume that the equality relation is dependent on any type variables @@ -14237,7 +14257,7 @@ module TyconConstraintInference = let rec checkIfFieldTypeSupportsComparison (tycon: Tycon) (ty: TType) = // Is the field type a type parameter? - match tryDestTyparTy cenv.g ty with + match tryDestTyparTy g ty with | ValueSome tp -> // Look for an explicit 'comparison' constraint if tp.Constraints |> List.exists (function TyparConstraint.SupportsComparison _ -> true | _ -> false) then @@ -14284,7 +14304,7 @@ module TyconConstraintInference = let newSet = assumedTycons |> Set.filter (fun tyconStamp -> let (tycon, structuralTypes) = tab.[tyconStamp] - if cenv.g.compilingFslib && AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare cenv.g tycon && not (HasFSharpAttribute g g.attrib_StructuralComparisonAttribute tycon.Attribs) && not (HasFSharpAttribute g g.attrib_NoComparisonAttribute tycon.Attribs) then + if g.compilingFslib && AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare g tycon && not (HasFSharpAttribute g g.attrib_StructuralComparisonAttribute tycon.Attribs) && not (HasFSharpAttribute g g.attrib_NoComparisonAttribute tycon.Attribs) then errorR(Error(FSComp.SR.tcFSharpCoreRequiresExplicit(), tycon.Range)) let res = (structuralTypes |> List.forall (fst >> checkIfFieldTypeSupportsComparison tycon)) @@ -14348,7 +14368,7 @@ module TyconConstraintInference = // Initially, assume the equality relation is available for all structural type definitions let initialAssumedTycons = set [ for (tycon, _) in tyconsWithStructuralTypes do - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals cenv.g tycon then + if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals g tycon then yield tycon.Stamp ] // Initially, don't assume that the equality relation is dependent on any type variables @@ -14362,7 +14382,7 @@ module TyconConstraintInference = // Checks if a field type supports the 'equality' constraint based on the assumptions about the type constructors // and type parameters. let rec checkIfFieldTypeSupportsEquality (tycon:Tycon) (ty: TType) = - match tryDestTyparTy cenv.g ty with + match tryDestTyparTy g ty with | ValueSome tp -> // Look for an explicit 'equality' constraint if tp.Constraints |> List.exists (function TyparConstraint.SupportsEquality _ -> true | _ -> false) then @@ -14407,7 +14427,7 @@ module TyconConstraintInference = let newSet = assumedTycons |> Set.filter (fun tyconStamp -> let (tycon, structuralTypes) = tab.[tyconStamp] - if cenv.g.compilingFslib && AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals cenv.g tycon && not (HasFSharpAttribute g g.attrib_StructuralEqualityAttribute tycon.Attribs) && not (HasFSharpAttribute g g.attrib_NoEqualityAttribute tycon.Attribs) then + if g.compilingFslib && AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals g tycon && not (HasFSharpAttribute g g.attrib_StructuralEqualityAttribute tycon.Attribs) && not (HasFSharpAttribute g g.attrib_NoEqualityAttribute tycon.Attribs) then errorR(Error(FSComp.SR.tcFSharpCoreRequiresExplicit(), tycon.Range)) // Remove structural types with incomparable elements from the assumedTycons @@ -14417,7 +14437,7 @@ module TyconConstraintInference = if not res then match TryFindFSharpBoolAttribute g g.attrib_StructuralEqualityAttribute tycon.Attribs with | Some true -> - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals cenv.g tycon then + if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals g tycon then match structuralTypes |> List.tryFind (fst >> checkIfFieldTypeSupportsEquality tycon >> not) with | None -> assert false @@ -14432,7 +14452,7 @@ module TyconConstraintInference = | Some(false) -> () | None -> - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals cenv.g tycon then + if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals g tycon then match structuralTypes |> List.tryFind (fst >> checkIfFieldTypeSupportsEquality tycon >> not) with | None -> assert false @@ -14501,6 +14521,7 @@ module TcExceptionDeclarations = NewExn cpath id vis (TExnFresh (MakeRecdFieldsTable [])) attrs (doc.ToXmlDoc()) let TcExnDefnCore_Phase1G_EstablishRepresentation cenv env parent (exnc: Entity) (SynExceptionDefnRepr(_, UnionCase(_, _, args, _, _, _), reprIdOpt, _, _, m)) = + let g = cenv.g let args = match args with (UnionCaseFields args) -> args | _ -> error(Error(FSComp.SR.tcExplicitTypeSpecificationCannotBeUsedForExceptionConstructors(), m)) let ad = env.eAccessRights let id = exnc.Id @@ -14528,7 +14549,7 @@ module TcExceptionDeclarations = match candidates with | [minfo] -> match minfo.ApparentEnclosingType with - | AppTy cenv.g (tcref, _) as ety when (TypeDefinitelySubsumesTypeNoCoercion 0 cenv.g cenv.amap m cenv.g.exn_ty ety) -> + | AppTy g (tcref, _) as ety when (TypeDefinitelySubsumesTypeNoCoercion 0 g cenv.amap m g.exn_ty ety) -> let tref = tcref.CompiledRepresentationForNamedType TExnAsmRepr tref | _ -> @@ -15292,28 +15313,29 @@ module EstablishTypeDefinitionCores = /// Establish the fields, dispatch slots and union cases of a type let private TcTyconDefnCore_Phase1G_EstablishRepresentation cenv envinner tpenv inSig (MutRecDefnsPhase1DataForTycon(_, synTyconRepr, _, _, _, _)) (tycon:Tycon) (attrs:Attribs) = let m = tycon.Range + let g = cenv.g try let id = tycon.Id let thisTyconRef = mkLocalTyconRef tycon let innerParent = Parent thisTyconRef - let thisTyInst, thisTy = generalizeTyconRef thisTyconRef + let thisTyInst, thisTy = generalizeTyconRef g thisTyconRef - let hasAbstractAttr = HasFSharpAttribute cenv.g cenv.g.attrib_AbstractClassAttribute attrs + let hasAbstractAttr = HasFSharpAttribute g g.attrib_AbstractClassAttribute attrs let hasSealedAttr = // The special case is needed for 'unit' because the 'Sealed' attribute is not yet available when this type is defined. - if cenv.g.compilingFslib && id.idText = "Unit" then + if g.compilingFslib && id.idText = "Unit" then Some true else - TryFindFSharpBoolAttribute cenv.g cenv.g.attrib_SealedAttribute attrs - let hasMeasureAttr = HasFSharpAttribute cenv.g cenv.g.attrib_MeasureAttribute attrs + TryFindFSharpBoolAttribute g g.attrib_SealedAttribute attrs + let hasMeasureAttr = HasFSharpAttribute g g.attrib_MeasureAttribute attrs // REVIEW: for hasMeasureableAttr we need to be stricter about checking these // are only used on exactly the right kinds of type definitions and not inconjunction with other attributes. - let hasMeasureableAttr = HasFSharpAttribute cenv.g cenv.g.attrib_MeasureableAttribute attrs - let hasCLIMutable = HasFSharpAttribute cenv.g cenv.g.attrib_CLIMutableAttribute attrs + let hasMeasureableAttr = HasFSharpAttribute g g.attrib_MeasureableAttribute attrs + let hasCLIMutable = HasFSharpAttribute g g.attrib_CLIMutableAttribute attrs - let structLayoutAttr = TryFindFSharpInt32Attribute cenv.g cenv.g.attrib_StructLayoutAttribute attrs - let hasAllowNullLiteralAttr = TryFindFSharpBoolAttribute cenv.g cenv.g.attrib_AllowNullLiteralAttribute attrs = Some(true) + let structLayoutAttr = TryFindFSharpInt32Attribute g g.attrib_StructLayoutAttribute attrs + let hasAllowNullLiteralAttr = TryFindFSharpBoolAttribute g g.attrib_AllowNullLiteralAttribute attrs = Some(true) if hasAbstractAttr then tycon.TypeContents.tcaug_abstract <- true @@ -15328,8 +15350,8 @@ module EstablishTypeDefinitionCores = let allowNullLiteralAttributeCheck() = if hasAllowNullLiteralAttr then - tycon.TypeContents.tcaug_super |> Option.iter (fun ty -> if not (TypeNullIsExtraValueOld cenv.g m ty) then errorR (Error(FSComp.SR.tcAllowNullTypesMayOnlyInheritFromAllowNullTypes(), m))) - tycon.ImmediateInterfaceTypesOfFSharpTycon |> List.iter (fun ty -> if not (TypeNullIsExtraValueOld cenv.g m ty) then errorR (Error(FSComp.SR.tcAllowNullTypesMayOnlyInheritFromAllowNullTypes(), m))) + tycon.TypeContents.tcaug_super |> Option.iter (fun ty -> if not (TypeNullIsExtraValueOld g m ty) then errorR (Error(FSComp.SR.tcAllowNullTypesMayOnlyInheritFromAllowNullTypes(), m))) + tycon.ImmediateInterfaceTypesOfFSharpTycon |> List.iter (fun ty -> if not (TypeNullIsExtraValueOld g m ty) then errorR (Error(FSComp.SR.tcAllowNullTypesMayOnlyInheritFromAllowNullTypes(), m))) let structLayoutAttributeCheck(allowed) = @@ -15347,7 +15369,7 @@ module EstablishTypeDefinitionCores = let hiddenReprChecks(hasRepr) = structLayoutAttributeCheck(false) - if hasSealedAttr = Some(false) || (hasRepr && hasSealedAttr <> Some(true) && not (id.idText = "Unit" && cenv.g.compilingFslib) ) then + if hasSealedAttr = Some(false) || (hasRepr && hasSealedAttr <> Some(true) && not (id.idText = "Unit" && g.compilingFslib) ) then errorR(Error(FSComp.SR.tcRepresentationOfTypeHiddenBySignature(), m)) if hasAbstractAttr then errorR (Error(FSComp.SR.tcOnlyClassesCanHaveAbstract(), m)) @@ -15507,7 +15529,7 @@ module EstablishTypeDefinitionCores = let superTy = tycon.TypeContents.tcaug_super let containerInfo = TyconContainerInfo(innerParent, thisTyconRef, thisTyconRef.Typars(m), NoSafeInitInfo) - let kind = InferTyconKind cenv.g (kind, attrs, slotsigs, fields, inSig, isConcrete, m) + let kind = InferTyconKind g (kind, attrs, slotsigs, fields, inSig, isConcrete, m) match kind with | TyconHiddenRepr -> hiddenReprChecks(true) @@ -15519,9 +15541,9 @@ module EstablishTypeDefinitionCores = // until "isSealedTy" and "isClassTy" give reliable results. superTy |> Option.iter (fun ty -> let m = match inherits with | [] -> m | ((_, m, _) :: _) -> m - if isSealedTy cenv.g ty then + if isSealedTy g ty then errorR(Error(FSComp.SR.tcCannotInheritFromSealedType(), m)) - elif not (isClassTy cenv.g ty) then + elif not (isClassTy g ty) then errorR(Error(FSComp.SR.tcCannotInheritFromInterfaceType(), m))) let kind = @@ -15557,7 +15579,7 @@ module EstablishTypeDefinitionCores = noAbstractClassAttributeCheck() noFieldsCheck(userFields) let ty', _ = TcTypeAndRecover cenv NoNewTypars CheckCxs ItemOccurence.UseInType envinner tpenv ty - let _, curriedArgInfos, returnTy, _ = GetTopValTypeInCompiledForm cenv.g (arity |> TranslateTopValSynInfo m (TcAttributes cenv envinner) |> TranslatePartialArity []) ty' m + let _, curriedArgInfos, returnTy, _ = GetTopValTypeInCompiledForm g (arity |> TranslateTopValSynInfo m (TcAttributes cenv envinner) |> TranslatePartialArity []) ty' m if curriedArgInfos.Length < 1 then error(Error(FSComp.SR.tcInvalidDelegateSpecification(), m)) if curriedArgInfos.Length > 1 then error(Error(FSComp.SR.tcDelegatesCannotBeCurried(), m)) let ttps = thisTyconRef.Typars(m) @@ -15597,7 +15619,7 @@ module EstablishTypeDefinitionCores = for slot in slots do yield mkLocalValRef slot ] - let baseValOpt = MakeAndPublishBaseVal cenv envinner baseIdOpt (superOfTycon cenv.g tycon) + let baseValOpt = MakeAndPublishBaseVal cenv envinner baseIdOpt (superOfTycon g tycon) let safeInitInfo = ComputeInstanceSafeInitInfo cenv envinner thisTyconRef.Range thisTy let safeInitFields = match safeInitInfo with SafeInitField (_, fld) -> [fld] | NoSafeInitInfo -> [] @@ -15617,7 +15639,7 @@ module EstablishTypeDefinitionCores = noAllowNullLiteralAttributeCheck() let vfld = NewRecdField false None (ident("value__", m)) false fieldTy false false [] [] XmlDoc.Empty taccessPublic true - if not (ListSet.contains (typeEquiv cenv.g) fieldTy [ cenv.g.int32_ty; cenv.g.int16_ty; cenv.g.sbyte_ty; cenv.g.int64_ty; cenv.g.char_ty; cenv.g.bool_ty; cenv.g.uint32_ty; cenv.g.uint16_ty; cenv.g.byte_ty; cenv.g.uint64_ty ]) then + if not (ListSet.contains (typeEquiv g) fieldTy [ g.int32_ty; g.int16_ty; g.sbyte_ty; g.int64_ty; g.char_ty; g.bool_ty; g.uint32_ty; g.uint16_ty; g.byte_ty; g.uint64_ty ]) then errorR(Error(FSComp.SR.tcInvalidTypeForLiteralEnumeration(), m)) writeFakeRecordFieldsToSink fields' @@ -15630,13 +15652,13 @@ module EstablishTypeDefinitionCores = tycon.entity_tycon_repr <- typeRepr // We check this just after establishing the representation - if TyconHasUseNullAsTrueValueAttribute cenv.g tycon && not (CanHaveUseNullAsTrueValueAttribute cenv.g tycon) then + if TyconHasUseNullAsTrueValueAttribute g tycon && not (CanHaveUseNullAsTrueValueAttribute g tycon) then errorR(Error(FSComp.SR.tcInvalidUseNullAsTrueValue(), m)) // validate ConditionalAttribute, should it be applied (it's only valid on a type if the type is an attribute type) - match attrs |> List.tryFind (IsMatchingFSharpAttribute cenv.g cenv.g.attrib_ConditionalAttribute) with + match attrs |> List.tryFind (IsMatchingFSharpAttribute g g.attrib_ConditionalAttribute) with | Some _ -> - if not(ExistsInEntireHierarchyOfType (fun t -> typeEquiv cenv.g t (mkAppTy cenv.g.tcref_System_Attribute [])) cenv.g cenv.amap m AllowMultiIntfInstantiations.Yes thisTy) then + if not(ExistsInEntireHierarchyOfType (fun t -> typeEquiv g t (mkAppTy g.tcref_System_Attribute [])) g cenv.amap m AllowMultiIntfInstantiations.Yes thisTy) then errorR(Error(FSComp.SR.tcConditionalAttributeUsage(), m)) | _ -> () @@ -15705,6 +15727,7 @@ module EstablishTypeDefinitionCores = /// Check that a set of type definitions is free of inheritance cycles let TcTyconDefnCore_CheckForCyclicStructsAndInheritance cenv tycons = + let g = cenv.g // Overview: // Given several tycons now being defined (the "initial" tycons). // Look for cycles in inheritance and struct-field-containment. @@ -15749,7 +15772,7 @@ module EstablishTypeDefinitionCores = (tycon, tycon2)::acc else acc // note: all edges added are (tycon, _) let insertEdgeToType ty acc = - match tryDestAppTy cenv.g ty with + match tryDestAppTy g ty with | ValueSome tcref -> insertEdgeToTycon tcref.Deref acc | _ -> @@ -15773,9 +15796,9 @@ module EstablishTypeDefinitionCores = fspec.IsStatic && (structTycon === tycon2) && (structTyInst, tinst2) ||> List.lengthsEqAndForall2 (fun ty1 ty2 -> - match tryDestTyparTy cenv.g ty1 with + match tryDestTyparTy g ty1 with | ValueSome destTypar1 -> - match tryDestTyparTy cenv.g ty2 with + match tryDestTyparTy g ty2 with | ValueSome destTypar2 -> typarEq destTypar1 destTypar2 | _ -> false | _ -> false) @@ -15792,7 +15815,7 @@ module EstablishTypeDefinitionCores = // collect edges from the fields of a given struct type. and accStructFields includeStaticFields ty (structTycon:Tycon) tinst (doneTypes, acc) = - if List.exists (typeEquiv cenv.g ty) doneTypes then + if List.exists (typeEquiv g ty) doneTypes then // This type (type instance) has been seen before, so no need to collect the same edges again (and avoid loops!) doneTypes, acc else @@ -15814,7 +15837,7 @@ module EstablishTypeDefinitionCores = let acc = [] let acc = if tycon.IsStructOrEnumTycon then - let tinst, ty = generalizeTyconRef (mkLocalTyconRef tycon) + let tinst, ty = generalizeTyconRef g (mkLocalTyconRef tycon) let _, acc = accStructAllFields ty tycon tinst ([], acc) acc else @@ -15822,7 +15845,7 @@ module EstablishTypeDefinitionCores = let acc = // Note: only the nominal type counts - let super = superOfTycon cenv.g tycon + let super = superOfTycon g tycon insertEdgeToType super acc let acc = // Note: only the nominal type counts @@ -15854,6 +15877,7 @@ module EstablishTypeDefinitionCores = let TcMutRecDefns_Phase1 mkLetInfo cenv envInitial parent typeNames inSig tpenv m scopem mutRecNSInfo (mutRecDefns:MutRecShapes) = + let g = cenv.g // Phase1A - build Entity for type definitions, exception definitions and module definitions. // Also for abbreviations of any of these. Augmentations are skipped in this phase. @@ -15959,7 +15983,7 @@ module EstablishTypeDefinitionCores = // No inferred constraints allowed on declared typars (envMutRecPrelim, withEnvs) ||> MutRecShapes.iterTyconsWithEnv (fun envForDecls (_, tyconOpt) -> - tyconOpt |> Option.iter (fun tycon -> tycon.Typars(m) |> List.iter (SetTyparRigid cenv.g envForDecls.DisplayEnv m))) + tyconOpt |> Option.iter (fun tycon -> tycon.Typars(m) |> List.iter (SetTyparRigid g envForDecls.DisplayEnv m))) // Phase1E. OK, now recheck the abbreviations, super/interface and explicit constraints types (this time checking constraints) (envMutRecPrelim, withAttrs) ||> MutRecShapes.iterTyconsWithEnv (fun envForDecls (origInfo, tyconAndAttrsOpt) -> @@ -16011,7 +16035,8 @@ module TcDeclarations = /// Given a type definition, compute whether its members form an extension of an existing type, and if so if it is an /// intrinsic or extrinsic extension - let private ComputeTyconDeclKind tyconOpt isAtOriginalTyconDefn cenv envForDecls inSig m (synTypars:SynTyparDecl list) synTyparCxs longPath = + let private ComputeTyconDeclKind cenv tyconOpt isAtOriginalTyconDefn envForDecls inSig m (synTypars:SynTyparDecl list) synTyparCxs longPath = + let g = cenv.g let ad = envForDecls.eAccessRights let tcref = @@ -16056,20 +16081,20 @@ module TcDeclarations = | _ -> //false // There is a special case we allow when compiling FSharp.Core.dll which permits interface implementations across namespace fragments - cenv.g.compilingFslib && tcref.LogicalName.StartsWithOrdinal("Tuple`") + g.compilingFslib && tcref.LogicalName.StartsWithOrdinal("Tuple`") let nReqTypars = reqTypars.Length let declaredTypars = TcTyparDecls cenv envForDecls synTypars let envForTycon = AddDeclaredTypars CheckForDuplicateTypars declaredTypars envForDecls let _tpenv = TcTyparConstraints cenv NoNewTypars CheckCxs ItemOccurence.UseInType envForTycon emptyUnscopedTyparEnv synTyparCxs - declaredTypars |> List.iter (SetTyparRigid cenv.g envForDecls.DisplayEnv m) + declaredTypars |> List.iter (SetTyparRigid g envForDecls.DisplayEnv m) if isInSameModuleOrNamespace && not isInterfaceOrDelegateOrEnum then // For historical reasons we only give a warning for incorrect type parameters on intrinsic extensions if nReqTypars <> synTypars.Length then warning(Error(FSComp.SR.tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(tcref.DisplayNameWithStaticParametersAndUnderscoreTypars), m)) - if not (typarsAEquiv cenv.g TypeEquivEnv.Empty reqTypars declaredTypars) then + if not (typarsAEquiv g TypeEquivEnv.Empty reqTypars declaredTypars) then warning(Error(FSComp.SR.tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(tcref.DisplayNameWithStaticParametersAndUnderscoreTypars), m)) // Note we return 'reqTypars' for intrinsic extensions since we may only have given warnings IntrinsicExtensionBinding, reqTypars @@ -16078,7 +16103,7 @@ module TcDeclarations = errorR(Error(FSComp.SR.tcMembersThatExtendInterfaceMustBePlacedInSeparateModule(), tcref.Range)) if nReqTypars <> synTypars.Length then error(Error(FSComp.SR.tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(tcref.DisplayNameWithStaticParametersAndUnderscoreTypars), m)) - if not (typarsAEquiv cenv.g TypeEquivEnv.Empty reqTypars declaredTypars) then + if not (typarsAEquiv g TypeEquivEnv.Empty reqTypars declaredTypars) then errorR(Error(FSComp.SR.tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(tcref.DisplayNameWithStaticParametersAndUnderscoreTypars), m)) ExtrinsicExtensionBinding, declaredTypars @@ -16344,7 +16369,7 @@ module TcDeclarations = let (MutRecDefnsPhase1DataForTycon(synTyconInfo, _, _, _, _, isAtOriginalTyconDefn)) = typeDefnCore let tyDeclRange = synTyconInfo.Range let (ComponentInfo(_, typars, cs, longPath, _, _, _, _)) = synTyconInfo - let declKind, tcref, declaredTyconTypars = ComputeTyconDeclKind tyconOpt isAtOriginalTyconDefn cenv envForDecls false tyDeclRange typars cs longPath + let declKind, tcref, declaredTyconTypars = ComputeTyconDeclKind cenv tyconOpt isAtOriginalTyconDefn envForDecls false tyDeclRange typars cs longPath let newslotsOK = (if isAtOriginalTyconDefn && tcref.IsFSharpObjectModelTycon then NewSlotsOK else NoNewSlots) if not (isNil members) && tcref.IsTypeAbbrev then errorR(Error(FSComp.SR.tcTypeAbbreviationsCannotHaveAugmentations(), tyDeclRange)) @@ -16460,7 +16485,7 @@ module TcDeclarations = let tpenv = emptyUnscopedTyparEnv let (MutRecDefnsPhase1DataForTycon (_, _, _, _, _, isAtOriginalTyconDefn)) = tyconCore let (ComponentInfo(_, typars, cs, longPath, _, _, _, m)) = synTyconInfo - let declKind, tcref, declaredTyconTypars = ComputeTyconDeclKind tyconOpt isAtOriginalTyconDefn cenv envForDecls true m typars cs longPath + let declKind, tcref, declaredTyconTypars = ComputeTyconDeclKind cenv tyconOpt isAtOriginalTyconDefn envForDecls true m typars cs longPath let envForTycon = AddDeclaredTypars CheckForDuplicateTypars declaredTyconTypars envForDecls let envForTycon = MakeInnerEnvForTyconRef envForTycon tcref (declKind = ExtrinsicExtensionBinding) @@ -16512,6 +16537,7 @@ module TcDeclarations = let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synSigDecl : Eventually = eventually { try + let g = cenv.g match synSigDecl with | SynModuleSigDecl.Exception (edef, m) -> let scopem = unionRanges m.EndRange endm @@ -16526,7 +16552,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS | SynModuleSigDecl.Open (mp, m) -> let scopem = unionRanges m.EndRange endm - let env = TcOpenDecl cenv.tcSink cenv.g cenv.amap m scopem env mp + let env = TcOpenDecl cenv.tcSink g cenv.amap m scopem env mp return env | SynModuleSigDecl.Val (vspec, m) -> @@ -16550,8 +16576,8 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS let id = ComputeModuleName longPath let vis, _ = ComputeAccessAndCompPath env None im vis None parent let attribs = TcAttributes cenv env AttributeTargets.ModuleDecl attribs - CheckNamespaceModuleOrTypeName cenv.g id - let modKind = EstablishTypeDefinitionCores.ComputeModuleOrNamespaceKind cenv.g true typeNames attribs id.idText + CheckNamespaceModuleOrTypeName g id + let modKind = EstablishTypeDefinitionCores.ComputeModuleOrNamespaceKind g true typeNames attribs id.idText let modName = EstablishTypeDefinitionCores.AdjustModuleName modKind id.idText CheckForDuplicateConcreteType env modName id.idRange @@ -16565,7 +16591,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS mspec.entity_modul_contents <- MaybeLazy.Strict mtyp let scopem = unionRanges m endm PublishModuleDefn cenv env mspec - let env = AddLocalSubModuleAndReport cenv.tcSink scopem cenv.g cenv.amap m env mspec + let env = AddLocalSubModuleAndReport cenv.tcSink scopem g cenv.amap m env mspec return env | SynModuleSigDecl.ModuleAbbrev (id, p, m) -> @@ -16584,7 +16610,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS errorR(Error(FSComp.SR.tcModuleAbbreviationForNamespace(fullDisplayTextOfModRef (List.head unfilteredModrefs)), m)) if List.isEmpty modrefs then return env else - modrefs |> List.iter (fun modref -> CheckEntityAttributes cenv.g modref m |> CommitOperationResult) + modrefs |> List.iter (fun modref -> CheckEntityAttributes g modref m |> CommitOperationResult) let env = AddModuleAbbreviationAndReport cenv.tcSink scopem id modrefs env return env @@ -16596,7 +16622,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS | SynModuleSigDecl.NamespaceFragment (SynModuleOrNamespaceSig(longId, isRec, isModule, defs, xml, attribs, vis, m)) -> do for id in longId do - CheckNamespaceModuleOrTypeName cenv.g id + CheckNamespaceModuleOrTypeName g id // Logically speaking, this changes // module [rec] A.B.M @@ -16613,7 +16639,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS longId, defs let envNS = LocateEnv cenv.topCcu env enclosingNamespacePath - let envNS = ImplicitlyOpenOwnNamespace cenv.tcSink cenv.g cenv.amap m enclosingNamespacePath envNS + let envNS = ImplicitlyOpenOwnNamespace cenv.tcSink g cenv.amap m enclosingNamespacePath envNS // For 'namespace rec' and 'module rec' we add the thing being defined let mtypNS = !(envNS.eModuleOrNamespaceTypeAccumulator) @@ -16626,7 +16652,7 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS CallNameResolutionSink cenv.tcSink (mspec.Range, env.NameEnv, item, item, emptyTyparInst, ItemOccurence.Binding, env.DisplayEnv, env.eAccessRights)) // For 'namespace rec' and 'module rec' we add the thing being defined - let envNS = if isRec then AddLocalRootModuleOrNamespace cenv.tcSink cenv.g cenv.amap m envNS mtypRoot else envNS + let envNS = if isRec then AddLocalRootModuleOrNamespace cenv.tcSink g cenv.amap m envNS mtypRoot else envNS let nsInfo = Some (mspecNSOpt, envNS.eModuleOrNamespaceTypeAccumulator) let mutRecNSInfo = if isRec then nsInfo else None @@ -16638,12 +16664,12 @@ let rec TcSignatureElementNonMutRec cenv parent typeNames endm (env: TcEnv) synS if isNil enclosingNamespacePath then envAtEnd else - let env = AddLocalRootModuleOrNamespace cenv.tcSink cenv.g cenv.amap m env mtypRoot + let env = AddLocalRootModuleOrNamespace cenv.tcSink g cenv.amap m env mtypRoot // If the namespace is an interactive fragment e.g. FSI_0002, then open FSI_0002 in the subsequent environment. let env = - match TryStripPrefixPath cenv.g enclosingNamespacePath with - | Some(p, _) -> TcOpenDecl cenv.tcSink cenv.g cenv.amap m.EndRange m.EndRange env [p] + match TryStripPrefixPath g enclosingNamespacePath with + | Some(p, _) -> TcOpenDecl cenv.tcSink g cenv.amap m.EndRange m.EndRange env [p] | None -> env // Publish the combined module type @@ -16794,6 +16820,7 @@ let CheckLetOrDoInNamespace binds m = /// The non-mutually recursive case for a declaration let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem env synDecl = eventually { + let g = cenv.g cenv.synArgNameGenerator.Reset() let tpenv = emptyUnscopedTyparEnv @@ -16822,7 +16849,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem | SynModuleDecl.Open (LongIdentWithDots(mp, _), m) -> let scopem = unionRanges m.EndRange scopem - let env = TcOpenDecl cenv.tcSink cenv.g cenv.amap m scopem env mp + let env = TcOpenDecl cenv.tcSink g cenv.amap m scopem env mp return ((fun e -> e), []), env, env | SynModuleDecl.Let (letrec, binds, m) -> @@ -16864,7 +16891,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem let id = ComputeModuleName longPath let modAttrs = TcAttributes cenv env AttributeTargets.ModuleDecl attribs - let modKind = EstablishTypeDefinitionCores.ComputeModuleOrNamespaceKind cenv.g true typeNames modAttrs id.idText + let modKind = EstablishTypeDefinitionCores.ComputeModuleOrNamespaceKind g true typeNames modAttrs id.idText let modName = EstablishTypeDefinitionCores.AdjustModuleName modKind id.idText CheckForDuplicateConcreteType env modName im CheckForDuplicateModule env id.idText id.idRange @@ -16873,7 +16900,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem let endm = m.EndRange let id = ident (modName, id.idRange) - CheckNamespaceModuleOrTypeName cenv.g id + CheckNamespaceModuleOrTypeName g id let envForModule, mtypeAcc = MakeInnerEnv env id modKind @@ -16888,7 +16915,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem mspec.entity_modul_contents <- MaybeLazy.Strict !mtypeAcc let modDefn = TMDefRec(false, [], [ModuleOrNamespaceBinding.Module(mspec, mexpr)], m) PublishModuleDefn cenv env mspec - let env = AddLocalSubModuleAndReport cenv.tcSink scopem cenv.g cenv.amap m env mspec + let env = AddLocalSubModuleAndReport cenv.tcSink scopem g cenv.amap m env mspec // isContinuingModule is true for all of the following // - the implicit module of a script @@ -16908,7 +16935,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem let endm = m.EndRange do for id in longId do - CheckNamespaceModuleOrTypeName cenv.g id + CheckNamespaceModuleOrTypeName g id // Logically speaking, this changes // module [rec] A.B.M @@ -16925,7 +16952,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem longId, defs let envNS = LocateEnv cenv.topCcu env enclosingNamespacePath - let envNS = ImplicitlyOpenOwnNamespace cenv.tcSink cenv.g cenv.amap m enclosingNamespacePath envNS + let envNS = ImplicitlyOpenOwnNamespace cenv.tcSink g cenv.amap m enclosingNamespacePath envNS let mtypNS = !(envNS.eModuleOrNamespaceTypeAccumulator) let mtypRoot, mspecNSs = BuildRootModuleType enclosingNamespacePath envNS.eCompPath mtypNS @@ -16937,7 +16964,7 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem CallNameResolutionSink cenv.tcSink (mspec.Range, env.NameEnv, item, item, emptyTyparInst, ItemOccurence.Binding, env.DisplayEnv, env.eAccessRights)) // For 'namespace rec' and 'module rec' we add the thing being defined - let envNS = if isRec then AddLocalRootModuleOrNamespace cenv.tcSink cenv.g cenv.amap m envNS mtypRoot else envNS + let envNS = if isRec then AddLocalRootModuleOrNamespace cenv.tcSink g cenv.amap m envNS mtypRoot else envNS let nsInfo = Some (mspecNSOpt, envNS.eModuleOrNamespaceTypeAccumulator) let mutRecNSInfo = if isRec then nsInfo else None @@ -16949,12 +16976,12 @@ let rec TcModuleOrNamespaceElementNonMutRec (cenv:cenv) parent typeNames scopem if isNil enclosingNamespacePath then envAtEnd else - let env = AddLocalRootModuleOrNamespace cenv.tcSink cenv.g cenv.amap m env mtypRoot + let env = AddLocalRootModuleOrNamespace cenv.tcSink g cenv.amap m env mtypRoot // If the namespace is an interactive fragment e.g. FSI_0002, then open FSI_0002 in the subsequent environment let env = - match TryStripPrefixPath cenv.g enclosingNamespacePath with - | Some(p, _) -> TcOpenDecl cenv.tcSink cenv.g cenv.amap m.EndRange m.EndRange env [p] + match TryStripPrefixPath g enclosingNamespacePath with + | Some(p, _) -> TcOpenDecl cenv.tcSink g cenv.amap m.EndRange m.EndRange env [p] | None -> env // Publish the combined module type @@ -17199,7 +17226,7 @@ let ApplyDefaults cenv g denvAtEnd m mexpr extraAttribs = match tpc with | TyparConstraint.DefaultsTo(priority2, ty2, m) when priority2 = priority -> let ty1 = mkTyparTy tp - if not tp.IsSolved && not (typeEquiv cenv.g ty1 ty2) then + if not tp.IsSolved && not (typeEquiv g ty1 ty2) then let csenv = MakeConstraintSolverEnv ContextInfo.NoContext cenv.css m denvAtEnd TryD (fun () -> ConstraintSolver.SolveTyparEqualsType csenv 0 m NoTrace ty1 ty2) (fun e -> solveTypAsError cenv denvAtEnd m ty1 @@ -17266,11 +17293,11 @@ let CheckModuleSignature g cenv m denvAtEnd rootSigOpt implFileTypePriorToSig im raise (ReportedError None) // Compute the remapping from implementation to signature - let remapInfo , _ = ComputeRemappingFromInferredSignatureToExplicitSignature cenv.g implFileTypePriorToSig sigFileType + let remapInfo , _ = ComputeRemappingFromInferredSignatureToExplicitSignature g implFileTypePriorToSig sigFileType let aenv = { TypeEquivEnv.Empty with EquivTycons = TyconRefMap.OfList remapInfo.mrpiEntities } - if not (SignatureConformance.Checker(cenv.g, cenv.amap, denv, remapInfo, true).CheckSignature aenv (mkLocalModRef implFileSpecPriorToSig) sigFileType) then ( + if not (SignatureConformance.Checker(g, cenv.amap, denv, remapInfo, true).CheckSignature aenv (mkLocalModRef implFileSpecPriorToSig) sigFileType) then ( // We can just raise 'ReportedError' since CheckModuleOrNamespace raises its own error raise (ReportedError None) ) diff --git a/src/fsharp/autobox.fs b/src/fsharp/autobox.fs index 4c929e006ce..aadc0a0d7d4 100644 --- a/src/fsharp/autobox.fs +++ b/src/fsharp/autobox.fs @@ -70,7 +70,7 @@ let DecideExpr cenv exprF z expr = match expr with | Expr.Lambda(_, _ctorThisValOpt, _baseValOpt, argvs, _, m, rty) -> let topValInfo = ValReprInfo ([], [argvs |> List.map (fun _ -> ValReprInfo.unnamedTopArg1)], ValReprInfo.unnamedRetVal) - let ty = mkMultiLambdaTy m argvs rty + let ty = mkMultiLambdaTy cenv.g m argvs rty let z = DecideLambda (Some exprF) cenv topValInfo expr ty z Some z diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs index 62988451ba4..4156a38448b 100644 --- a/src/fsharp/import.fs +++ b/src/fsharp/import.fs @@ -161,13 +161,13 @@ let rec ImportILType (env:ImportMap) m tinst ty = | ILType.Array(bounds,ty) -> let n = bounds.Rank let elementType = ImportILType env m tinst ty - let nullness = if env.g.langFeatureNullness() && env.g.assumeNullOnImport then KnownNull else ObliviousToNull + let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport then KnownWithNull else KnownObliviousToNull mkArrayTy env.g n nullness elementType m | ILType.Boxed tspec | ILType.Value tspec -> let tcref = ImportILTypeRef env m tspec.TypeRef let inst = tspec.GenericArgs |> List.map (ImportILType env m tinst) - let nullness = if env.g.langFeatureNullness() && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownNull else ObliviousToNull + let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownWithNull else KnownObliviousToNull ImportTyconRefApp env tcref inst nullness | ILType.Modified(_,tref,ILType.Byref ty) when tref.Name = "System.Runtime.InteropServices.InAttribute" -> mkInByrefTy env.g (ImportILType env m tinst ty) @@ -258,7 +258,7 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: let g = env.g if st.PUntaint((fun st -> st.IsArray),m) then let elemTy = (ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()),m))) - let nullness = if env.g.langFeatureNullness() && env.g.assumeNullOnImport then KnownNull else ObliviousToNull + let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport then KnownWithNull else KnownObliviousToNull mkArrayTy g (st.PUntaint((fun st -> st.GetArrayRank()),m)) nullness elemTy m elif st.PUntaint((fun st -> st.IsByRef),m) then let elemTy = (ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()),m))) @@ -316,7 +316,7 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: else genericArg) - let nullness = if env.g.langFeatureNullness() && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownNull else ObliviousToNull + let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownWithNull else KnownObliviousToNull ImportTyconRefApp env tcref genericArgs nullness diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs index 48b51484709..4a228d00a78 100755 --- a/src/fsharp/infos.fs +++ b/src/fsharp/infos.fs @@ -105,7 +105,8 @@ let GetSuperTypeOfType g amap m ty = /// Make a type for System.Collections.Generic.IList let mkSystemCollectionsGenericIListTy (g: TcGlobals) ty = - TType_app(g.tcref_System_Collections_Generic_IList,[ty],AssumeNonNull) + TType_app(g.tcref_System_Collections_Generic_IList, [ty], g.knownWithoutNull) + [] /// Indicates whether we can skip interface types that lie outside the reference set @@ -1513,7 +1514,7 @@ type MethInfo = let formalRetTy, formalParams = match x with | ILMeth(_,ilminfo,_) -> - let ftinfo = ILTypeInfo.FromType g (TType_app(tcref,formalEnclosingTyparTys,AssumeNonNull)) // TODO NULLNESS - is this the right assumption? + let ftinfo = ILTypeInfo.FromType g (TType_app(tcref, formalEnclosingTyparTys, g.knownWithoutNull)) let formalRetTy = ImportReturnTypeFromMetaData amap m ilminfo.RawMetadata.Return.Type ftinfo.ILScopeRef ftinfo.TypeInstOfRawMetadata formalMethTyparTys let formalParams = [ [ for p in ilminfo.RawMetadata.Parameters do @@ -1765,7 +1766,8 @@ type RecdFieldInfo = member x.FieldType = actualTyOfRecdFieldRef x.RecdFieldRef x.TypeInst /// Get the enclosing (declaring) type of the field in an F#-declared record, class or struct type - member x.DeclaringType = TType_app (x.RecdFieldRef.TyconRef,x.TypeInst, AssumeNonNull) // TODO NULLNESS - is this the right assumption? + member x.DeclaringType = TType_app (x.RecdFieldRef.TyconRef,x.TypeInst, KnownWithoutNull) // TODO NULLNESS - qualify this + override x.ToString() = x.TyconRef.ToString() + "::" + x.Name diff --git a/src/fsharp/service/ServiceDeclarationLists.fs b/src/fsharp/service/ServiceDeclarationLists.fs index 69b39bff513..3fd82751a9b 100644 --- a/src/fsharp/service/ServiceDeclarationLists.fs +++ b/src/fsharp/service/ServiceDeclarationLists.fs @@ -255,7 +255,7 @@ module internal DescriptionListsImpl = match ucinfo.UnionCase.RecdFields with | [f] -> [PrettyParamOfUnionCaseField g denv NicePrint.isGeneratedUnionCaseField -1 f] | fs -> fs |> List.mapi (PrettyParamOfUnionCaseField g denv NicePrint.isGeneratedUnionCaseField) - let rty = generalizedTyconRef ucinfo.TyconRef + let rty = generalizedTyOfTyconRef g ucinfo.TyconRef let rtyL = NicePrint.layoutType denv rty prettyParams, rtyL diff --git a/src/fsharp/service/service.fs b/src/fsharp/service/service.fs index 4ea847dc649..82a4f51e553 100644 --- a/src/fsharp/service/service.fs +++ b/src/fsharp/service/service.fs @@ -313,7 +313,7 @@ type TypeCheckInfo let ad = match vref.BaseOrThisInfo, ad with | ValBaseOrThisInfo.NormalVal, AccessibleFrom(paths, Some tcref) -> - let tcref = generalizedTyconRef tcref + let tcref = generalizedTyOfTyconRef g tcref // check that type of value is the same or subtype of tcref // yes - allow access to protected members // no - strip ability to access protected members @@ -1318,7 +1318,7 @@ type TypeCheckInfo protectAssemblyExplorationNoReraise false false (fun () -> Infos.ExistsHeadTypeInEntireHierarchy g amap range0 ty g.tcref_System_IDisposable) let isStructTyconRef (tyconRef: TyconRef) = - let ty = generalizedTyconRef tyconRef + let ty = generalizedTyOfTyconRef g tyconRef let underlyingTy = stripTyEqnsAndMeasureEqns g ty isStructTy g underlyingTy diff --git a/src/fsharp/symbols/Exprs.fs b/src/fsharp/symbols/Exprs.fs index 8de58e61cfc..3d54230455a 100644 --- a/src/fsharp/symbols/Exprs.fs +++ b/src/fsharp/symbols/Exprs.fs @@ -463,12 +463,13 @@ module FSharpExprConvert = ConvObjectModelCallLinear cenv env (false, v, [], tyargs, List.concat untupledCurriedArgs) contf2 and ConvExprPrim (cenv:SymbolEnv) (env:ExprTranslationEnv) expr = + let g = cenv.g // Eliminate integer 'for' loops - let expr = DetectAndOptimizeForExpression cenv.g OptimizeIntRangesOnly expr + let expr = DetectAndOptimizeForExpression g OptimizeIntRangesOnly expr // Eliminate subsumption coercions for functions. This must be done post-typechecking because we need // complete inference types. - let expr = NormalizeAndAdjustPossibleSubsumptionExprs cenv.g expr + let expr = NormalizeAndAdjustPossibleSubsumptionExprs g expr // Remove TExpr_ref nodes let expr = stripExpr expr @@ -487,7 +488,7 @@ module FSharpExprConvert = | Expr.Sequential _ -> ConvExprPrimLinear cenv env expr (fun e -> e) - | ModuleValueOrMemberUse cenv.g (vref, vFlags, _f, _fty, tyargs, curriedArgs) when (* (nonNil tyargs || nonNil curriedArgs) && *) vref.IsMemberOrModuleBinding -> + | ModuleValueOrMemberUse g (vref, vFlags, _f, _fty, tyargs, curriedArgs) when (* (nonNil tyargs || nonNil curriedArgs) && *) vref.IsMemberOrModuleBinding -> // Process applications of top-level values in a tail-recursive way ConvModuleValueOrMemberUseLinear cenv env (expr, vref, vFlags, tyargs, curriedArgs) (fun e -> e) @@ -510,7 +511,7 @@ module FSharpExprConvert = E.LetRec(bindsR, bodyR) | Expr.Lambda(_, _, _, vs, b, _, _) -> - let v, b = MultiLambdaToTupledLambda cenv.g vs b + let v, b = MultiLambdaToTupledLambda g vs b let vR = ConvVal cenv v let bR = ConvExpr cenv (env.BindVal v) b E.Lambda(vR, bR) @@ -523,8 +524,8 @@ module FSharpExprConvert = let env = env.BindTypars (Seq.zip tps gps |> Seq.toList) E.TypeLambda(gps, ConvExpr cenv env b) - | Expr.Obj (_, ty, _, _, [TObjExprMethod(TSlotSig(_, ctyp, _, _, _, _), _, tps, [tmvs], e, _) as tmethod], _, m) when isDelegateTy cenv.g ty -> - let f = mkLambdas m tps tmvs (e, GetFSharpViewOfReturnType cenv.g (returnTyOfMethod cenv.g tmethod)) + | Expr.Obj (_, ty, _, _, [TObjExprMethod(TSlotSig(_, ctyp, _, _, _, _), _, tps, [tmvs], e, _) as tmethod], _, m) when isDelegateTy g ty -> + let f = mkLambdas g m tps tmvs (e, GetFSharpViewOfReturnType g (returnTyOfMethod g tmethod)) let fR = ConvExpr cenv env f let tyargR = ConvType cenv ctyp E.NewDelegate(tyargR, fR) @@ -533,7 +534,7 @@ module FSharpExprConvert = ConvExprPrim cenv env x | Expr.TyChoose _ -> - ConvExprPrim cenv env (ChooseTyparSolutionsForFreeChoiceTypars cenv.g cenv.amap expr) + ConvExprPrim cenv env (ChooseTyparSolutionsForFreeChoiceTypars g cenv.amap expr) | Expr.Obj (_lambdaId, ty, _basev, basecall, overrides, iimpls, _m) -> let basecallR = ConvExpr cenv env basecall @@ -560,7 +561,7 @@ module FSharpExprConvert = E.NewUnionCase(typR, mkR, argsR) | TOp.Tuple tupInfo, tyargs, _ -> - let tyR = ConvType cenv (mkAnyTupledTy cenv.g tupInfo tyargs) + let tyR = ConvType cenv (mkAnyTupledTy g tupInfo tyargs) let argsR = ConvExprs cenv env args E.NewTuple(tyR, argsR) @@ -599,7 +600,7 @@ module FSharpExprConvert = E.FSharpFieldGet(Some objR, typR, projR) | TOp.TupleFieldGet(tupInfo, n), tyargs, [e] -> - let tyR = ConvType cenv (mkAnyTupledTy cenv.g tupInfo tyargs) + let tyR = ConvType cenv (mkAnyTupledTy g tupInfo tyargs) E.TupleGet(tyR, n, ConvExpr cenv env e) | TOp.ILAsm([ I_ldfld(_, _, fspec) ], _), enclTypeArgs, [obj] -> @@ -625,89 +626,89 @@ module FSharpExprConvert = | TOp.ILAsm([ ], [tty]), _, [arg] -> match tty with | TTypeConvOp cenv convOp -> - let ty = tyOfExpr cenv.g arg - let op = convOp cenv.g m ty arg + let ty = tyOfExpr g arg + let op = convOp g m ty arg ConvExprPrim cenv env op | _ -> ConvExprPrim cenv env arg | TOp.ILAsm([ I_box _ ], _), [ty], [arg] -> - let op = mkCallBox cenv.g m ty arg + let op = mkCallBox g m ty arg ConvExprPrim cenv env op | TOp.ILAsm([ I_unbox_any _ ], _), [ty], [arg] -> - let op = mkCallUnbox cenv.g m ty arg + let op = mkCallUnbox g m ty arg ConvExprPrim cenv env op | TOp.ILAsm([ I_isinst _ ], _), [ty], [arg] -> - let op = mkCallTypeTest cenv.g m ty arg + let op = mkCallTypeTest g m ty arg ConvExprPrim cenv env op | TOp.ILAsm ([ I_call (Normalcall, mspec, None) ], _), _, [arg] when mspec.MethodRef.DeclaringTypeRef.Name = "System.String" && mspec.Name = "GetHashCode" -> - let ty = tyOfExpr cenv.g arg - let op = mkCallHash cenv.g m ty arg + let ty = tyOfExpr g arg + let op = mkCallHash g m ty arg ConvExprPrim cenv env op | TOp.ILCall(_, _, _, _, _, _, _, mref, _, _, _), [], [Expr.Op(TOp.ILAsm([ I_ldtoken (ILToken.ILType _) ], _), [ty], _, _)] when mref.DeclaringTypeRef.Name = "System.Type" && mref.Name = "GetTypeFromHandle" -> - let op = mkCallTypeOf cenv.g m ty + let op = mkCallTypeOf g m ty ConvExprPrim cenv env op | TOp.ILAsm([ EI_ilzero _ ], _), [ty], _ -> E.DefaultValue (ConvType cenv ty) | TOp.ILAsm([ AI_ldnull; AI_cgt_un ], _), _, [arg] -> - let elemTy = tyOfExpr cenv.g arg + let elemTy = tyOfExpr g arg let nullVal = mkNull m elemTy - let op = mkCallNotEqualsOperator cenv.g m elemTy arg nullVal + let op = mkCallNotEqualsOperator g m elemTy arg nullVal ConvExprPrim cenv env op | TOp.ILAsm([ I_ldlen; AI_conv DT_I4 ], _), _, [arr] -> - let arrayTy = tyOfExpr cenv.g arr - let elemTy = destArrayTy cenv.g arrayTy - let op = mkCallArrayLength cenv.g m elemTy arr + let arrayTy = tyOfExpr g arr + let elemTy = destArrayTy g arrayTy + let op = mkCallArrayLength g m elemTy arr ConvExprPrim cenv env op | TOp.ILAsm([ I_newarr (ILArrayShape [(Some 0, None)], _)], _), [elemTy], xa -> E.NewArray(ConvType cenv elemTy, ConvExprs cenv env xa) | TOp.ILAsm([ I_ldelem_any (ILArrayShape [(Some 0, None)], _)], _), [elemTy], [arr; idx1] -> - let op = mkCallArrayGet cenv.g m elemTy arr idx1 + let op = mkCallArrayGet g m elemTy arr idx1 ConvExprPrim cenv env op | TOp.ILAsm([ I_stelem_any (ILArrayShape [(Some 0, None)], _)], _), [elemTy], [arr; idx1; v] -> - let op = mkCallArraySet cenv.g m elemTy arr idx1 v + let op = mkCallArraySet g m elemTy arr idx1 v ConvExprPrim cenv env op | TOp.ILAsm([ ILUnaryOp unaryOp ], _), _, [arg] -> - let ty = tyOfExpr cenv.g arg - let op = unaryOp cenv.g m ty arg + let ty = tyOfExpr g arg + let op = unaryOp g m ty arg ConvExprPrim cenv env op | TOp.ILAsm([ ILBinaryOp binaryOp ], _), _, [arg1;arg2] -> - let ty = tyOfExpr cenv.g arg1 - let op = binaryOp cenv.g m ty arg1 arg2 + let ty = tyOfExpr g arg1 + let op = binaryOp g m ty arg1 arg2 ConvExprPrim cenv env op | TOp.ILAsm([ ILConvertOp convertOp1; ILConvertOp convertOp2 ], _), _, [arg] -> - let ty1 = tyOfExpr cenv.g arg - let op1 = convertOp1 cenv.g m ty1 arg - let ty2 = tyOfExpr cenv.g op1 - let op2 = convertOp2 cenv.g m ty2 op1 + let ty1 = tyOfExpr g arg + let op1 = convertOp1 g m ty1 arg + let ty2 = tyOfExpr g op1 + let op2 = convertOp2 g m ty2 op1 ConvExprPrim cenv env op2 | TOp.ILAsm([ ILConvertOp convertOp ], [TType_app (tcref,_, _)]), _, [arg] -> - let ty = tyOfExpr cenv.g arg + let ty = tyOfExpr g arg let op = - if tyconRefEq cenv.g tcref cenv.g.char_tcr - then mkCallToCharOperator cenv.g m ty arg - else convertOp cenv.g m ty arg + if tyconRefEq g tcref g.char_tcr + then mkCallToCharOperator g m ty arg + else convertOp g m ty arg ConvExprPrim cenv env op | TOp.ILAsm([ I_throw ], _), _, [arg1] -> - let raiseExpr = mkCallRaise cenv.g m (tyOfExpr cenv.g expr) arg1 + let raiseExpr = mkCallRaise g m (tyOfExpr g expr) arg1 ConvExprPrim cenv env raiseExpr | TOp.ILAsm(il, _), tyargs, args -> @@ -734,7 +735,7 @@ module FSharpExprConvert = let fspec = exnc.TrueInstanceFieldsAsList.[i] let fref = mkRecdFieldRef tcref fspec.Name let typR = ConvType cenv (mkAppTy tcref tyargs) - let objR = ConvExpr cenv env (mkCoerceExpr (obj, mkAppTy tcref [], m, cenv.g.exn_ty)) + let objR = ConvExpr cenv env (mkCoerceExpr (obj, mkAppTy tcref [], m, g.exn_ty)) E.FSharpFieldGet(Some objR, typR, ConvRecdFieldRef cenv fref) | TOp.ExnFieldSet(tcref, i), [], [obj;e2] -> @@ -742,18 +743,18 @@ module FSharpExprConvert = let fspec = exnc.TrueInstanceFieldsAsList.[i] let fref = mkRecdFieldRef tcref fspec.Name let typR = ConvType cenv (mkAppTy tcref tyargs) - let objR = ConvExpr cenv env (mkCoerceExpr (obj, mkAppTy tcref [], m, cenv.g.exn_ty)) + let objR = ConvExpr cenv env (mkCoerceExpr (obj, mkAppTy tcref [], m, g.exn_ty)) E.FSharpFieldSet(Some objR, typR, ConvRecdFieldRef cenv fref, ConvExpr cenv env e2) | TOp.Coerce, [tgtTy;srcTy], [x] -> - if typeEquiv cenv.g tgtTy srcTy then + if typeEquiv g tgtTy srcTy then ConvExprPrim cenv env x else E.Coerce(ConvType cenv tgtTy, ConvExpr cenv env x) | TOp.Reraise, [toTy], [] -> // rebuild reraise() and Convert - mkReraiseLibCall cenv.g toTy m |> ConvExprPrim cenv env + mkReraiseLibCall g toTy m |> ConvExprPrim cenv env | TOp.LValueOp(LAddrOf _, vref), [], [] -> E.AddressOf(ConvExpr cenv env (exprForValRef m vref)) @@ -773,16 +774,16 @@ module FSharpExprConvert = | TOp.While _, [], [Expr.Lambda(_, _, _, [_], test, _, _);Expr.Lambda(_, _, _, [_], body, _, _)] -> E.WhileLoop(ConvExpr cenv env test, ConvExpr cenv env body) - | TOp.For(_, dir), [], [Expr.Lambda(_, _, _, [_], lim0, _, _); Expr.Lambda(_, _, _, [_], SimpleArrayLoopUpperBound, lm, _); SimpleArrayLoopBody cenv.g (arr, elemTy, body)] -> + | TOp.For(_, dir), [], [Expr.Lambda(_, _, _, [_], lim0, _, _); Expr.Lambda(_, _, _, [_], SimpleArrayLoopUpperBound, lm, _); SimpleArrayLoopBody g (arr, elemTy, body)] -> let lim1 = - let len = mkCallArrayLength cenv.g lm elemTy arr // Array.length arr - mkCallSubtractionOperator cenv.g lm cenv.g.int32_ty len (mkOne cenv.g lm) // len - 1 + let len = mkCallArrayLength g lm elemTy arr // Array.length arr + mkCallSubtractionOperator g lm g.int32_ty len (mkOne g lm) // len - 1 E.FastIntegerForLoop(ConvExpr cenv env lim0, ConvExpr cenv env lim1, ConvExpr cenv env body, dir <> FSharpForLoopDown) | TOp.For(_, dir), [], [Expr.Lambda(_, _, _, [_], lim0, _, _); Expr.Lambda(_, _, _, [_], lim1, lm, _); body] -> let lim1 = if dir = CSharpForLoopUp then - mkCallSubtractionOperator cenv.g lm cenv.g.int32_ty lim1 (mkOne cenv.g lm) // len - 1 + mkCallSubtractionOperator g lm g.int32_ty lim1 (mkOne g lm) // len - 1 else lim1 E.FastIntegerForLoop(ConvExpr cenv env lim0, ConvExpr cenv env lim1, ConvExpr cenv env body, dir <> FSharpForLoopDown) @@ -799,9 +800,9 @@ module FSharpExprConvert = let envh = env.BindVal vh E.TryWith(ConvExpr cenv env e1, vfR, ConvExpr cenv envf ef, vhR, ConvExpr cenv envh eh) - | TOp.Bytes bytes, [], [] -> E.Const(box bytes, ConvType cenv (tyOfExpr cenv.g expr)) + | TOp.Bytes bytes, [], [] -> E.Const(box bytes, ConvType cenv (tyOfExpr g expr)) - | TOp.UInt16s arr, [], [] -> E.Const(box arr, ConvType cenv (tyOfExpr cenv.g expr)) + | TOp.UInt16s arr, [], [] -> E.Const(box arr, ConvType cenv (tyOfExpr g expr)) | TOp.UnionCaseProof _, _, [e] -> ConvExprPrim cenv env e // Note: we erase the union case proof conversions when converting to quotations | TOp.UnionCaseTagGet tycr, tyargs, [arg1] -> @@ -816,7 +817,7 @@ module FSharpExprConvert = E.TraitCall(tysR, nm, memFlags, argtysR, tyargsR, argsR) | TOp.RefAddrGet readonly, [ty], [e] -> - let replExpr = mkRecdFieldGetAddrViaExprAddr(readonly, e, mkRefCellContentsRef cenv.g, [ty], m) + let replExpr = mkRecdFieldGetAddrViaExprAddr(readonly, e, mkRefCellContentsRef g, [ty], m) ConvExprPrim cenv env replExpr | _ -> wfail (sprintf "unhandled construct in AST", m) @@ -855,6 +856,7 @@ module FSharpExprConvert = Some(vR, rhsR), envinner and ConvILCall (cenv:SymbolEnv) env (isNewObj, valUseFlags, ilMethRef, enclTypeArgs, methTypeArgs, callArgs, m) = + let g = cenv.g let isNewObj = (isNewObj || (match valUseFlags with CtorValUsedAsSuperInit | CtorValUsedAsSelfInit -> true | _ -> false)) let methName = ilMethRef.Name let isPropGet = methName.StartsWithOrdinal("get_") @@ -871,7 +873,7 @@ module FSharpExprConvert = let parent = ILTypeRef.Create(e.Scope, e.Enclosing.Tail, e.Enclosing.Head) Import.ImportILTypeRef cenv.amap m parent, Some e.Name - let enclosingType = generalizedTyconRef tcref + let enclosingType = generalizedTyOfTyconRef g tcref let makeCall minfo = ConvObjectModelCallLinear cenv env (isNewObj, minfo, enclTypeArgs, methTypeArgs, callArgs) id @@ -879,7 +881,7 @@ module FSharpExprConvert = let makeFSCall isMember (vr: ValRef) = let memOrVal = if isMember then - let minfo = MethInfo.FSMeth(cenv.g, enclosingType, vr, None) + let minfo = MethInfo.FSMeth(g, enclosingType, vr, None) FSharpMemberOrFunctionOrValue(cenv, minfo) else FSharpMemberOrFunctionOrValue(cenv, vr) @@ -1034,12 +1036,12 @@ module FSharpExprConvert = let argtys = [ ilMethRef.ArgTypes |> List.map (ImportILTypeFromMetadata cenv.amap m scoref tinst1 tinst2) ] let rty = match ImportReturnTypeFromMetaData cenv.amap m ilMethRef.ReturnType scoref tinst1 tinst2 with - | None -> if isCtor then enclosingType else cenv.g.unit_ty + | None -> if isCtor then enclosingType else g.unit_ty | Some ty -> ty let linkageType = - let ty = mkIteratedFunTy (List.map (mkRefTupledTy cenv.g) argtys) rty - let ty = if isStatic then ty else mkFunTy enclosingType ty + let ty = mkIteratedFunTy g (List.map (mkRefTupledTy g) argtys) rty + let ty = if isStatic then ty else mkFunTy g enclosingType ty mkForallTyIfNeeded (typars1 @ typars2) ty let argCount = List.sum (List.map List.length argtys) + (if isStatic then 0 else 1) diff --git a/src/fsharp/symbols/SymbolHelpers.fs b/src/fsharp/symbols/SymbolHelpers.fs index b3842e6d643..6e75ebb3c41 100644 --- a/src/fsharp/symbols/SymbolHelpers.fs +++ b/src/fsharp/symbols/SymbolHelpers.fs @@ -474,7 +474,7 @@ module internal SymbolHelpers = // Generalize to get a formal signature let formalTypars = tcref.Typars(m) let formalTypeInst = generalizeTypars formalTypars - let ty = TType_app(tcref, formalTypeInst, ObliviousToNull) + let ty = TType_app(tcref, formalTypeInst, KnownObliviousToNull) if isILAppTy g ty then let formalTypeInfo = ILTypeInfo.FromType g ty Some(nlref.Ccu.FileName, formalTypars, formalTypeInfo) @@ -835,7 +835,7 @@ module internal SymbolHelpers = isAppTy g ty && g.suppressed_types |> List.exists (fun supp -> - let generalizedSupp = generalizedTyconRef supp + let generalizedSupp = generalizedTyOfTyconRef g supp // check the display name is precisely the one we're suppressing isAppTy g generalizedSupp && it = supp.DisplayName && // check if they are the same logical type (after removing all abbreviations) @@ -975,7 +975,7 @@ module internal SymbolHelpers = match item with | Item.Types(_, ((TType_app(tcref, _, _)):: _)) | Item.UnqualifiedType(tcref :: _) -> - let ty = generalizedTyconRef tcref + let ty = generalizedTyOfTyconRef g tcref Infos.ExistsHeadTypeInEntireHierarchy g amap range0 ty g.tcref_System_Attribute | _ -> false with _ -> false @@ -1000,7 +1000,7 @@ module internal SymbolHelpers = // Union tags (constructors) | Item.UnionCase(ucinfo, _) -> let uc = ucinfo.UnionCase - let rty = generalizedTyconRef ucinfo.TyconRef + let rty = generalizedTyOfTyconRef g ucinfo.TyconRef let recd = uc.RecdFields let layout = wordL (tagText (FSComp.SR.typeInfoUnionCase())) ^^ @@ -1338,7 +1338,7 @@ module internal SymbolHelpers = | Item.UnqualifiedType (tcref::_) | Item.ExnCase tcref -> // strip off any abbreviation - match generalizedTyconRef tcref with + match generalizedTyOfTyconRef g tcref with | AppTy g (tcref, _) -> Some (ticksAndArgCountTextOfTyconRef tcref) | _ -> None diff --git a/src/fsharp/symbols/Symbols.fs b/src/fsharp/symbols/Symbols.fs index 859767f9c35..85bce7d69bf 100644 --- a/src/fsharp/symbols/Symbols.fs +++ b/src/fsharp/symbols/Symbols.fs @@ -539,33 +539,36 @@ and FSharpEntity(cenv: SymbolEnv, entity:EntityRef) = member x.DeclaredInterfaces = if isUnresolved() then makeReadOnlyCollection [] else + let ty = generalizedTyOfTyconRef cenv.g entity ErrorLogger.protectAssemblyExploration [] (fun () -> - [ for ty in GetImmediateInterfacesOfType SkipUnrefInterfaces.Yes cenv.g cenv.amap range0 (generalizedTyconRef entity) do - yield FSharpType(cenv, ty) ]) + [ for ity in GetImmediateInterfacesOfType SkipUnrefInterfaces.Yes cenv.g cenv.amap range0 ty do + yield FSharpType(cenv, ity) ]) |> makeReadOnlyCollection member x.AllInterfaces = if isUnresolved() then makeReadOnlyCollection [] else + let ty = generalizedTyOfTyconRef cenv.g entity ErrorLogger.protectAssemblyExploration [] (fun () -> - [ for ty in AllInterfacesOfType cenv.g cenv.amap range0 AllowMultiIntfInstantiations.Yes (generalizedTyconRef entity) do - yield FSharpType(cenv, ty) ]) + [ for ity in AllInterfacesOfType cenv.g cenv.amap range0 AllowMultiIntfInstantiations.Yes ty do + yield FSharpType(cenv, ity) ]) |> makeReadOnlyCollection member x.IsAttributeType = if isUnresolved() then false else - let ty = generalizedTyconRef entity + let ty = generalizedTyOfTyconRef cenv.g entity ErrorLogger.protectAssemblyExploration false <| fun () -> - Infos.ExistsHeadTypeInEntireHierarchy cenv.g cenv.amap range0 ty cenv.g.tcref_System_Attribute + Infos.ExistsHeadTypeInEntireHierarchy cenv.g cenv.amap range0 ty cenv.g.tcref_System_Attribute member x.IsDisposableType = if isUnresolved() then false else - let ty = generalizedTyconRef entity + let ty = generalizedTyOfTyconRef cenv.g entity ErrorLogger.protectAssemblyExploration false <| fun () -> - Infos.ExistsHeadTypeInEntireHierarchy cenv.g cenv.amap range0 ty cenv.g.tcref_System_IDisposable + Infos.ExistsHeadTypeInEntireHierarchy cenv.g cenv.amap range0 ty cenv.g.tcref_System_IDisposable member x.BaseType = checkIsResolved() - GetSuperTypeOfType cenv.g cenv.amap range0 (generalizedTyconRef entity) + let ty = generalizedTyOfTyconRef cenv.g entity + GetSuperTypeOfType cenv.g cenv.amap range0 ty |> Option.map (fun ty -> FSharpType(cenv, ty)) member __.UsesPrefixDisplay = @@ -579,7 +582,7 @@ and FSharpEntity(cenv: SymbolEnv, entity:EntityRef) = member x.MembersFunctionsAndValues = if isUnresolved() then makeReadOnlyCollection[] else protect <| fun () -> - ([ let _, entityTy = generalizeTyconRef entity + ([ let entityTy = generalizedTyOfTyconRef cenv.g entity let createMember (minfo: MethInfo) = if minfo.IsConstructor then FSharpMemberOrFunctionOrValue(cenv, C minfo, Item.CtorGroup (minfo.DisplayName, [minfo])) else FSharpMemberOrFunctionOrValue(cenv, M minfo, Item.MethodGroup (minfo.DisplayName, [minfo], None)) @@ -610,10 +613,10 @@ and FSharpEntity(cenv: SymbolEnv, entity:EntityRef) = yield FSharpMemberOrFunctionOrValue(cenv, V vref, Item.Value vref) match v.MemberInfo.Value.MemberFlags.MemberKind, v.ApparentEnclosingEntity with | MemberKind.PropertyGet, Parent p -> - let pinfo = FSProp(cenv.g, generalizedTyconRef p, Some vref, None) + let pinfo = FSProp(cenv.g, generalizedTyOfTyconRef cenv.g p, Some vref, None) yield FSharpMemberOrFunctionOrValue(cenv, P pinfo, Item.Property (pinfo.PropertyName, [pinfo])) | MemberKind.PropertySet, Parent p -> - let pinfo = FSProp(cenv.g, generalizedTyconRef p, None, Some vref) + let pinfo = FSProp(cenv.g, generalizedTyOfTyconRef cenv.g p, None, Some vref) yield FSharpMemberOrFunctionOrValue(cenv, P pinfo, Item.Property (pinfo.PropertyName, [pinfo])) | _ -> () @@ -665,7 +668,7 @@ and FSharpEntity(cenv: SymbolEnv, entity:EntityRef) = let (TILObjectReprData(_scoref, _enc, tdef)) = entity.ILTyconInfo let formalTypars = entity.Typars(range.Zero) let formalTypeInst = generalizeTypars formalTypars - let ty = TType_app(entity, formalTypeInst, KnownNonNull) + let ty = TType_app(entity, formalTypeInst, cenv.g.knownWithoutNull) let formalTypeInfo = ILTypeInfo.FromType cenv.g ty tdef.Fields.AsList |> List.map (fun tdef -> let ilFieldInfo = ILFieldInfo(formalTypeInfo, tdef) @@ -1419,7 +1422,7 @@ and FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) = | M m | C m -> let rty = m.GetFSharpReturnTy(cenv.amap, range0, m.FormalMethodInst) let argtysl = m.GetParamTypes(cenv.amap, range0, m.FormalMethodInst) - mkIteratedFunTy (List.map (mkRefTupledTy cenv.g) argtysl) rty + mkIteratedFunTy cenv.g (List.map (mkRefTupledTy cenv.g) argtysl) rty | V v -> v.TauType FSharpType(cenv, ty) @@ -1553,9 +1556,9 @@ and FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) = match d with | M m when m.LogicalName.StartsWithOrdinal("add_") -> let eventName = m.LogicalName.[4..] - let entityTy = generalizedTyconRef m.DeclaringTyconRef + let entityTy = generalizedTyOfTyconRef cenv.g m.DeclaringTyconRef not (isNil (cenv.infoReader.GetImmediateIntrinsicEventsOfType (Some eventName, AccessibleFromSomeFSharpCode, range0, entityTy))) || - let declaringTy = generalizedTyconRef m.DeclaringTyconRef + let declaringTy = generalizedTyOfTyconRef cenv.g m.DeclaringTyconRef match GetImmediateIntrinsicPropInfosOfType (Some eventName, AccessibleFromSomeFSharpCode) cenv.g cenv.amap range0 declaringTy with | pinfo :: _ -> pinfo.IsFSharpEventProperty | _ -> false @@ -1567,9 +1570,9 @@ and FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) = match d with | M m when m.LogicalName.StartsWithOrdinal("remove_") -> let eventName = m.LogicalName.[7..] - let entityTy = generalizedTyconRef m.DeclaringTyconRef + let entityTy = generalizedTyOfTyconRef cenv.g m.DeclaringTyconRef not (isNil (cenv.infoReader.GetImmediateIntrinsicEventsOfType (Some eventName, AccessibleFromSomeFSharpCode, range0, entityTy))) || - let declaringTy = generalizedTyconRef m.DeclaringTyconRef + let declaringTy = generalizedTyOfTyconRef cenv.g m.DeclaringTyconRef match GetImmediateIntrinsicPropInfosOfType (Some eventName, AccessibleFromSomeFSharpCode) cenv.g cenv.amap range0 declaringTy with | pinfo :: _ -> pinfo.IsFSharpEventProperty | _ -> false @@ -1594,7 +1597,7 @@ and FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) = match d with | M m when m.LogicalName.StartsWithOrdinal("get_") -> let propName = PrettyNaming.ChopPropertyName(m.LogicalName) - let declaringTy = generalizedTyconRef m.DeclaringTyconRef + let declaringTy = generalizedTyOfTyconRef cenv.g m.DeclaringTyconRef not (isNil (GetImmediateIntrinsicPropInfosOfType (Some propName, AccessibleFromSomeFSharpCode) cenv.g cenv.amap range0 declaringTy)) | V v -> v.IsPropertyGetterMethod | _ -> false @@ -1605,7 +1608,7 @@ and FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) = // Look for a matching property with the right name. | M m when m.LogicalName.StartsWithOrdinal("set_") -> let propName = PrettyNaming.ChopPropertyName(m.LogicalName) - let declaringTy = generalizedTyconRef m.DeclaringTyconRef + let declaringTy = generalizedTyOfTyconRef cenv.g m.DeclaringTyconRef not (isNil (GetImmediateIntrinsicPropInfosOfType (Some propName, AccessibleFromSomeFSharpCode) cenv.g cenv.amap range0 declaringTy)) | V v -> v.IsPropertySetterMethod | _ -> false @@ -1972,7 +1975,7 @@ and FSharpMemberOrFunctionOrValue(cenv, d:FSharpMemberOrValData, item) = | M m | C m -> let rty = m.GetFSharpReturnTy(cenv.amap, range0, m.FormalMethodInst) let argtysl = m.GetParamTypes(cenv.amap, range0, m.FormalMethodInst) - mkIteratedFunTy (List.map (mkRefTupledTy cenv.g) argtysl) rty + mkIteratedFunTy cenv.g (List.map (mkRefTupledTy cenv.g) argtysl) rty | V v -> v.TauType NicePrint.prettyLayoutOfTypeNoCx (denv.Contents cenv.g) ty @@ -2042,7 +2045,7 @@ and FSharpType(cenv, ty:TType) = protect <| fun () -> match stripTyparEqns ty with | TType_app (_, _, nullness) - | TType_fun(_, _, nullness) -> match nullness.Evaluate() with NullnessInfo.Oblivious -> true | _ -> false + | TType_fun(_, _, nullness) -> match nullness.Evaluate() with NullnessInfo.ObliviousToNull -> true | _ -> false | TType_tuple (_, _) -> false | _ -> false diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 1b5cc9f95bb..5b2c0f17a02 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -2256,11 +2256,11 @@ and /// Links a previously unlinked type variable to the given data. Only used during unpickling of F# metadata. member x.AsType nullness = match nullness with - | Nullness.Known NullnessInfo.Oblivious -> + | Nullness.Known NullnessInfo.ObliviousToNull -> let ty = x.typar_astype match box ty with | null -> - let ty2 = TType_var (x, Nullness.Known NullnessInfo.Oblivious) + let ty2 = TType_var (x, Nullness.Known NullnessInfo.ObliviousToNull) x.typar_astype <- ty2 ty2 | _ -> ty @@ -3910,8 +3910,9 @@ and Nullness = | Known info -> info | Variable v -> v.Evaluate() - override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.Oblivious -> "%" + override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.ObliviousToNull -> "%" +// Note, nullness variables are only created if the nullness checking feature is on and NullnessVar() = let mutable solution: Nullness option = None @@ -3942,7 +3943,7 @@ and /// we know that there is no extra null value in the type | WithoutNull /// we know we don't care - | Oblivious + | ObliviousToNull and /// The algebra of types @@ -5293,14 +5294,13 @@ let ccuOfTyconRef eref = let NewNullnessVar() = Nullness.Variable (NullnessVar()) // we don't known (and if we never find out then it's non-null) -let ObliviousToNull = Nullness.Known NullnessInfo.Oblivious -let KnownNull = Nullness.Known NullnessInfo.WithNull -let KnownNonNull = Nullness.Known NullnessInfo.WithoutNull -let AssumeNonNull = KnownNonNull +let KnownObliviousToNull = Nullness.Known NullnessInfo.ObliviousToNull +let KnownWithNull = Nullness.Known NullnessInfo.WithNull +let KnownWithoutNull = Nullness.Known NullnessInfo.WithoutNull let mkTyparTy (tp:Typar) = match tp.Kind with - | TyparKind.Type -> tp.AsType AssumeNonNull // this is by no means always right!? + | TyparKind.Type -> tp.AsType KnownWithoutNull // TODO: this is by no means always right!? | TyparKind.Measure -> TType_measure (Measure.Var tp) let copyTypar (tp: Typar) = From 1a919a215d54b9fbad63f62a111adaca13881a5c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 5 Nov 2018 17:58:33 +0000 Subject: [PATCH 012/137] compat --- src/absil/bytes.fs | 8 +- src/absil/bytes.fsi | 5 +- src/fsharp/CompileOps.fs | 105 ++++++++-- src/fsharp/CompileOps.fsi | 26 ++- src/fsharp/Fsc-proto/Fsc-proto.fsproj | 2 +- src/fsharp/QuotationTranslator.fs | 2 +- src/fsharp/TastPickle.fs | 265 +++++++++---------------- src/fsharp/TastPickle.fsi | 4 +- src/fsharp/fsc.fs | 12 +- src/fsharp/service/IncrementalBuild.fs | 19 +- src/fsharp/tast.fs | 2 + 11 files changed, 230 insertions(+), 220 deletions(-) diff --git a/src/absil/bytes.fs b/src/absil/bytes.fs index c385e987ab5..0b6a2b5066d 100644 --- a/src/absil/bytes.fs +++ b/src/absil/bytes.fs @@ -36,6 +36,9 @@ type internal ByteStream = { bytes: byte[] mutable pos: int max: int } + + member b.IsEOF = (b.pos >= b.max) + member b.ReadByte() = if b.pos >= b.max then failwith "end of stream" let res = b.bytes.[b.pos] @@ -56,11 +59,6 @@ type internal ByteStream = res member b.Position = b.pos -#if LAZY_UNPICKLE - member b.CloneAndSeek = { bytes=b.bytes; pos=pos; max=b.max } - member b.Skip = b.pos <- b.pos + n -#endif - type internal ByteBuffer = { mutable bbArray: byte[] diff --git a/src/absil/bytes.fsi b/src/absil/bytes.fsi index 796eb161872..3cbd274d818 100644 --- a/src/absil/bytes.fsi +++ b/src/absil/bytes.fsi @@ -43,13 +43,10 @@ type internal ByteBuffer = [] type internal ByteStream = + member IsEOF : bool member ReadByte : unit -> byte member ReadBytes : int -> byte[] member ReadUtf8String : int -> string member Position : int static member FromBytes : byte[] * start:int * length:int -> ByteStream -#if LAZY_UNPICKLE - member CloneAndSeek : int -> ByteStream - member Skip : int -> unit -#endif diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 9cfe154ed36..e146ab290f5 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -2121,24 +2121,35 @@ type VersionFlag = /// Represents a reference to an assembly. May be backed by a real assembly on disk, or a cross-project /// reference backed by information generated by the the compiler service. type IRawFSharpAssemblyData = + /// The raw list AutoOpenAttribute attributes in the assembly abstract GetAutoOpenAttributes : ILGlobals -> string list + /// The raw list InternalsVisibleToAttribute attributes in the assembly abstract GetInternalsVisibleToAttributes : ILGlobals -> string list + /// The raw IL module definition in the assembly, if any. This is not present for cross-project references /// in the language service abstract TryGetILModuleDef : unit -> ILModuleDef option + /// The raw F# signature data in the assembly, if any - abstract GetRawFSharpSignatureData : range * ilShortAssemName: string * fileName: string -> (string * (unit -> byte[])) list + abstract GetRawFSharpSignatureData : range * ilShortAssemName: string * fileName: string -> (string * ((unit -> byte[]) * (unit -> byte[]) option)) list + /// The raw F# optimization data in the assembly, if any - abstract GetRawFSharpOptimizationData : range * ilShortAssemName: string * fileName: string -> (string * (unit -> byte[])) list + abstract GetRawFSharpOptimizationData : range * ilShortAssemName: string * fileName: string -> (string * ((unit -> byte[]) * (unit -> byte[]) option)) list + /// The table of type forwarders in the assembly abstract GetRawTypeForwarders : unit -> ILExportedTypesAndForwarders + /// The identity of the module abstract ILScopeRef : ILScopeRef + abstract ILAssemblyRefs : ILAssemblyRef list + abstract ShortAssemblyName : string + abstract HasAnyFSharpSignatureDataAttribute : bool + abstract HasMatchingFSharpSignatureDataAttribute : ILGlobals -> bool /// Cache of time stamps as we traverse a project description @@ -3798,13 +3809,21 @@ let IsSignatureDataResource (r: ILResource) = r.Name.StartsWithOrdinal(FSharpSignatureDataResourceName) || r.Name.StartsWithOrdinal(FSharpSignatureDataResourceName2) +let IsSignatureDataResourceB (r: ILResource) = + r.Name.StartsWithOrdinal(FSharpSignatureDataResourceNameB) + let IsOptimizationDataResource (r: ILResource) = r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceName)|| r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceName2) -let GetSignatureDataResourceName (r: ILResource) = +let IsOptimizationDataResourceB (r: ILResource) = + r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceNameB) + +let GetSignatureDataResourceName (r: ILResource) = if r.Name.StartsWithOrdinal(FSharpSignatureDataResourceName) then String.dropPrefix r.Name FSharpSignatureDataResourceName + elif r.Name.StartsWithOrdinal(FSharpSignatureDataResourceNameB) then + String.dropPrefix r.Name FSharpSignatureDataResourceNameB elif r.Name.StartsWithOrdinal(FSharpSignatureDataResourceName2) then String.dropPrefix r.Name FSharpSignatureDataResourceName2 else failwith "GetSignatureDataResourceName" @@ -3812,6 +3831,8 @@ let GetSignatureDataResourceName (r: ILResource) = let GetOptimizationDataResourceName (r: ILResource) = if r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceName) then String.dropPrefix r.Name FSharpOptimizationDataResourceName + elif r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceNameB) then + String.dropPrefix r.Name FSharpOptimizationDataResourceNameB elif r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceName2) then String.dropPrefix r.Name FSharpOptimizationDataResourceName2 else failwith "GetOptimizationDataResourceName" @@ -3826,35 +3847,43 @@ let MakeILResource rname bytes = CustomAttrsStored = storeILCustomAttrs emptyILCustomAttrs MetadataIndex = NoMetadataIdx } -let PickleToResource inMem file g scope rname p x = +let PickleToResource inMem file g scope rname rnameB p x = + let bytes, bytesB = pickleObjWithDanglingCcus inMem file g scope p x { Name = rname - Location = (let bytes = pickleObjWithDanglingCcus inMem file g scope p x in ILResourceLocation.LocalOut bytes) + Location = ILResourceLocation.LocalOut bytes + Access = ILResourceAccess.Public + CustomAttrsStored = storeILCustomAttrs emptyILCustomAttrs + MetadataIndex = NoMetadataIdx }, + { Name = rnameB + Location = ILResourceLocation.LocalOut bytesB Access = ILResourceAccess.Public CustomAttrsStored = storeILCustomAttrs emptyILCustomAttrs MetadataIndex = NoMetadataIdx } -let GetSignatureData (file, ilScopeRef, ilModule, byteReader) : PickledDataWithReferences = - unpickleObjWithDanglingCcus file ilScopeRef ilModule unpickleCcuInfo (byteReader()) +let GetSignatureData (file, ilScopeRef, ilModule, byteReader, byteReaderB) : PickledDataWithReferences = + unpickleObjWithDanglingCcus file ilScopeRef ilModule unpickleCcuInfo (byteReader()) (match byteReaderB with None -> [| |] | Some br -> br()) -let WriteSignatureData (tcConfig: TcConfig, tcGlobals, exportRemapping, ccu: CcuThunk, file, inMem) : ILResource = +let WriteSignatureData (tcConfig: TcConfig, tcGlobals, exportRemapping, ccu: CcuThunk, file, inMem) : ILResource * ILResource = let mspec = ccu.Contents let mspec = ApplyExportRemappingToEntity tcGlobals exportRemapping mspec // For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers // don't complain when they see the resource. let rname = if ccu.AssemblyName = GetFSharpCoreLibraryName() then FSharpSignatureDataResourceName2 else FSharpSignatureDataResourceName - PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) pickleCcuInfo + let rnameB = FSharpSignatureDataResourceNameB + PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) (rnameB+ccu.AssemblyName) pickleCcuInfo { mspec=mspec compileTimeWorkingDir=tcConfig.implicitIncludeDir usesQuotations = ccu.UsesFSharp20PlusQuotations } -let GetOptimizationData (file, ilScopeRef, ilModule, byteReader) = - unpickleObjWithDanglingCcus file ilScopeRef ilModule Optimizer.u_CcuOptimizationInfo (byteReader()) +let GetOptimizationData (file, ilScopeRef, ilModule, byteReader, byteReaderB) = + unpickleObjWithDanglingCcus file ilScopeRef ilModule Optimizer.u_CcuOptimizationInfo (byteReader()) (match byteReaderB with None -> [| |] | Some br -> br()) let WriteOptimizationData (tcGlobals, file, inMem, ccu: CcuThunk, modulInfo) = // For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers // don't complain when they see the resource. let rname = if ccu.AssemblyName = GetFSharpCoreLibraryName() then FSharpOptimizationDataResourceName2 else FSharpOptimizationDataResourceName - PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) Optimizer.p_CcuOptimizationInfo modulInfo + let rnameB = FSharpOptimizationDataResourceNameB + PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) (rnameB+ccu.AssemblyName) Optimizer.p_CcuOptimizationInfo modulInfo //---------------------------------------------------------------------------- // Abstraction for project reference @@ -3862,30 +3891,60 @@ let WriteOptimizationData (tcGlobals, file, inMem, ccu: CcuThunk, modulInfo) = type RawFSharpAssemblyDataBackedByFileOnDisk (ilModule: ILModuleDef, ilAssemblyRefs) = let externalSigAndOptData = ["FSharp.Core"] interface IRawFSharpAssemblyData with + member __.GetAutoOpenAttributes(ilg) = GetAutoOpenAttributes ilg ilModule + member __.GetInternalsVisibleToAttributes(ilg) = GetInternalsVisibleToAttributes ilg ilModule + member __.TryGetILModuleDef() = Some ilModule + member __.GetRawFSharpSignatureData(m, ilShortAssemName, filename) = let resources = ilModule.Resources.AsList + let sigDataReaders = [ for iresource in resources do if IsSignatureDataResource iresource then let ccuName = GetSignatureDataResourceName iresource - yield (ccuName, fun () -> iresource.GetBytes()) ] - + let readerA = fun () -> iresource.GetBytes() + let readerB = + resources |> List.tryPick (fun iresourceB -> + if IsSignatureDataResourceB iresourceB then + let ccuNameB = GetSignatureDataResourceName iresourceB + if ccuName = ccuNameB then + Some (fun () -> iresourceB.GetBytes() ) + else None + else None) + yield (ccuName, (readerA, readerB)) ] + let sigDataReaders = if sigDataReaders.IsEmpty && List.contains ilShortAssemName externalSigAndOptData then let sigFileName = Path.ChangeExtension(filename, "sigdata") if not (FileSystem.SafeExists sigFileName) then error(Error(FSComp.SR.buildExpectedSigdataFile (FileSystem.GetFullPathShim sigFileName), m)) - [ (ilShortAssemName, fun () -> FileSystem.ReadAllBytesShim sigFileName)] + [ (ilShortAssemName, ((fun () -> FileSystem.ReadAllBytesShim sigFileName), None))] else sigDataReaders sigDataReaders + member __.GetRawFSharpOptimizationData(m, ilShortAssemName, filename) = + let resources = ilModule.Resources.AsList let optDataReaders = - ilModule.Resources.AsList - |> List.choose (fun r -> if IsOptimizationDataResource r then Some(GetOptimizationDataResourceName r, (fun () -> r.GetBytes())) else None) + resources + |> List.choose (fun r -> + if IsOptimizationDataResource r then + let ccuName = GetOptimizationDataResourceName r + let readerA = (fun () -> r.GetBytes()) + let readerB = + resources |> List.tryPick (fun iresourceB -> + if IsOptimizationDataResourceB iresourceB then + let ccuNameB = GetOptimizationDataResourceName iresourceB + if ccuName = ccuNameB then + Some (fun () -> iresourceB.GetBytes() ) + else None + else None) + Some(ccuName, (readerA, readerB)) + else + None) // Look for optimization data in a file let optDataReaders = @@ -3893,14 +3952,16 @@ type RawFSharpAssemblyDataBackedByFileOnDisk (ilModule: ILModuleDef, ilAssemblyR let optDataFile = Path.ChangeExtension(filename, "optdata") if not (FileSystem.SafeExists optDataFile) then error(Error(FSComp.SR.buildExpectedFileAlongSideFSharpCore(optDataFile, FileSystem.GetFullPathShim optDataFile), m)) - [ (ilShortAssemName, (fun () -> FileSystem.ReadAllBytesShim optDataFile))] + [ (ilShortAssemName, ((fun () -> FileSystem.ReadAllBytesShim optDataFile), None))] else optDataReaders optDataReaders + member __.GetRawTypeForwarders() = match ilModule.Manifest with | Some manifest -> manifest.ExportedTypes | None -> mkILExportedTypes [] + member __.ShortAssemblyName = GetNameOfILModule ilModule member __.ILScopeRef = MakeScopeRefForILModule ilModule member __.ILAssemblyRefs = ilAssemblyRefs @@ -4493,8 +4554,8 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti let ccuRawDataAndInfos = ilModule.GetRawFSharpSignatureData(m, ilShortAssemName, filename) - |> List.map (fun (ccuName, sigDataReader) -> - let data = GetSignatureData (filename, ilScopeRef, ilModule.TryGetILModuleDef(), sigDataReader) + |> List.map (fun (ccuName, (sigDataReader, sigDataReaderB)) -> + let data = GetSignatureData (filename, ilScopeRef, ilModule.TryGetILModuleDef(), sigDataReader, sigDataReaderB) let optDatas = Map.ofList optDataReaders @@ -4532,8 +4593,8 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti | None -> if verbose then dprintf "*** no optimization data for CCU %s, was DLL compiled with --no-optimization-data??\n" ccuName None - | Some info -> - let data = GetOptimizationData (filename, ilScopeRef, ilModule.TryGetILModuleDef(), info) + | Some (readerA, readerB) -> + let data = GetOptimizationData (filename, ilScopeRef, ilModule.TryGetILModuleDef(), readerA, readerB) let res = data.OptionalFixup(fun nm -> availableToOptionalCcu(tcImports.FindCcu(ctok, m, nm, lookupOnly=false))) if verbose then dprintf "found optimization data for CCU %s\n" ccuName Some res) diff --git a/src/fsharp/CompileOps.fsi b/src/fsharp/CompileOps.fsi index 5b69b69243a..bc7720e7d26 100755 --- a/src/fsharp/CompileOps.fsi +++ b/src/fsharp/CompileOps.fsi @@ -139,24 +139,35 @@ exception HashLoadedScriptConsideredSource of range /// Represents a reference to an F# assembly. May be backed by a real assembly on disk (read by Abstract IL), or a cross-project /// reference in FSharp.Compiler.Service. type IRawFSharpAssemblyData = + /// The raw list AutoOpenAttribute attributes in the assembly abstract GetAutoOpenAttributes: ILGlobals -> string list + /// The raw list InternalsVisibleToAttribute attributes in the assembly abstract GetInternalsVisibleToAttributes: ILGlobals -> string list + /// The raw IL module definition in the assembly, if any. This is not present for cross-project references /// in the language service abstract TryGetILModuleDef: unit -> ILModuleDef option + abstract HasAnyFSharpSignatureDataAttribute: bool + abstract HasMatchingFSharpSignatureDataAttribute: ILGlobals -> bool + /// The raw F# signature data in the assembly, if any - abstract GetRawFSharpSignatureData: range * ilShortAssemName: string * fileName: string -> (string * (unit -> byte[])) list + abstract GetRawFSharpSignatureData : range * ilShortAssemName: string * fileName: string -> (string * ((unit -> byte[]) * (unit -> byte[]) option)) list + /// The raw F# optimization data in the assembly, if any - abstract GetRawFSharpOptimizationData: range * ilShortAssemName: string * fileName: string -> (string * (unit -> byte[])) list + abstract GetRawFSharpOptimizationData : range * ilShortAssemName: string * fileName: string -> (string * ((unit -> byte[]) * (unit -> byte[]) option)) list + /// The table of type forwarders in the assembly abstract GetRawTypeForwarders: unit -> ILExportedTypesAndForwarders + /// The identity of the module abstract ILScopeRef: ILScopeRef + abstract ILAssemblyRefs: ILAssemblyRef list + abstract ShortAssemblyName: string type TimeStampCache = @@ -635,6 +646,9 @@ type TcImports = /// Determine if an IL resource attached to an F# assembly is an F# signature data resource val IsSignatureDataResource: ILResource -> bool +/// Determine if an IL resource attached to an F# assembly is an F# signature data resource (data stream B) +val IsSignatureDataResourceB: ILResource -> bool + /// Determine if an IL resource attached to an F# assembly is an F# optimization data resource val IsOptimizationDataResource: ILResource -> bool @@ -643,14 +657,10 @@ val IsReflectedDefinitionsResource: ILResource -> bool val GetSignatureDataResourceName: ILResource -> string /// Write F# signature data as an IL resource -val WriteSignatureData: TcConfig * TcGlobals * Tastops.Remap * CcuThunk * filename: string * inMem: bool -> ILResource +val WriteSignatureData: TcConfig * TcGlobals * Tastops.Remap * CcuThunk * filename: string * inMem: bool -> ILResource * ILResource /// Write F# optimization data as an IL resource -val WriteOptimizationData: TcGlobals * filename: string * inMem: bool * CcuThunk * Optimizer.LazyModuleInfo -> ILResource - -//---------------------------------------------------------------------------- -// #r and other directives -//-------------------------------------------------------------------------- +val WriteOptimizationData: TcGlobals * filename: string * inMem: bool * CcuThunk * Optimizer.LazyModuleInfo -> ILResource * ILResource //---------------------------------------------------------------------------- // #r and other directives diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj index 5cccf4f17a2..321979bb4c8 100644 --- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj +++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj @@ -18,7 +18,7 @@ {9D7C9060-9263-40EB-8FE3-1E4E3C6D941C} true $(OtherFlags) --warnon:1182 - $(OtherFlags) --stackReserveSize:4096000 + $(OtherFlags) --stackReserveSize:4096000 --optimize- diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs index e6e87647db6..84dc9513caf 100644 --- a/src/fsharp/QuotationTranslator.fs +++ b/src/fsharp/QuotationTranslator.fs @@ -929,7 +929,7 @@ and ConvDecisionTree cenv env tgs typR x = // Check if this is an provider-generated assembly that will be statically linked and IsILTypeRefStaticLinkLocal cenv m (tr:ILTypeRef) = let g = cenv.g - ignore cenv; ignore m + ignore m match tr.Scope with #if !NO_EXTENSIONTYPING | ILScopeRef.Assembly aref diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index 95df4854a48..4c6d20fbf8d 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -111,6 +111,7 @@ type NodeOutTable<'Data,'Node> = [] type WriterState = { os: ByteBuffer + osB: ByteBuffer oscope: CcuThunk occus: Table otycons: NodeOutTable @@ -142,6 +143,8 @@ type NodeInTable<'Data,'Node> = [] type ReaderState = { is: ByteStream + // secondary stream of information for F# 5.0 + isB: ByteStream iilscope: ILScopeRef iccus: InputTable itycons: NodeInTable @@ -164,6 +167,7 @@ let ufailwith st str = ffailwith st.ifile str type 'T pickler = 'T -> WriterState -> unit let p_byte b st = st.os.EmitIntAsByte b +let p_byteB b st = st.osB.EmitIntAsByte b let p_bool b st = p_byte (if b then 1 else 0) st let prim_p_int32 i st = p_byte (b0 i) st @@ -235,21 +239,17 @@ let inline p_tup8 p1 p2 p3 p4 p5 p6 p7 p8 (a,b,c,d,e,f,x7,x8) (st:WriterState) let inline p_tup9 p1 p2 p3 p4 p5 p6 p7 p8 p9 (a,b,c,d,e,f,x7,x8,x9) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit) let inline p_tup10 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 (a,b,c,d,e,f,x7,x8,x9,x10) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit); (p10 x10 st : unit) let inline p_tup11 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 (a,b,c,d,e,f,x7,x8,x9,x10,x11) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit); (p10 x10 st : unit); (p11 x11 st : unit) -let inline p_tup12 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit); (p10 x10 st : unit); (p11 x11 st : unit); (p12 x12 st : unit) -let inline p_tup13 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit); (p10 x10 st : unit); (p11 x11 st : unit); (p12 x12 st : unit); (p13 x13 st : unit) -let inline p_tup14 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13,x14) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit); (p10 x10 st : unit); (p11 x11 st : unit); (p12 x12 st : unit); (p13 x13 st : unit) ; (p14 x14 st : unit) -let inline p_tup15 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13,x14,x15) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit); (p10 x10 st : unit); (p11 x11 st : unit); (p12 x12 st : unit); (p13 x13 st : unit) ; (p14 x14 st : unit); (p15 x15 st : unit) -let inline p_tup16 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit); (p10 x10 st : unit); (p11 x11 st : unit); (p12 x12 st : unit); (p13 x13 st : unit) ; (p14 x14 st : unit); (p15 x15 st : unit); (p16 x16 st : unit) -let inline p_tup17 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16,x17) (st:WriterState) = (p1 a st : unit); (p2 b st : unit); (p3 c st : unit); (p4 d st : unit); (p5 e st : unit); (p6 f st : unit); (p7 x7 st : unit); (p8 x8 st : unit); (p9 x9 st : unit); (p10 x10 st : unit); (p11 x11 st : unit); (p12 x12 st : unit); (p13 x13 st : unit) ; (p14 x14 st : unit); (p15 x15 st : unit); (p16 x16 st : unit); (p17 x17 st : unit) let u_byte st = int (st.is.ReadByte()) +/// The extra B stream of bytes is implicitly 0 if not present +let u_byteB st = + if st.isB.IsEOF then 0 else int (st.isB.ReadByte()) + type unpickler<'T> = ReaderState -> 'T let u_bool st = let b = u_byte st in (b = 1) - - let prim_u_int32 st = let b0 = (u_byte st) let b1 = (u_byte st) @@ -344,35 +344,11 @@ let inline u_tup11 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 (st:ReaderState) = let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in (a,b,c,d,e,f,x7,x8,x9,x10,x11) -let inline u_tup12 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 (st:ReaderState) = - let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in - let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in - let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in - (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12) let inline u_tup13 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 (st:ReaderState) = let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13) -let inline u_tup14 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 (st:ReaderState) = - let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in - let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in - let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in - let x14 = p14 st in - (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13,x14) -let inline u_tup15 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 (st:ReaderState) = - let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in - let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in - let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in - let x14 = p14 st in let x15 = p15 st in - (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13,x14,x15) - -let inline u_tup16 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 (st:ReaderState) = - let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in - let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in - let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in - let x14 = p14 st in let x15 = p15 st in let x16 = p16 st in - (a,b,c,d,e,f,x7,x8,x9,x10,x11,x12,x13,x14,x15,x16) let inline u_tup17 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 (st:ReaderState) = let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in @@ -570,12 +546,6 @@ let u_option f st = | 1 -> Some (f st) | n -> ufailwith st ("u_option: found number " + string n) -// Boobytrap an OSGN node with a force of a lazy load of a bunch of pickled data -#if LAZY_UNPICKLE -let wire (x:osgn<_>) (res:Lazy<_>) = - x.osgnTripWire <- Some(fun () -> res.Force() |> ignore) -#endif - let u_lazy u st = // Read the number of bytes in the record @@ -588,25 +558,8 @@ let u_lazy u st = let ovalsIdx1 = prim_u_int32 st // fixupPos6 let ovalsIdx2 = prim_u_int32 st // fixupPos7 -#if LAZY_UNPICKLE - // Record the position in the bytestream to use when forcing the read of the data - let idx1 = st.is.Position - // Skip the length of data - st.is.Skip len - // This is the lazy computation that wil force the unpickling of the term. - // This term must contain OSGN definitions of the given nodes. - let res = - lazy (let st = { st with is = st.is.CloneAndSeek idx1 } - u st) - /// Force the reading of the data as a "tripwire" for each of the OSGN thunks - for i = otyconsIdx1 to otyconsIdx2-1 do wire (st.itycons.Get(i)) res done - for i = ovalsIdx1 to ovalsIdx2-1 do wire (st.ivals.Get(i)) res done - for i = otyparsIdx1 to otyparsIdx2-1 do wire (st.itypars.Get(i)) res done - res -#else ignore (len, otyconsIdx1, otyconsIdx2, otyparsIdx1, otyparsIdx2, ovalsIdx1, ovalsIdx2) Lazy.CreateFromValue(u st) -#endif let u_hole () = @@ -699,9 +652,10 @@ let p_simpletyp x st = p_int (encode_simpletyp st.occus st.ostrings st.onlerefs type sizes = int * int * int let pickleObjWithDanglingCcus inMem file (g: TcGlobals) scope p x = - let ccuNameTab,(sizes: sizes),stringTab,pubpathTab,nlerefTab,simpleTyTab,phase1bytes = + let ccuNameTab,(sizes: sizes),stringTab,pubpathTab,nlerefTab,simpleTyTab,phase1bytes,phase1bytesB = let st1 = { os = ByteBuffer.Create 100000 + osB = ByteBuffer.Create 100000 oscope=scope occus= Table<_>.Create "occus" otycons=NodeOutTable<_,_>.Create((fun (tc:Tycon) -> tc.Stamp),(fun tc -> tc.LogicalName),(fun tc -> tc.Range),(fun osgn -> osgn),"otycons") @@ -719,11 +673,12 @@ let pickleObjWithDanglingCcus inMem file (g: TcGlobals) scope p x = st1.otycons.Size, st1.otypars.Size, st1.ovals.Size - st1.occus, sizes, st1.ostrings, st1.opubpaths,st1.onlerefs, st1.osimpletys, st1.os.Close() + st1.occus, sizes, st1.ostrings, st1.opubpaths,st1.onlerefs, st1.osimpletys, st1.os.Close(), st1.osB.Close() let phase2data = (ccuNameTab.AsArray,sizes,stringTab.AsArray,pubpathTab.AsArray,nlerefTab.AsArray,simpleTyTab.AsArray,phase1bytes) - let phase2bytes = + let phase2bytes, phase2bytesB = let st2 = { os = ByteBuffer.Create 100000 + osB = ByteBuffer.Create 100000 oscope=scope occus= Table<_>.Create "occus (fake)" otycons=NodeOutTable<_,_>.Create((fun (tc:Tycon) -> tc.Stamp),(fun tc -> tc.LogicalName),(fun tc -> tc.Range),(fun osgn -> osgn),"otycons") @@ -745,8 +700,13 @@ let pickleObjWithDanglingCcus inMem file (g: TcGlobals) scope p x = (p_array p_encoded_simpletyp) p_bytes phase2data st2 - st2.os.Close() - phase2bytes + st2.os.Close(), st2.osB.Close() + + if phase2bytesB.Length <> 0 then failwith "expected phase2bytesB.Length = 0" + printfn "(pickle) phase1bytesB = %A" phase1bytesB + ignore phase1bytesB + + phase2bytes, ([| |] : byte array) let check (ilscope:ILScopeRef) (inMap : NodeInTable<_,_>) = for i = 0 to inMap.Count - 1 do @@ -755,9 +715,11 @@ let check (ilscope:ILScopeRef) (inMap : NodeInTable<_,_>) = warning(Error(FSComp.SR.pickleMissingDefinition (i, inMap.Name, ilscope.QualifiedName), range0)) // Note for compiler developers: to get information about which item this index relates to, enable the conditional in Pickle.p_osgn_ref to refer to the given index number and recompile an identical copy of the source for the DLL containing the data being unpickled. A message will then be printed indicating the name of the item.\n" -let unpickleObjWithDanglingCcus file ilscope (iILModule:ILModuleDef option) u (phase2bytes:byte[]) = +let unpickleObjWithDanglingCcus file ilscope (iILModule:ILModuleDef option) u (phase2bytes:byte[]) (phase1bytesB:byte[]) = + printfn "(unpickle) phase1bytesB = %A" phase1bytesB let st2 = { is = ByteStream.FromBytes (phase2bytes,0,phase2bytes.Length) + isB = ByteStream.FromBytes ([| |],0,0) iilscope= ilscope iccus= new_itbl "iccus (fake)" [| |] itycons= NodeInTable<_,_>.Create (Tycon.NewUnlinked, (fun osgn tg -> osgn.Link tg),(fun osgn -> osgn.IsLinked),"itycons",0) @@ -788,6 +750,7 @@ let unpickleObjWithDanglingCcus file ilscope (iILModule:ILModuleDef option) u (p let data = let st1 = { is = ByteStream.FromBytes (phase1bytes,0,phase1bytes.Length) + isB = ByteStream.FromBytes (phase1bytesB,0,phase1bytesB.Length) iccus= ccuTab iilscope= ilscope itycons= NodeInTable<_,_>.Create(Tycon.NewUnlinked,(fun osgn tg -> osgn.Link tg),(fun osgn -> osgn.IsLinked),"itycons",ntycons) @@ -800,19 +763,16 @@ let unpickleObjWithDanglingCcus file ilscope (iILModule:ILModuleDef option) u (p ifile=file iILModule = iILModule } let res = u st1 -#if LAZY_UNPICKLE -#else check ilscope st1.itycons check ilscope st1.ivals check ilscope st1.itypars -#endif res {RawData=data; FixupThunks=Array.toList ccuTab.itbl_rows } //========================================================================= -// PART II *) +// PART II //========================================================================= //--------------------------------------------------------------------------- @@ -1575,64 +1535,38 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> | TType_app(ERefNonLocal nleref,[], nullness) -> if st.oglobals.langFeatureNullness then match nullness.Evaluate() with - | NullnessInfo.WithNull -> - p_byte 9 st; p_simpletyp nleref st // TODO: compatible emitting nullness in F# metadata - | NullnessInfo.WithoutNull -> - p_byte 10 st; p_simpletyp nleref st // TODO: compatible emitting nullness in F# metadata - | NullnessInfo.ObliviousToNull -> - p_byte 11 st; p_simpletyp nleref st - else - p_byte 1 st; p_simpletyp nleref st + | NullnessInfo.WithNull -> p_byteB 9 st + | NullnessInfo.WithoutNull -> p_byteB 10 st + | NullnessInfo.ObliviousToNull -> p_byteB 11 st + p_byte 1 st; p_simpletyp nleref st | TType_app (tc,tinst, nullness) -> if st.oglobals.langFeatureNullness then match nullness.Evaluate() with - | NullnessInfo.WithNull -> - p_byte 12 st; p_tcref "typ" tc st; p_tys tinst st // TODO: compatible emitting nullness in F# metadata - | NullnessInfo.WithoutNull -> - p_byte 13 st; p_tcref "typ" tc st; p_tys tinst st // TODO: compatible emitting nullness in F# metadata - | NullnessInfo.ObliviousToNull -> - p_byte 14 st; p_tcref "typ" tc st; p_tys tinst st - else - p_byte 2 st; p_tcref "typ" tc st; p_tys tinst st + | NullnessInfo.WithNull -> p_byteB 12 st + | NullnessInfo.WithoutNull -> p_byteB 13 st + | NullnessInfo.ObliviousToNull -> p_byteB 14 st + p_byte 2 st; p_tcref "typ" tc st; p_tys tinst st - | TType_fun (d,r,nullness) -> // TODO: not emitting nullness in F# metadata + | TType_fun (d,r,nullness) -> if st.oglobals.langFeatureNullness then match nullness.Evaluate() with - | NullnessInfo.WithNull -> - p_byte 15 st - p_ty2 isStructThisArgPos d st - p_ty r st - | NullnessInfo.WithoutNull -> - p_byte 16 st - p_ty2 isStructThisArgPos d st - p_ty r st - | NullnessInfo.ObliviousToNull -> - p_byte 17 st - // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value - p_ty2 isStructThisArgPos d st - p_ty r st - else - p_byte 3 st - // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value - p_ty2 isStructThisArgPos d st - p_ty r st + | NullnessInfo.WithNull -> p_byteB 15 st + | NullnessInfo.WithoutNull -> p_byteB 16 st + | NullnessInfo.ObliviousToNull -> p_byteB 17 st + p_byte 3 st + // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value + p_ty2 isStructThisArgPos d st + p_ty r st | TType_var (r, nullness) -> if st.oglobals.langFeatureNullness then match nullness.Evaluate() with - | NullnessInfo.WithNull -> - p_byte 18 st - p_tpref r st - | NullnessInfo.WithoutNull -> - p_byte 19 st - p_tpref r st - | NullnessInfo.ObliviousToNull -> - p_byte 20 st - p_tpref r st - else - p_byte 4 st - p_tpref r st + | NullnessInfo.WithNull -> p_byteB 18 st + | NullnessInfo.WithoutNull -> p_byteB 19 st + | NullnessInfo.ObliviousToNull -> p_byteB 20 st + p_byte 4 st + p_tpref r st | TType_forall (tps,r) -> p_byte 5 st @@ -1647,66 +1581,61 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> let _ = fill_u_ty (fun st -> let tag = u_byte st match tag with - | 0 -> let l = u_tys st in TType_tuple (tupInfoRef, l) - | 1 -> u_simpletyp st - | 2 -> let tc = u_tcref st in let tinst = u_tys st in TType_app (tc, tinst, KnownObliviousToNull) - | 3 -> let d = u_ty st in let r = u_ty st in TType_fun (d,r, KnownObliviousToNull) - | 4 -> let r = u_tpref st in r.AsType KnownObliviousToNull - | 5 -> let tps = u_tyar_specs st in let r = u_ty st in TType_forall (tps,r) - | 6 -> let unt = u_measure_expr st in TType_measure unt - | 7 -> let uc = u_ucref st in let tinst = u_tys st in TType_ucase (uc,tinst) - | 8 -> let l = u_tys st in TType_tuple (tupInfoStruct, l) - | 9 -> - let sty = u_simpletyp st - match sty with - | TType_app(_tcref, [], Nullness.Known NullnessInfo.WithNull) -> sty // keep the unique - | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownWithNull) - | _ -> ufailwith st "u_ty - 9" - | 10 -> - let sty = u_simpletyp st - match sty with - | TType_app(_tcref, [], Nullness.Known NullnessInfo.WithoutNull) -> sty // keep the unique - | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownWithoutNull) - | _ -> ufailwith st "u_ty - 9" - | 11 -> - let sty = u_simpletyp st - match sty with - | TType_app(_tcref, [], Nullness.Known NullnessInfo.ObliviousToNull) -> sty // keep the unique - | TType_app(tcref, [], _nullness) -> TType_app(tcref, [], KnownObliviousToNull) - | _ -> ufailwith st "u_ty - 9" - | 12 -> - let tc = u_tcref st - let tinst = u_tys st - TType_app (tc, tinst, KnownWithNull) - | 13 -> - let tc = u_tcref st - let tinst = u_tys st - TType_app (tc, tinst, KnownWithoutNull) - | 14 -> - let tc = u_tcref st + | 0 -> + let l = u_tys st + TType_tuple (tupInfoRef, l) + | 1 -> + let sty = u_simpletyp st + let tagB = u_byteB st + match tagB with + | 9 -> + match sty with + | TType_app(tcref, _, _) -> TType_app(tcref, [], KnownWithNull) + | _ -> ufailwith st "u_ty 9a" + | 10 -> + match sty with + | TType_app(tcref, _, _) -> TType_app(tcref, [], KnownWithoutNull) + | _ -> ufailwith st "u_ty 9b" + | 11 -> + match sty with + | TType_app(tcref, _, _) -> TType_app(tcref, [], KnownObliviousToNull) + | _ -> ufailwith st "u_ty 9c" + | 0 -> + sty + | b -> ufailwith st (sprintf "u_ty - 1/B, byte = %A" b) + | 2 -> + let tcref = u_tcref st let tinst = u_tys st - TType_app (tc, tinst, KnownObliviousToNull) - | 15 -> - let d = u_ty st - let r = u_ty st - TType_fun (d,r, KnownWithNull) - | 16 -> - let d = u_ty st - let r = u_ty st - TType_fun (d,r, KnownWithoutNull) - | 17 -> + let tagB = u_byteB st + match tagB with + | 12 -> TType_app (tcref, tinst, KnownWithNull) + | 13 -> TType_app (tcref, tinst, KnownWithoutNull) + | 14 -> TType_app (tcref, tinst, KnownObliviousToNull) + | 0 -> TType_app (tcref, tinst, KnownObliviousToNull) + | _ -> ufailwith st "u_ty - 2/B" + | 3 -> let d = u_ty st let r = u_ty st - TType_fun (d,r, KnownObliviousToNull) - | 18 -> + let tagB = u_byteB st + match tagB with + | 15 -> TType_fun (d, r, KnownWithNull) + | 16 -> TType_fun (d, r, KnownWithoutNull) + | 17 -> TType_fun (d, r, KnownObliviousToNull) + | 0 -> TType_fun (d, r, KnownObliviousToNull) + | _ -> ufailwith st "u_ty - 3/B" + | 4 -> let r = u_tpref st - TType_var (r, KnownWithNull) - | 19 -> - let r = u_tpref st - TType_var (r, KnownWithoutNull) - | 20 -> - let r = u_tpref st - TType_var (r, KnownObliviousToNull) + let tagB = u_byteB st + match tagB with + | 18 -> r.AsType KnownWithNull + | 19 -> r.AsType KnownWithoutNull + | 20 -> r.AsType KnownObliviousToNull + | 0 -> r.AsType KnownObliviousToNull + | _ -> ufailwith st "u_ty - 4/B" + | 5 -> let tps = u_tyar_specs st in let r = u_ty st in TType_forall (tps,r) + | 6 -> let unt = u_measure_expr st in TType_measure unt + | 7 -> let uc = u_ucref st in let tinst = u_tys st in TType_ucase (uc,tinst) + | 8 -> let l = u_tys st in TType_tuple (tupInfoStruct, l) | _ -> ufailwith st "u_ty") diff --git a/src/fsharp/TastPickle.fsi b/src/fsharp/TastPickle.fsi index 4bf6aca3ef1..ebfefe9f249 100644 --- a/src/fsharp/TastPickle.fsi +++ b/src/fsharp/TastPickle.fsi @@ -82,7 +82,7 @@ val internal p_ty : pickler val internal pickleCcuInfo : pickler /// Serialize an arbitrary object using the given pickler -val pickleObjWithDanglingCcus : inMem: bool -> file: string -> TcGlobals -> scope:CcuThunk -> pickler<'T> -> 'T -> byte[] +val pickleObjWithDanglingCcus : inMem: bool -> file: string -> TcGlobals -> scope:CcuThunk -> pickler<'T> -> 'T -> byte[] * byte[] /// The type of state unpicklers read from type ReaderState @@ -142,7 +142,7 @@ val internal u_ty : unpickler val internal unpickleCcuInfo : ReaderState -> PickledCcuInfo /// Deserialize an arbitrary object which may have holes referring to other compilation units -val internal unpickleObjWithDanglingCcus : file:string -> viewedScope:ILScopeRef -> ilModule:ILModuleDef option -> ('T unpickler) -> byte[] -> PickledDataWithReferences<'T> +val internal unpickleObjWithDanglingCcus : file:string -> viewedScope:ILScopeRef -> ilModule:ILModuleDef option -> ('T unpickler) -> byte[] -> byte[] -> PickledDataWithReferences<'T> diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs index e418b1bb9b1..2716faa02b5 100644 --- a/src/fsharp/fsc.fs +++ b/src/fsharp/fsc.fs @@ -428,14 +428,13 @@ let GenerateInterfaceData(tcConfig:TcConfig) = let EncodeInterfaceData(tcConfig: TcConfig, tcGlobals, exportRemapping, generatedCcu, outfile, isIncrementalBuild) = if GenerateInterfaceData(tcConfig) then - let resource = WriteSignatureData (tcConfig, tcGlobals, exportRemapping, generatedCcu, outfile, isIncrementalBuild) + let resource1, resource2 = WriteSignatureData (tcConfig, tcGlobals, exportRemapping, generatedCcu, outfile, isIncrementalBuild) // The resource gets written to a file for FSharp.Core let useDataFiles = (tcConfig.useOptimizationDataFile || tcGlobals.compilingFslib) && not isIncrementalBuild if useDataFiles then let sigDataFileName = (Filename.chopExtension outfile)+".sigdata" - File.WriteAllBytes(sigDataFileName, resource.GetBytes()) - let resources = - [ resource ] + File.WriteAllBytes(sigDataFileName, resource1.GetBytes()) + let resources = [resource1; resource2] let sigAttr = mkSignatureDataVersionAttr tcGlobals (IL.parseILVersion Internal.Utilities.FSharpEnvironment.FSharpBinaryMetadataFormatRevision) [sigAttr], resources else @@ -456,7 +455,7 @@ let EncodeOptimizationData(tcGlobals, tcConfig: TcConfig, outfile, exportRemappi let useDataFiles = (tcConfig.useOptimizationDataFile || tcGlobals.compilingFslib) && not isIncrementalBuild if useDataFiles then let ccu, modulInfo = data - let bytes = TastPickle.pickleObjWithDanglingCcus isIncrementalBuild outfile tcGlobals ccu Optimizer.p_CcuOptimizationInfo modulInfo + let bytes, _bytesB = TastPickle.pickleObjWithDanglingCcus isIncrementalBuild outfile tcGlobals ccu Optimizer.p_CcuOptimizationInfo modulInfo let optDataFileName = (Filename.chopExtension outfile)+".optdata" File.WriteAllBytes(optDataFileName, bytes) let (ccu, optData) = @@ -464,7 +463,8 @@ let EncodeOptimizationData(tcGlobals, tcConfig: TcConfig, outfile, exportRemappi map2Of2 Optimizer.AbstractOptimizationInfoToEssentials data else data - [ WriteOptimizationData (tcGlobals, outfile, isIncrementalBuild, ccu, optData) ] + let r1, r2 = WriteOptimizationData (tcGlobals, outfile, isIncrementalBuild, ccu, optData) + [ r1; r2 ] else [ ] diff --git a/src/fsharp/service/IncrementalBuild.fs b/src/fsharp/service/IncrementalBuild.fs index e441ad16dac..7bdbb6f5a16 100755 --- a/src/fsharp/service/IncrementalBuild.fs +++ b/src/fsharp/service/IncrementalBuild.fs @@ -1170,9 +1170,22 @@ type RawFSharpAssemblyDataBackedByLanguageService (tcConfig, tcGlobals, tcState: let sigData = let _sigDataAttributes, sigDataResources = Driver.EncodeInterfaceData(tcConfig, tcGlobals, exportRemapping, generatedCcu, outfile, true) - [ for r in sigDataResources do - let ccuName = GetSignatureDataResourceName r - yield (ccuName, (fun () -> r.GetBytes())) ] + let sigDataReaders = + [ for iresource in sigDataResources do + if IsSignatureDataResource iresource then + let ccuName = GetSignatureDataResourceName iresource + let readerA = fun () -> iresource.GetBytes() + let readerB = + sigDataResources |> List.tryPick (fun iresourceB -> + if IsSignatureDataResourceB iresourceB then + let ccuNameB = GetSignatureDataResourceName iresourceB + if ccuName = ccuNameB then + Some (fun () -> iresourceB.GetBytes() ) + else None + else None) + yield (ccuName, (readerA, readerB)) ] + + sigDataReaders let autoOpenAttrs = topAttrs.assemblyAttrs |> List.choose (List.singleton >> TryFindFSharpStringAttribute tcGlobals tcGlobals.attrib_AutoOpenAttribute) let ivtAttrs = topAttrs.assemblyAttrs |> List.choose (List.singleton >> TryFindFSharpStringAttribute tcGlobals tcGlobals.attrib_InternalsVisibleToAttribute) diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 5b2c0f17a02..1bd3c8383eb 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -5830,3 +5830,5 @@ let FSharpSignatureDataResourceName = "FSharpSignatureData." let FSharpOptimizationDataResourceName2 = "FSharpOptimizationInfo." let FSharpSignatureDataResourceName2 = "FSharpSignatureInfo." +let FSharpOptimizationDataResourceNameB = "FSharpOptimizationDataB." +let FSharpSignatureDataResourceNameB = "FSharpSignatureDataB." From 47fdc4cf38cdcf8f9c05f500e48964b40a4e0d00 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 6 Nov 2018 14:00:32 +0000 Subject: [PATCH 013/137] fix pickle of information --- src/fsharp/Fsc-proto/Fsc-proto.fsproj | 2 +- src/fsharp/QuotationTranslator.fs | 8 +++++--- src/fsharp/TastPickle.fs | 24 +++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj index 321979bb4c8..5cccf4f17a2 100644 --- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj +++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj @@ -18,7 +18,7 @@ {9D7C9060-9263-40EB-8FE3-1E4E3C6D941C} true $(OtherFlags) --warnon:1182 - $(OtherFlags) --stackReserveSize:4096000 --optimize- + $(OtherFlags) --stackReserveSize:4096000 diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs index 84dc9513caf..38d882a28ae 100644 --- a/src/fsharp/QuotationTranslator.fs +++ b/src/fsharp/QuotationTranslator.fs @@ -928,10 +928,12 @@ and ConvDecisionTree cenv env tgs typR x = // Check if this is an provider-generated assembly that will be statically linked and IsILTypeRefStaticLinkLocal cenv m (tr:ILTypeRef) = +#if NO_EXTENSIONTYPING + ignore m; ignore cenv; ignore tr + false +#else let g = cenv.g - ignore m match tr.Scope with -#if !NO_EXTENSIONTYPING | ILScopeRef.Assembly aref when not g.isInteractive && aref.Name <> g.ilg.primaryAssemblyName && // optimization to avoid this check in the common case @@ -944,8 +946,8 @@ and IsILTypeRefStaticLinkLocal cenv m (tr:ILTypeRef) = | ResolvedCcu ccu -> ccu.IsProviderGenerated | UnresolvedCcu _ -> false) -> true -#endif | _ -> false +#endif // Adjust for static linking information, then convert and ConvILTypeRefUnadjusted cenv m (tr:ILTypeRef) = diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index 4c6d20fbf8d..ce2537f3fdb 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -703,10 +703,8 @@ let pickleObjWithDanglingCcus inMem file (g: TcGlobals) scope p x = st2.os.Close(), st2.osB.Close() if phase2bytesB.Length <> 0 then failwith "expected phase2bytesB.Length = 0" - printfn "(pickle) phase1bytesB = %A" phase1bytesB - ignore phase1bytesB - phase2bytes, ([| |] : byte array) + phase2bytes, phase1bytesB let check (ilscope:ILScopeRef) (inMap : NodeInTable<_,_>) = for i = 0 to inMap.Count - 1 do @@ -716,7 +714,6 @@ let check (ilscope:ILScopeRef) (inMap : NodeInTable<_,_>) = // Note for compiler developers: to get information about which item this index relates to, enable the conditional in Pickle.p_osgn_ref to refer to the given index number and recompile an identical copy of the source for the DLL containing the data being unpickled. A message will then be printed indicating the name of the item.\n" let unpickleObjWithDanglingCcus file ilscope (iILModule:ILModuleDef option) u (phase2bytes:byte[]) (phase1bytesB:byte[]) = - printfn "(unpickle) phase1bytesB = %A" phase1bytesB let st2 = { is = ByteStream.FromBytes (phase2bytes,0,phase2bytes.Length) isB = ByteStream.FromBytes ([| |],0,0) @@ -1580,14 +1577,17 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> let _ = fill_u_ty (fun st -> let tag = u_byte st + match tag with | 0 -> let l = u_tys st TType_tuple (tupInfoRef, l) | 1 -> - let sty = u_simpletyp st let tagB = u_byteB st + let sty = u_simpletyp st match tagB with + | 0 -> + sty | 9 -> match sty with | TType_app(tcref, _, _) -> TType_app(tcref, [], KnownWithNull) @@ -1600,37 +1600,35 @@ let _ = fill_u_ty (fun st -> match sty with | TType_app(tcref, _, _) -> TType_app(tcref, [], KnownObliviousToNull) | _ -> ufailwith st "u_ty 9c" - | 0 -> - sty | b -> ufailwith st (sprintf "u_ty - 1/B, byte = %A" b) | 2 -> + let tagB = u_byteB st let tcref = u_tcref st let tinst = u_tys st - let tagB = u_byteB st match tagB with + | 0 -> TType_app (tcref, tinst, KnownObliviousToNull) | 12 -> TType_app (tcref, tinst, KnownWithNull) | 13 -> TType_app (tcref, tinst, KnownWithoutNull) | 14 -> TType_app (tcref, tinst, KnownObliviousToNull) - | 0 -> TType_app (tcref, tinst, KnownObliviousToNull) | _ -> ufailwith st "u_ty - 2/B" | 3 -> + let tagB = u_byteB st let d = u_ty st let r = u_ty st - let tagB = u_byteB st match tagB with + | 0 -> TType_fun (d, r, KnownObliviousToNull) | 15 -> TType_fun (d, r, KnownWithNull) | 16 -> TType_fun (d, r, KnownWithoutNull) | 17 -> TType_fun (d, r, KnownObliviousToNull) - | 0 -> TType_fun (d, r, KnownObliviousToNull) | _ -> ufailwith st "u_ty - 3/B" | 4 -> - let r = u_tpref st let tagB = u_byteB st + let r = u_tpref st match tagB with + | 0 -> r.AsType KnownObliviousToNull | 18 -> r.AsType KnownWithNull | 19 -> r.AsType KnownWithoutNull | 20 -> r.AsType KnownObliviousToNull - | 0 -> r.AsType KnownObliviousToNull | _ -> ufailwith st "u_ty - 4/B" | 5 -> let tps = u_tyar_specs st in let r = u_ty st in TType_forall (tps,r) | 6 -> let unt = u_measure_expr st in TType_measure unt From 6d2ceedd9e6d625f799837b6f3ae2be7541c1f78 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 6 Nov 2018 15:05:41 +0000 Subject: [PATCH 014/137] more careful warnings on inference --- src/fsharp/ConstraintSolver.fs | 24 ++++++++++++++++-------- src/fsharp/TastOps.fs | 1 - src/fsharp/TastOps.fsi | 1 + 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 668bf4d8015..3fe6b5937bb 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -881,20 +881,24 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra | TType_var (tp1, nullness1), TType_var (tp2, nullness2) when PreferUnifyTypar tp1 tp2 -> SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 ++ (fun () -> - SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 + let nullnessAfterSolution1 = combineNullness (nullnessOfTy g sty1) nullness1 + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullnessAfterSolution1 nullness2 ) | TType_var (tp1, nullness1), TType_var (tp2, nullness2) when not csenv.MatchingOnly && PreferUnifyTypar tp2 tp1 -> SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> - SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 + let nullnessAfterSolution2 = combineNullness (nullnessOfTy g sty2) nullness2 + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullnessAfterSolution2 ) | TType_var (tp1, nullness1), _ when (tp1.Rigidity <> TyparRigidity.Rigid) -> SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 ++ (fun () -> - SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 (nullnessOfTy g sty2) + let nullnessAfterSolution1 = combineNullness (nullnessOfTy g sty1) nullness1 + SolveNullnessEquiv csenv m2 trace ty1 ty2 nullnessAfterSolution1 (nullnessOfTy g sty2) ) | _, TType_var (tp2, nullness2) when (tp2.Rigidity <> TyparRigidity.Rigid) && not csenv.MatchingOnly -> SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> - SolveNullnessEquiv csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullness2 + let nullnessAfterSolution2 = combineNullness (nullnessOfTy g sty2) nullness2 + SolveNullnessEquiv csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullnessAfterSolution2 ) // Catch float<_>=float<1>, float32<_>=float32<1> and decimal<_>=decimal<1> @@ -924,7 +928,8 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 ) - | TType_measure ms1 , TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 + | TType_measure ms1 , TType_measure ms2 -> + UnifyMeasures csenv trace ms1 ms2 | TType_forall(tps1, rty1), TType_forall(tps2, rty2) -> if tps1.Length <> tps2.Length then localAbortD else @@ -933,7 +938,8 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra if not (typarsAEquiv g aenv tps1 tps2) then localAbortD else SolveTypeEqualsTypeKeepAbbrevs csenv ndeep m2 trace rty1 rty2 - | TType_ucase (uc1, l1) , TType_ucase (uc2, l2) when g.unionCaseRefEq uc1 uc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 + | TType_ucase (uc1, l1) , TType_ucase (uc2, l2) when g.unionCaseRefEq uc1 uc2 -> + SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 | _ -> localAbortD @@ -995,13 +1001,15 @@ and SolveTypeSubsumesType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalT SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2 | TType_var (r2, nullness2) when not csenv.MatchingOnly -> SolveTyparSubtypeOfType csenv ndeep m2 trace r2 ty1 ++ (fun () -> - SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nullness2 + let nullnessAfterSolution2 = combineNullness (nullnessOfTy g sty2) nullness2 + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nullnessAfterSolution2 ) | _ -> SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln ty1 ty2 | _, TType_var (r2, nullness2) when not csenv.MatchingOnly -> SolveTyparSubtypeOfType csenv ndeep m2 trace r2 ty1 ++ (fun () -> - SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullness2 + let nullnessAfterSolution2 = combineNullness (nullnessOfTy g sty2) nullness2 + SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullnessAfterSolution2 ) | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index 3f3b82b2467..e4753cd8e75 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -170,7 +170,6 @@ let combineNullness (nullnessOrig: Nullness) (nullnessNew: Nullness) = | NullnessInfo.ObliviousToNull -> nullnessNew | NullnessInfo.WithNull -> nullnessNew - let tryAddNullnessToTy nullnessNew (ty:TType) = let ty = stripTyparEqns ty match ty with diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index dd10e9c5622..dffd1c814d3 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -76,6 +76,7 @@ val stripExpr : Expr -> Expr val valsOfBinds : Bindings -> Vals val (|ExprValWithPossibleTypeInst|_|) : Expr -> (ValRef * ValUseFlag * TType list * range) option +val combineNullness: Nullness -> Nullness -> Nullness /// Ensure that a type admits nullness val tryAddNullnessToTy: Nullness -> TType -> TType option val addNullnessToTy: Nullness -> TType -> TType From 4cdc05f577b9d362edb7d6e6b737192a5e715bd7 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 6 Nov 2018 19:45:47 +0000 Subject: [PATCH 015/137] not null constraints, tests --- .../FSharp.Compiler.Private/FSComp.fs | 2236 +++++++++-------- .../FSharp.Compiler.Private/FSComp.resx | 6 + src/fsharp/CompileOps.fs | 11 + src/fsharp/ConstraintSolver.fs | 123 +- src/fsharp/ConstraintSolver.fsi | 5 +- src/fsharp/FSComp.txt | 5 +- src/fsharp/FSStrings.resx | 3 + src/fsharp/FSharp.Core/async.fs | 2 +- src/fsharp/FSharp.Core/mailbox.fs | 2 +- src/fsharp/FSharp.Core/prim-types.fs | 16 +- src/fsharp/FSharp.Core/prim-types.fsi | 14 +- src/fsharp/NicePrint.fs | 2 + src/fsharp/PostInferenceChecks.fs | 1 + src/fsharp/TastOps.fs | 45 +- src/fsharp/TastOps.fsi | 9 +- src/fsharp/TastPickle.fs | 2 + src/fsharp/TcGlobals.fs | 2 - src/fsharp/TypeChecker.fs | 17 +- src/fsharp/TypeRelations.fs | 4 +- src/fsharp/ast.fs | 2 + src/fsharp/infos.fs | 3 + src/fsharp/pars.fsy | 4 + src/fsharp/service/ServiceAssemblyContent.fs | 25 +- src/fsharp/service/ServiceUntypedParse.fs | 1 + src/fsharp/symbols/Symbols.fs | 5 + src/fsharp/tast.fs | 75 +- src/fsharp/xlf/FSComp.txt.cs.xlf | 10 + src/fsharp/xlf/FSComp.txt.de.xlf | 10 + src/fsharp/xlf/FSComp.txt.en.xlf | 10 + src/fsharp/xlf/FSComp.txt.es.xlf | 10 + src/fsharp/xlf/FSComp.txt.fr.xlf | 10 + src/fsharp/xlf/FSComp.txt.it.xlf | 10 + src/fsharp/xlf/FSComp.txt.ja.xlf | 10 + src/fsharp/xlf/FSComp.txt.ko.xlf | 10 + src/fsharp/xlf/FSComp.txt.pl.xlf | 10 + src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 10 + src/fsharp/xlf/FSComp.txt.ru.xlf | 10 + src/fsharp/xlf/FSComp.txt.tr.xlf | 10 + src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 10 + src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 10 + src/fsharp/xlf/FSStrings.cs.xlf | 5 + src/fsharp/xlf/FSStrings.de.xlf | 5 + src/fsharp/xlf/FSStrings.en.xlf | 5 + src/fsharp/xlf/FSStrings.es.xlf | 5 + src/fsharp/xlf/FSStrings.fr.xlf | 5 + src/fsharp/xlf/FSStrings.it.xlf | 5 + src/fsharp/xlf/FSStrings.ja.xlf | 5 + src/fsharp/xlf/FSStrings.ko.xlf | 5 + src/fsharp/xlf/FSStrings.pl.xlf | 5 + src/fsharp/xlf/FSStrings.pt-BR.xlf | 5 + src/fsharp/xlf/FSStrings.ru.xlf | 5 + src/fsharp/xlf/FSStrings.tr.xlf | 5 + src/fsharp/xlf/FSStrings.zh-Hans.xlf | 5 + src/fsharp/xlf/FSStrings.zh-Hant.xlf | 5 + tests/fsharp/core/nullness/test.fsx | 192 ++ 55 files changed, 1805 insertions(+), 1217 deletions(-) create mode 100644 tests/fsharp/core/nullness/test.fsx diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index 255f1273417..41cccda657c 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -1039,3345 +1039,3351 @@ type internal SR private() = /// The type '%s' does not have 'null' as a proper value /// (Originally from ..\FSComp.txt:312) static member csTypeDoesNotHaveNull(a0 : System.String) = (GetStringFunc("csTypeDoesNotHaveNull",",,,%s,,,") a0) - /// The type '%s' does not have 'null' as a proper value. To create a null value for a Nullable type use 'System.Nullable()'. + /// The type '%s' has 'null' as a true representation value but a constraint does not permit this /// (Originally from ..\FSComp.txt:313) + static member csTypeHasNullAsTrueValue(a0 : System.String) = (GetStringFunc("csTypeHasNullAsTrueValue",",,,%s,,,") a0) + /// The type '%s' has 'null' as an extra value but a constraint does not permit this + /// (Originally from ..\FSComp.txt:314) + static member csTypeHasNullAsExtraValue(a0 : System.String) = (GetStringFunc("csTypeHasNullAsExtraValue",",,,%s,,,") a0) + /// The type '%s' does not have 'null' as a proper value. To create a null value for a Nullable type use 'System.Nullable()'. + /// (Originally from ..\FSComp.txt:315) static member csNullableTypeDoesNotHaveNull(a0 : System.String) = (GetStringFunc("csNullableTypeDoesNotHaveNull",",,,%s,,,") a0) /// The type '%s' does not support the 'comparison' constraint because it has the 'NoComparison' attribute - /// (Originally from ..\FSComp.txt:314) + /// (Originally from ..\FSComp.txt:316) static member csTypeDoesNotSupportComparison1(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportComparison1",",,,%s,,,") a0) /// The type '%s' does not support the 'comparison' constraint. For example, it does not support the 'System.IComparable' interface - /// (Originally from ..\FSComp.txt:315) + /// (Originally from ..\FSComp.txt:317) static member csTypeDoesNotSupportComparison2(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportComparison2",",,,%s,,,") a0) /// The type '%s' does not support the 'comparison' constraint because it is a record, union or struct with one or more structural element types which do not support the 'comparison' constraint. Either avoid the use of comparison with this type, or add the 'StructuralComparison' attribute to the type to determine which field type does not support comparison - /// (Originally from ..\FSComp.txt:316) + /// (Originally from ..\FSComp.txt:318) static member csTypeDoesNotSupportComparison3(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportComparison3",",,,%s,,,") a0) /// The type '%s' does not support the 'equality' constraint because it has the 'NoEquality' attribute - /// (Originally from ..\FSComp.txt:317) + /// (Originally from ..\FSComp.txt:319) static member csTypeDoesNotSupportEquality1(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportEquality1",",,,%s,,,") a0) /// The type '%s' does not support the 'equality' constraint because it is a function type - /// (Originally from ..\FSComp.txt:318) + /// (Originally from ..\FSComp.txt:320) static member csTypeDoesNotSupportEquality2(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportEquality2",",,,%s,,,") a0) /// The type '%s' does not support the 'equality' constraint because it is a record, union or struct with one or more structural element types which do not support the 'equality' constraint. Either avoid the use of equality with this type, or add the 'StructuralEquality' attribute to the type to determine which field type does not support equality - /// (Originally from ..\FSComp.txt:319) + /// (Originally from ..\FSComp.txt:321) static member csTypeDoesNotSupportEquality3(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportEquality3",",,,%s,,,") a0) /// The type '%s' is not a CLI enum type - /// (Originally from ..\FSComp.txt:320) + /// (Originally from ..\FSComp.txt:322) static member csTypeIsNotEnumType(a0 : System.String) = (GetStringFunc("csTypeIsNotEnumType",",,,%s,,,") a0) /// The type '%s' has a non-standard delegate type - /// (Originally from ..\FSComp.txt:321) + /// (Originally from ..\FSComp.txt:323) static member csTypeHasNonStandardDelegateType(a0 : System.String) = (GetStringFunc("csTypeHasNonStandardDelegateType",",,,%s,,,") a0) /// The type '%s' is not a CLI delegate type - /// (Originally from ..\FSComp.txt:322) + /// (Originally from ..\FSComp.txt:324) static member csTypeIsNotDelegateType(a0 : System.String) = (GetStringFunc("csTypeIsNotDelegateType",",,,%s,,,") a0) /// This type parameter cannot be instantiated to 'Nullable'. This is a restriction imposed in order to ensure the meaning of 'null' in some CLI languages is not confusing when used in conjunction with 'Nullable' values. - /// (Originally from ..\FSComp.txt:323) + /// (Originally from ..\FSComp.txt:325) static member csTypeParameterCannotBeNullable() = (GetStringFunc("csTypeParameterCannotBeNullable",",,,") ) /// A generic construct requires that the type '%s' is a CLI or F# struct type - /// (Originally from ..\FSComp.txt:324) + /// (Originally from ..\FSComp.txt:326) static member csGenericConstructRequiresStructType(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresStructType",",,,%s,,,") a0) /// A generic construct requires that the type '%s' is an unmanaged type - /// (Originally from ..\FSComp.txt:325) + /// (Originally from ..\FSComp.txt:327) static member csGenericConstructRequiresUnmanagedType(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresUnmanagedType",",,,%s,,,") a0) /// The type '%s' is not compatible with any of the types %s, arising from the use of a printf-style format string - /// (Originally from ..\FSComp.txt:326) + /// (Originally from ..\FSComp.txt:328) static member csTypeNotCompatibleBecauseOfPrintf(a0 : System.String, a1 : System.String) = (GetStringFunc("csTypeNotCompatibleBecauseOfPrintf",",,,%s,,,%s,,,") a0 a1) /// A generic construct requires that the type '%s' have reference semantics, but it does not, i.e. it is a struct - /// (Originally from ..\FSComp.txt:327) + /// (Originally from ..\FSComp.txt:329) static member csGenericConstructRequiresReferenceSemantics(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresReferenceSemantics",",,,%s,,,") a0) /// A generic construct requires that the type '%s' be non-abstract - /// (Originally from ..\FSComp.txt:328) + /// (Originally from ..\FSComp.txt:330) static member csGenericConstructRequiresNonAbstract(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresNonAbstract",",,,%s,,,") a0) /// A generic construct requires that the type '%s' have a public default constructor - /// (Originally from ..\FSComp.txt:329) + /// (Originally from ..\FSComp.txt:331) static member csGenericConstructRequiresPublicDefaultConstructor(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresPublicDefaultConstructor",",,,%s,,,") a0) /// Type instantiation length mismatch - /// (Originally from ..\FSComp.txt:330) + /// (Originally from ..\FSComp.txt:332) static member csTypeInstantiationLengthMismatch() = (483, GetStringFunc("csTypeInstantiationLengthMismatch",",,,") ) /// Optional arguments not permitted here - /// (Originally from ..\FSComp.txt:331) + /// (Originally from ..\FSComp.txt:333) static member csOptionalArgumentNotPermittedHere() = (484, GetStringFunc("csOptionalArgumentNotPermittedHere",",,,") ) /// %s is not a static member - /// (Originally from ..\FSComp.txt:332) + /// (Originally from ..\FSComp.txt:334) static member csMemberIsNotStatic(a0 : System.String) = (485, GetStringFunc("csMemberIsNotStatic",",,,%s,,,") a0) /// %s is not an instance member - /// (Originally from ..\FSComp.txt:333) + /// (Originally from ..\FSComp.txt:335) static member csMemberIsNotInstance(a0 : System.String) = (486, GetStringFunc("csMemberIsNotInstance",",,,%s,,,") a0) /// Argument length mismatch - /// (Originally from ..\FSComp.txt:334) + /// (Originally from ..\FSComp.txt:336) static member csArgumentLengthMismatch() = (487, GetStringFunc("csArgumentLengthMismatch",",,,") ) /// The argument types don't match - /// (Originally from ..\FSComp.txt:335) + /// (Originally from ..\FSComp.txt:337) static member csArgumentTypesDoNotMatch() = (488, GetStringFunc("csArgumentTypesDoNotMatch",",,,") ) /// This method expects a CLI 'params' parameter in this position. 'params' is a way of passing a variable number of arguments to a method in languages such as C#. Consider passing an array for this argument - /// (Originally from ..\FSComp.txt:336) + /// (Originally from ..\FSComp.txt:338) static member csMethodExpectsParams() = (489, GetStringFunc("csMethodExpectsParams",",,,") ) /// The member or object constructor '%s' is not %s - /// (Originally from ..\FSComp.txt:337) + /// (Originally from ..\FSComp.txt:339) static member csMemberIsNotAccessible(a0 : System.String, a1 : System.String) = (490, GetStringFunc("csMemberIsNotAccessible",",,,%s,,,%s,,,") a0 a1) /// The member or object constructor '%s' is not %s. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions. - /// (Originally from ..\FSComp.txt:338) + /// (Originally from ..\FSComp.txt:340) static member csMemberIsNotAccessible2(a0 : System.String, a1 : System.String) = (491, GetStringFunc("csMemberIsNotAccessible2",",,,%s,,,%s,,,") a0 a1) /// %s is not a static method - /// (Originally from ..\FSComp.txt:339) + /// (Originally from ..\FSComp.txt:341) static member csMethodIsNotAStaticMethod(a0 : System.String) = (492, GetStringFunc("csMethodIsNotAStaticMethod",",,,%s,,,") a0) /// %s is not an instance method - /// (Originally from ..\FSComp.txt:340) + /// (Originally from ..\FSComp.txt:342) static member csMethodIsNotAnInstanceMethod(a0 : System.String) = (493, GetStringFunc("csMethodIsNotAnInstanceMethod",",,,%s,,,") a0) /// The member or object constructor '%s' has no argument or settable return property '%s'. %s. - /// (Originally from ..\FSComp.txt:341) + /// (Originally from ..\FSComp.txt:343) static member csMemberHasNoArgumentOrReturnProperty(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("csMemberHasNoArgumentOrReturnProperty",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The object constructor '%s' has no argument or settable return property '%s'. %s. - /// (Originally from ..\FSComp.txt:342) + /// (Originally from ..\FSComp.txt:344) static member csCtorHasNoArgumentOrReturnProperty(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("csCtorHasNoArgumentOrReturnProperty",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The required signature is %s - /// (Originally from ..\FSComp.txt:343) + /// (Originally from ..\FSComp.txt:345) static member csRequiredSignatureIs(a0 : System.String) = (495, GetStringFunc("csRequiredSignatureIs",",,,%s,,,") a0) /// The member or object constructor '%s' requires %d argument(s). The required signature is '%s'. - /// (Originally from ..\FSComp.txt:344) + /// (Originally from ..\FSComp.txt:346) static member csMemberSignatureMismatch(a0 : System.String, a1 : System.Int32, a2 : System.String) = (496, GetStringFunc("csMemberSignatureMismatch",",,,%s,,,%d,,,%s,,,") a0 a1 a2) /// The member or object constructor '%s' requires %d additional argument(s). The required signature is '%s'. - /// (Originally from ..\FSComp.txt:345) + /// (Originally from ..\FSComp.txt:347) static member csMemberSignatureMismatch2(a0 : System.String, a1 : System.Int32, a2 : System.String) = (497, GetStringFunc("csMemberSignatureMismatch2",",,,%s,,,%d,,,%s,,,") a0 a1 a2) /// The member or object constructor '%s' requires %d argument(s). The required signature is '%s'. Some names for missing arguments are %s. - /// (Originally from ..\FSComp.txt:346) + /// (Originally from ..\FSComp.txt:348) static member csMemberSignatureMismatch3(a0 : System.String, a1 : System.Int32, a2 : System.String, a3 : System.String) = (498, GetStringFunc("csMemberSignatureMismatch3",",,,%s,,,%d,,,%s,,,%s,,,") a0 a1 a2 a3) /// The member or object constructor '%s' requires %d additional argument(s). The required signature is '%s'. Some names for missing arguments are %s. - /// (Originally from ..\FSComp.txt:347) + /// (Originally from ..\FSComp.txt:349) static member csMemberSignatureMismatch4(a0 : System.String, a1 : System.Int32, a2 : System.String, a3 : System.String) = (499, GetStringFunc("csMemberSignatureMismatch4",",,,%s,,,%d,,,%s,,,%s,,,") a0 a1 a2 a3) /// The member or object constructor '%s' requires %d argument(s) but is here given %d unnamed and %d named argument(s). The required signature is '%s'. - /// (Originally from ..\FSComp.txt:348) + /// (Originally from ..\FSComp.txt:350) static member csMemberSignatureMismatchArityNamed(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.Int32, a4 : System.String) = (500, GetStringFunc("csMemberSignatureMismatchArityNamed",",,,%s,,,%d,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3 a4) /// The member or object constructor '%s' takes %d argument(s) but is here given %d. The required signature is '%s'. - /// (Originally from ..\FSComp.txt:349) + /// (Originally from ..\FSComp.txt:351) static member csMemberSignatureMismatchArity(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String) = (501, GetStringFunc("csMemberSignatureMismatchArity",",,,%s,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3) /// The object constructor '%s' takes %d argument(s) but is here given %d. The required signature is '%s'. - /// (Originally from ..\FSComp.txt:350) + /// (Originally from ..\FSComp.txt:352) static member csCtorSignatureMismatchArity(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String) = (501, GetStringFunc("csCtorSignatureMismatchArity",",,,%s,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3) /// The object constructor '%s' takes %d argument(s) but is here given %d. The required signature is '%s'. If some of the arguments are meant to assign values to properties, consider separating those arguments with a comma (','). - /// (Originally from ..\FSComp.txt:351) + /// (Originally from ..\FSComp.txt:353) static member csCtorSignatureMismatchArityProp(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String) = (501, GetStringFunc("csCtorSignatureMismatchArityProp",",,,%s,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3) /// The member or object constructor '%s' takes %d type argument(s) but is here given %d. The required signature is '%s'. - /// (Originally from ..\FSComp.txt:352) + /// (Originally from ..\FSComp.txt:354) static member csMemberSignatureMismatchArityType(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String) = (502, GetStringFunc("csMemberSignatureMismatchArityType",",,,%s,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3) /// A member or object constructor '%s' taking %d arguments is not accessible from this code location. All accessible versions of method '%s' take %d arguments. - /// (Originally from ..\FSComp.txt:353) + /// (Originally from ..\FSComp.txt:355) static member csMemberNotAccessible(a0 : System.String, a1 : System.Int32, a2 : System.String, a3 : System.Int32) = (503, GetStringFunc("csMemberNotAccessible",",,,%s,,,%d,,,%s,,,%d,,,") a0 a1 a2 a3) /// Incorrect generic instantiation. No %s member named '%s' takes %d generic arguments. - /// (Originally from ..\FSComp.txt:354) + /// (Originally from ..\FSComp.txt:356) static member csIncorrectGenericInstantiation(a0 : System.String, a1 : System.String, a2 : System.Int32) = (504, GetStringFunc("csIncorrectGenericInstantiation",",,,%s,,,%s,,,%d,,,") a0 a1 a2) /// The member or object constructor '%s' does not take %d argument(s). An overload was found taking %d arguments. - /// (Originally from ..\FSComp.txt:355) + /// (Originally from ..\FSComp.txt:357) static member csMemberOverloadArityMismatch(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (505, GetStringFunc("csMemberOverloadArityMismatch",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// No %s member or object constructor named '%s' takes %d arguments - /// (Originally from ..\FSComp.txt:356) + /// (Originally from ..\FSComp.txt:358) static member csNoMemberTakesTheseArguments(a0 : System.String, a1 : System.String, a2 : System.Int32) = (506, GetStringFunc("csNoMemberTakesTheseArguments",",,,%s,,,%s,,,%d,,,") a0 a1 a2) /// No %s member or object constructor named '%s' takes %d arguments. Note the call to this member also provides %d named arguments. - /// (Originally from ..\FSComp.txt:357) + /// (Originally from ..\FSComp.txt:359) static member csNoMemberTakesTheseArguments2(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.Int32) = (507, GetStringFunc("csNoMemberTakesTheseArguments2",",,,%s,,,%s,,,%d,,,%d,,,") a0 a1 a2 a3) /// No %s member or object constructor named '%s' takes %d arguments. The named argument '%s' doesn't correspond to any argument or settable return property for any overload. - /// (Originally from ..\FSComp.txt:358) + /// (Originally from ..\FSComp.txt:360) static member csNoMemberTakesTheseArguments3(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.String) = (508, GetStringFunc("csNoMemberTakesTheseArguments3",",,,%s,,,%s,,,%d,,,%s,,,") a0 a1 a2 a3) /// Method or object constructor '%s' not found - /// (Originally from ..\FSComp.txt:359) + /// (Originally from ..\FSComp.txt:361) static member csMethodNotFound(a0 : System.String) = (509, GetStringFunc("csMethodNotFound",",,,%s,,,") a0) /// No overloads match for method '%s'. - /// (Originally from ..\FSComp.txt:360) + /// (Originally from ..\FSComp.txt:362) static member csNoOverloadsFound(a0 : System.String) = (GetStringFunc("csNoOverloadsFound",",,,%s,,,") a0) /// A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed. - /// (Originally from ..\FSComp.txt:361) + /// (Originally from ..\FSComp.txt:363) static member csMethodIsOverloaded(a0 : System.String) = (GetStringFunc("csMethodIsOverloaded",",,,%s,,,") a0) /// Candidates: %s - /// (Originally from ..\FSComp.txt:362) + /// (Originally from ..\FSComp.txt:364) static member csCandidates(a0 : System.String) = (GetStringFunc("csCandidates",",,,%s,,,") a0) /// The available overloads are shown below. - /// (Originally from ..\FSComp.txt:363) + /// (Originally from ..\FSComp.txt:365) static member csSeeAvailableOverloads() = (GetStringFunc("csSeeAvailableOverloads",",,,") ) /// Accessibility modifiers are not permitted on 'do' bindings, but '%s' was given. - /// (Originally from ..\FSComp.txt:364) + /// (Originally from ..\FSComp.txt:366) static member parsDoCannotHaveVisibilityDeclarations(a0 : System.String) = (512, GetStringFunc("parsDoCannotHaveVisibilityDeclarations",",,,%s,,,") a0) /// End of file in #if section begun at or after here - /// (Originally from ..\FSComp.txt:365) + /// (Originally from ..\FSComp.txt:367) static member parsEofInHashIf() = (513, GetStringFunc("parsEofInHashIf",",,,") ) /// End of file in string begun at or before here - /// (Originally from ..\FSComp.txt:366) + /// (Originally from ..\FSComp.txt:368) static member parsEofInString() = (514, GetStringFunc("parsEofInString",",,,") ) /// End of file in verbatim string begun at or before here - /// (Originally from ..\FSComp.txt:367) + /// (Originally from ..\FSComp.txt:369) static member parsEofInVerbatimString() = (515, GetStringFunc("parsEofInVerbatimString",",,,") ) /// End of file in comment begun at or before here - /// (Originally from ..\FSComp.txt:368) + /// (Originally from ..\FSComp.txt:370) static member parsEofInComment() = (516, GetStringFunc("parsEofInComment",",,,") ) /// End of file in string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:369) + /// (Originally from ..\FSComp.txt:371) static member parsEofInStringInComment() = (517, GetStringFunc("parsEofInStringInComment",",,,") ) /// End of file in verbatim string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:370) + /// (Originally from ..\FSComp.txt:372) static member parsEofInVerbatimStringInComment() = (518, GetStringFunc("parsEofInVerbatimStringInComment",",,,") ) /// End of file in IF-OCAML section begun at or before here - /// (Originally from ..\FSComp.txt:371) + /// (Originally from ..\FSComp.txt:373) static member parsEofInIfOcaml() = (519, GetStringFunc("parsEofInIfOcaml",",,,") ) /// End of file in directive begun at or before here - /// (Originally from ..\FSComp.txt:372) + /// (Originally from ..\FSComp.txt:374) static member parsEofInDirective() = (520, GetStringFunc("parsEofInDirective",",,,") ) /// No #endif found for #if or #else - /// (Originally from ..\FSComp.txt:373) + /// (Originally from ..\FSComp.txt:375) static member parsNoHashEndIfFound() = (521, GetStringFunc("parsNoHashEndIfFound",",,,") ) /// Attributes have been ignored in this construct - /// (Originally from ..\FSComp.txt:374) + /// (Originally from ..\FSComp.txt:376) static member parsAttributesIgnored() = (522, GetStringFunc("parsAttributesIgnored",",,,") ) /// 'use' bindings are not permitted in primary constructors - /// (Originally from ..\FSComp.txt:375) + /// (Originally from ..\FSComp.txt:377) static member parsUseBindingsIllegalInImplicitClassConstructors() = (523, GetStringFunc("parsUseBindingsIllegalInImplicitClassConstructors",",,,") ) /// 'use' bindings are not permitted in modules and are treated as 'let' bindings - /// (Originally from ..\FSComp.txt:376) + /// (Originally from ..\FSComp.txt:378) static member parsUseBindingsIllegalInModules() = (524, GetStringFunc("parsUseBindingsIllegalInModules",",,,") ) /// An integer for loop must use a simple identifier - /// (Originally from ..\FSComp.txt:377) + /// (Originally from ..\FSComp.txt:379) static member parsIntegerForLoopRequiresSimpleIdentifier() = (525, GetStringFunc("parsIntegerForLoopRequiresSimpleIdentifier",",,,") ) /// At most one 'with' augmentation is permitted - /// (Originally from ..\FSComp.txt:378) + /// (Originally from ..\FSComp.txt:380) static member parsOnlyOneWithAugmentationAllowed() = (526, GetStringFunc("parsOnlyOneWithAugmentationAllowed",",,,") ) /// A semicolon is not expected at this point - /// (Originally from ..\FSComp.txt:379) + /// (Originally from ..\FSComp.txt:381) static member parsUnexpectedSemicolon() = (527, GetStringFunc("parsUnexpectedSemicolon",",,,") ) /// Unexpected end of input - /// (Originally from ..\FSComp.txt:380) + /// (Originally from ..\FSComp.txt:382) static member parsUnexpectedEndOfFile() = (528, GetStringFunc("parsUnexpectedEndOfFile",",,,") ) /// Accessibility modifiers are not permitted here, but '%s' was given. - /// (Originally from ..\FSComp.txt:381) + /// (Originally from ..\FSComp.txt:383) static member parsUnexpectedVisibilityDeclaration(a0 : System.String) = (529, GetStringFunc("parsUnexpectedVisibilityDeclaration",",,,%s,,,") a0) /// Only '#' compiler directives may occur prior to the first 'namespace' declaration - /// (Originally from ..\FSComp.txt:382) + /// (Originally from ..\FSComp.txt:384) static member parsOnlyHashDirectivesAllowed() = (530, GetStringFunc("parsOnlyHashDirectivesAllowed",",,,") ) /// Accessibility modifiers should come immediately prior to the identifier naming a construct - /// (Originally from ..\FSComp.txt:383) + /// (Originally from ..\FSComp.txt:385) static member parsVisibilityDeclarationsShouldComePriorToIdentifier() = (531, GetStringFunc("parsVisibilityDeclarationsShouldComePriorToIdentifier",",,,") ) /// Files should begin with either a namespace or module declaration, e.g. 'namespace SomeNamespace.SubNamespace' or 'module SomeNamespace.SomeModule', but not both. To define a module within a namespace use 'module SomeModule = ...' - /// (Originally from ..\FSComp.txt:384) + /// (Originally from ..\FSComp.txt:386) static member parsNamespaceOrModuleNotBoth() = (532, GetStringFunc("parsNamespaceOrModuleNotBoth",",,,") ) /// A module abbreviation must be a simple name, not a path - /// (Originally from ..\FSComp.txt:385) + /// (Originally from ..\FSComp.txt:387) static member parsModuleAbbreviationMustBeSimpleName() = (534, GetStringFunc("parsModuleAbbreviationMustBeSimpleName",",,,") ) /// Ignoring attributes on module abbreviation - /// (Originally from ..\FSComp.txt:386) + /// (Originally from ..\FSComp.txt:388) static member parsIgnoreAttributesOnModuleAbbreviation() = (535, GetStringFunc("parsIgnoreAttributesOnModuleAbbreviation",",,,") ) /// The '%s' accessibility attribute is not allowed on module abbreviation. Module abbreviations are always private. - /// (Originally from ..\FSComp.txt:387) + /// (Originally from ..\FSComp.txt:389) static member parsIgnoreAttributesOnModuleAbbreviationAlwaysPrivate(a0 : System.String) = (536, GetStringFunc("parsIgnoreAttributesOnModuleAbbreviationAlwaysPrivate",",,,%s,,,") a0) /// The '%s' visibility attribute is not allowed on module abbreviation. Module abbreviations are always private. - /// (Originally from ..\FSComp.txt:388) + /// (Originally from ..\FSComp.txt:390) static member parsIgnoreVisibilityOnModuleAbbreviationAlwaysPrivate(a0 : System.String) = (537, GetStringFunc("parsIgnoreVisibilityOnModuleAbbreviationAlwaysPrivate",",,,%s,,,") a0) /// Unclosed block - /// (Originally from ..\FSComp.txt:389) + /// (Originally from ..\FSComp.txt:391) static member parsUnClosedBlockInHashLight() = (538, GetStringFunc("parsUnClosedBlockInHashLight",",,,") ) /// Unmatched 'begin' or 'struct' - /// (Originally from ..\FSComp.txt:390) + /// (Originally from ..\FSComp.txt:392) static member parsUnmatchedBeginOrStruct() = (539, GetStringFunc("parsUnmatchedBeginOrStruct",",,,") ) /// A module name must be a simple name, not a path - /// (Originally from ..\FSComp.txt:391) + /// (Originally from ..\FSComp.txt:393) static member parsModuleDefnMustBeSimpleName() = (541, GetStringFunc("parsModuleDefnMustBeSimpleName",",,,") ) /// Unexpected empty type moduleDefn list - /// (Originally from ..\FSComp.txt:392) + /// (Originally from ..\FSComp.txt:394) static member parsUnexpectedEmptyModuleDefn() = (542, GetStringFunc("parsUnexpectedEmptyModuleDefn",",,,") ) /// Attributes should be placed before 'val' - /// (Originally from ..\FSComp.txt:393) + /// (Originally from ..\FSComp.txt:395) static member parsAttributesMustComeBeforeVal() = (GetStringFunc("parsAttributesMustComeBeforeVal",",,,") ) /// Attributes are not permitted on interface implementations - /// (Originally from ..\FSComp.txt:394) + /// (Originally from ..\FSComp.txt:396) static member parsAttributesAreNotPermittedOnInterfaceImplementations() = (543, GetStringFunc("parsAttributesAreNotPermittedOnInterfaceImplementations",",,,") ) /// Syntax error - /// (Originally from ..\FSComp.txt:395) + /// (Originally from ..\FSComp.txt:397) static member parsSyntaxError() = (544, GetStringFunc("parsSyntaxError",",,,") ) /// Augmentations are not permitted on delegate type moduleDefns - /// (Originally from ..\FSComp.txt:396) + /// (Originally from ..\FSComp.txt:398) static member parsAugmentationsIllegalOnDelegateType() = (545, GetStringFunc("parsAugmentationsIllegalOnDelegateType",",,,") ) /// Unmatched 'class', 'interface' or 'struct' - /// (Originally from ..\FSComp.txt:397) + /// (Originally from ..\FSComp.txt:399) static member parsUnmatchedClassInterfaceOrStruct() = (546, GetStringFunc("parsUnmatchedClassInterfaceOrStruct",",,,") ) /// A type definition requires one or more members or other declarations. If you intend to define an empty class, struct or interface, then use 'type ... = class end', 'interface end' or 'struct end'. - /// (Originally from ..\FSComp.txt:398) + /// (Originally from ..\FSComp.txt:400) static member parsEmptyTypeDefinition() = (547, GetStringFunc("parsEmptyTypeDefinition",",,,") ) /// Unmatched 'with' or badly formatted 'with' block - /// (Originally from ..\FSComp.txt:399) + /// (Originally from ..\FSComp.txt:401) static member parsUnmatchedWith() = (550, GetStringFunc("parsUnmatchedWith",",,,") ) /// 'get', 'set' or 'get,set' required - /// (Originally from ..\FSComp.txt:400) + /// (Originally from ..\FSComp.txt:402) static member parsGetOrSetRequired() = (551, GetStringFunc("parsGetOrSetRequired",",,,") ) /// Only class types may take value arguments - /// (Originally from ..\FSComp.txt:401) + /// (Originally from ..\FSComp.txt:403) static member parsOnlyClassCanTakeValueArguments() = (552, GetStringFunc("parsOnlyClassCanTakeValueArguments",",,,") ) /// Unmatched 'begin' - /// (Originally from ..\FSComp.txt:402) + /// (Originally from ..\FSComp.txt:404) static member parsUnmatchedBegin() = (553, GetStringFunc("parsUnmatchedBegin",",,,") ) /// Invalid declaration syntax - /// (Originally from ..\FSComp.txt:403) + /// (Originally from ..\FSComp.txt:405) static member parsInvalidDeclarationSyntax() = (554, GetStringFunc("parsInvalidDeclarationSyntax",",,,") ) /// 'get' and/or 'set' required - /// (Originally from ..\FSComp.txt:404) + /// (Originally from ..\FSComp.txt:406) static member parsGetAndOrSetRequired() = (555, GetStringFunc("parsGetAndOrSetRequired",",,,") ) /// Type annotations on property getters and setters must be given after the 'get()' or 'set(v)', e.g. 'with get() : string = ...' - /// (Originally from ..\FSComp.txt:405) + /// (Originally from ..\FSComp.txt:407) static member parsTypeAnnotationsOnGetSet() = (556, GetStringFunc("parsTypeAnnotationsOnGetSet",",,,") ) /// A getter property is expected to be a function, e.g. 'get() = ...' or 'get(index) = ...' - /// (Originally from ..\FSComp.txt:406) + /// (Originally from ..\FSComp.txt:408) static member parsGetterMustHaveAtLeastOneArgument() = (557, GetStringFunc("parsGetterMustHaveAtLeastOneArgument",",,,") ) /// Multiple accessibilities given for property getter or setter - /// (Originally from ..\FSComp.txt:407) + /// (Originally from ..\FSComp.txt:409) static member parsMultipleAccessibilitiesForGetSet() = (558, GetStringFunc("parsMultipleAccessibilitiesForGetSet",",,,") ) /// Property setters must be defined using 'set value = ', 'set idx value = ' or 'set (idx1,...,idxN) value = ... ' - /// (Originally from ..\FSComp.txt:408) + /// (Originally from ..\FSComp.txt:410) static member parsSetSyntax() = (559, GetStringFunc("parsSetSyntax",",,,") ) /// Interfaces always have the same visibility as the enclosing type - /// (Originally from ..\FSComp.txt:409) + /// (Originally from ..\FSComp.txt:411) static member parsInterfacesHaveSameVisibilityAsEnclosingType() = (560, GetStringFunc("parsInterfacesHaveSameVisibilityAsEnclosingType",",,,") ) /// Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type. - /// (Originally from ..\FSComp.txt:410) + /// (Originally from ..\FSComp.txt:412) static member parsAccessibilityModsIllegalForAbstract() = (561, GetStringFunc("parsAccessibilityModsIllegalForAbstract",",,,") ) /// Attributes are not permitted on 'inherit' declarations - /// (Originally from ..\FSComp.txt:411) + /// (Originally from ..\FSComp.txt:413) static member parsAttributesIllegalOnInherit() = (562, GetStringFunc("parsAttributesIllegalOnInherit",",,,") ) /// Accessibility modifiers are not permitted on an 'inherits' declaration - /// (Originally from ..\FSComp.txt:412) + /// (Originally from ..\FSComp.txt:414) static member parsVisibilityIllegalOnInherit() = (563, GetStringFunc("parsVisibilityIllegalOnInherit",",,,") ) /// 'inherit' declarations cannot have 'as' bindings. To access members of the base class when overriding a method, the syntax 'base.SomeMember' may be used; 'base' is a keyword. Remove this 'as' binding. - /// (Originally from ..\FSComp.txt:413) + /// (Originally from ..\FSComp.txt:415) static member parsInheritDeclarationsCannotHaveAsBindings() = (564, GetStringFunc("parsInheritDeclarationsCannotHaveAsBindings",",,,") ) /// Attributes are not allowed here - /// (Originally from ..\FSComp.txt:414) + /// (Originally from ..\FSComp.txt:416) static member parsAttributesIllegalHere() = (565, GetStringFunc("parsAttributesIllegalHere",",,,") ) /// Accessibility modifiers are not permitted in this position for type abbreviations - /// (Originally from ..\FSComp.txt:415) + /// (Originally from ..\FSComp.txt:417) static member parsTypeAbbreviationsCannotHaveVisibilityDeclarations() = (566, GetStringFunc("parsTypeAbbreviationsCannotHaveVisibilityDeclarations",",,,") ) /// Accessibility modifiers are not permitted in this position for enum types - /// (Originally from ..\FSComp.txt:416) + /// (Originally from ..\FSComp.txt:418) static member parsEnumTypesCannotHaveVisibilityDeclarations() = (567, GetStringFunc("parsEnumTypesCannotHaveVisibilityDeclarations",",,,") ) /// All enum fields must be given values - /// (Originally from ..\FSComp.txt:417) + /// (Originally from ..\FSComp.txt:419) static member parsAllEnumFieldsRequireValues() = (568, GetStringFunc("parsAllEnumFieldsRequireValues",",,,") ) /// Accessibility modifiers are not permitted on inline assembly code types - /// (Originally from ..\FSComp.txt:418) + /// (Originally from ..\FSComp.txt:420) static member parsInlineAssemblyCannotHaveVisibilityDeclarations() = (569, GetStringFunc("parsInlineAssemblyCannotHaveVisibilityDeclarations",",,,") ) /// Unexpected identifier: '%s' - /// (Originally from ..\FSComp.txt:419) + /// (Originally from ..\FSComp.txt:421) static member parsUnexpectedIdentifier(a0 : System.String) = (571, GetStringFunc("parsUnexpectedIdentifier",",,,%s,,,") a0) /// Accessibility modifiers are not permitted on union cases. Use 'type U = internal ...' or 'type U = private ...' to give an accessibility to the whole representation. - /// (Originally from ..\FSComp.txt:420) + /// (Originally from ..\FSComp.txt:422) static member parsUnionCasesCannotHaveVisibilityDeclarations() = (572, GetStringFunc("parsUnionCasesCannotHaveVisibilityDeclarations",",,,") ) /// Accessibility modifiers are not permitted on enumeration fields - /// (Originally from ..\FSComp.txt:421) + /// (Originally from ..\FSComp.txt:423) static member parsEnumFieldsCannotHaveVisibilityDeclarations() = (573, GetStringFunc("parsEnumFieldsCannotHaveVisibilityDeclarations",",,,") ) /// Consider using a separate record type instead - /// (Originally from ..\FSComp.txt:422) + /// (Originally from ..\FSComp.txt:424) static member parsConsiderUsingSeparateRecordType() = (GetStringFunc("parsConsiderUsingSeparateRecordType",",,,") ) /// Accessibility modifiers are not permitted on record fields. Use 'type R = internal ...' or 'type R = private ...' to give an accessibility to the whole representation. - /// (Originally from ..\FSComp.txt:423) + /// (Originally from ..\FSComp.txt:425) static member parsRecordFieldsCannotHaveVisibilityDeclarations() = (575, GetStringFunc("parsRecordFieldsCannotHaveVisibilityDeclarations",",,,") ) /// The declaration form 'let ... and ...' for non-recursive bindings is not used in F# code. Consider using a sequence of 'let' bindings - /// (Originally from ..\FSComp.txt:424) + /// (Originally from ..\FSComp.txt:426) static member parsLetAndForNonRecBindings() = (576, GetStringFunc("parsLetAndForNonRecBindings",",,,") ) /// Unmatched '(' - /// (Originally from ..\FSComp.txt:425) + /// (Originally from ..\FSComp.txt:427) static member parsUnmatchedParen() = (583, GetStringFunc("parsUnmatchedParen",",,,") ) /// Successive patterns should be separated by spaces or tupled - /// (Originally from ..\FSComp.txt:426) + /// (Originally from ..\FSComp.txt:428) static member parsSuccessivePatternsShouldBeSpacedOrTupled() = (584, GetStringFunc("parsSuccessivePatternsShouldBeSpacedOrTupled",",,,") ) /// No matching 'in' found for this 'let' - /// (Originally from ..\FSComp.txt:427) + /// (Originally from ..\FSComp.txt:429) static member parsNoMatchingInForLet() = (586, GetStringFunc("parsNoMatchingInForLet",",,,") ) /// Error in the return expression for this 'let'. Possible incorrect indentation. - /// (Originally from ..\FSComp.txt:428) + /// (Originally from ..\FSComp.txt:430) static member parsErrorInReturnForLetIncorrectIndentation() = (587, GetStringFunc("parsErrorInReturnForLetIncorrectIndentation",",,,") ) /// The block following this '%s' is unfinished. Every code block is an expression and must have a result. '%s' cannot be the final code element in a block. Consider giving this block an explicit result. - /// (Originally from ..\FSComp.txt:429) + /// (Originally from ..\FSComp.txt:431) static member parsExpectedExpressionAfterLet(a0 : System.String, a1 : System.String) = (588, GetStringFunc("parsExpectedExpressionAfterLet",",,,%s,,,%s,,,") a0 a1) /// Incomplete conditional. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:430) + /// (Originally from ..\FSComp.txt:432) static member parsIncompleteIf() = (589, GetStringFunc("parsIncompleteIf",",,,") ) /// 'assert' may not be used as a first class value. Use 'assert ' instead. - /// (Originally from ..\FSComp.txt:431) + /// (Originally from ..\FSComp.txt:433) static member parsAssertIsNotFirstClassValue() = (590, GetStringFunc("parsAssertIsNotFirstClassValue",",,,") ) /// Identifier expected - /// (Originally from ..\FSComp.txt:432) + /// (Originally from ..\FSComp.txt:434) static member parsIdentifierExpected() = (594, GetStringFunc("parsIdentifierExpected",",,,") ) /// 'in' or '=' expected - /// (Originally from ..\FSComp.txt:433) + /// (Originally from ..\FSComp.txt:435) static member parsInOrEqualExpected() = (595, GetStringFunc("parsInOrEqualExpected",",,,") ) /// The use of '->' in sequence and computation expressions is limited to the form 'for pat in expr -> expr'. Use the syntax 'for ... in ... do ... yield...' to generate elements in more complex sequence expressions. - /// (Originally from ..\FSComp.txt:434) + /// (Originally from ..\FSComp.txt:436) static member parsArrowUseIsLimited() = (596, GetStringFunc("parsArrowUseIsLimited",",,,") ) /// Successive arguments should be separated by spaces or tupled, and arguments involving function or method applications should be parenthesized - /// (Originally from ..\FSComp.txt:435) + /// (Originally from ..\FSComp.txt:437) static member parsSuccessiveArgsShouldBeSpacedOrTupled() = (597, GetStringFunc("parsSuccessiveArgsShouldBeSpacedOrTupled",",,,") ) /// Unmatched '[' - /// (Originally from ..\FSComp.txt:436) + /// (Originally from ..\FSComp.txt:438) static member parsUnmatchedBracket() = (598, GetStringFunc("parsUnmatchedBracket",",,,") ) /// Missing qualification after '.' - /// (Originally from ..\FSComp.txt:437) + /// (Originally from ..\FSComp.txt:439) static member parsMissingQualificationAfterDot() = (599, GetStringFunc("parsMissingQualificationAfterDot",",,,") ) /// In F# code you may use 'expr.[expr]'. A type annotation may be required to indicate the first expression is an array - /// (Originally from ..\FSComp.txt:438) + /// (Originally from ..\FSComp.txt:440) static member parsParenFormIsForML() = (GetStringFunc("parsParenFormIsForML",",,,") ) /// Mismatched quotation, beginning with '%s' - /// (Originally from ..\FSComp.txt:439) + /// (Originally from ..\FSComp.txt:441) static member parsMismatchedQuote(a0 : System.String) = (601, GetStringFunc("parsMismatchedQuote",",,,%s,,,") a0) /// Unmatched '%s' - /// (Originally from ..\FSComp.txt:440) + /// (Originally from ..\FSComp.txt:442) static member parsUnmatched(a0 : System.String) = (602, GetStringFunc("parsUnmatched",",,,%s,,,") a0) /// Unmatched '[|' - /// (Originally from ..\FSComp.txt:441) + /// (Originally from ..\FSComp.txt:443) static member parsUnmatchedBracketBar() = (603, GetStringFunc("parsUnmatchedBracketBar",",,,") ) /// Unmatched '{' - /// (Originally from ..\FSComp.txt:442) + /// (Originally from ..\FSComp.txt:444) static member parsUnmatchedBrace() = (604, GetStringFunc("parsUnmatchedBrace",",,,") ) /// Field bindings must have the form 'id = expr;' - /// (Originally from ..\FSComp.txt:443) + /// (Originally from ..\FSComp.txt:445) static member parsFieldBinding() = (609, GetStringFunc("parsFieldBinding",",,,") ) /// This member is not permitted in an object implementation - /// (Originally from ..\FSComp.txt:444) + /// (Originally from ..\FSComp.txt:446) static member parsMemberIllegalInObjectImplementation() = (610, GetStringFunc("parsMemberIllegalInObjectImplementation",",,,") ) /// Missing function body - /// (Originally from ..\FSComp.txt:445) + /// (Originally from ..\FSComp.txt:447) static member parsMissingFunctionBody() = (611, GetStringFunc("parsMissingFunctionBody",",,,") ) /// Syntax error in labelled type argument - /// (Originally from ..\FSComp.txt:446) + /// (Originally from ..\FSComp.txt:448) static member parsSyntaxErrorInLabeledType() = (613, GetStringFunc("parsSyntaxErrorInLabeledType",",,,") ) /// Unexpected infix operator in type expression - /// (Originally from ..\FSComp.txt:447) + /// (Originally from ..\FSComp.txt:449) static member parsUnexpectedInfixOperator() = (615, GetStringFunc("parsUnexpectedInfixOperator",",,,") ) /// The syntax '(typ,...,typ) ident' is not used in F# code. Consider using 'ident' instead - /// (Originally from ..\FSComp.txt:448) + /// (Originally from ..\FSComp.txt:450) static member parsMultiArgumentGenericTypeFormDeprecated() = (GetStringFunc("parsMultiArgumentGenericTypeFormDeprecated",",,,") ) /// Invalid literal in type - /// (Originally from ..\FSComp.txt:449) + /// (Originally from ..\FSComp.txt:451) static member parsInvalidLiteralInType() = (618, GetStringFunc("parsInvalidLiteralInType",",,,") ) /// Unexpected infix operator in unit-of-measure expression. Legal operators are '*', '/' and '^'. - /// (Originally from ..\FSComp.txt:450) + /// (Originally from ..\FSComp.txt:452) static member parsUnexpectedOperatorForUnitOfMeasure() = (619, GetStringFunc("parsUnexpectedOperatorForUnitOfMeasure",",,,") ) /// Unexpected integer literal in unit-of-measure expression - /// (Originally from ..\FSComp.txt:451) + /// (Originally from ..\FSComp.txt:453) static member parsUnexpectedIntegerLiteralForUnitOfMeasure() = (620, GetStringFunc("parsUnexpectedIntegerLiteralForUnitOfMeasure",",,,") ) /// Syntax error: unexpected type parameter specification - /// (Originally from ..\FSComp.txt:452) + /// (Originally from ..\FSComp.txt:454) static member parsUnexpectedTypeParameter() = (621, GetStringFunc("parsUnexpectedTypeParameter",",,,") ) /// Mismatched quotation operator name, beginning with '%s' - /// (Originally from ..\FSComp.txt:453) + /// (Originally from ..\FSComp.txt:455) static member parsMismatchedQuotationName(a0 : System.String) = (622, GetStringFunc("parsMismatchedQuotationName",",,,%s,,,") a0) /// Active pattern case identifiers must begin with an uppercase letter - /// (Originally from ..\FSComp.txt:454) + /// (Originally from ..\FSComp.txt:456) static member parsActivePatternCaseMustBeginWithUpperCase() = (623, GetStringFunc("parsActivePatternCaseMustBeginWithUpperCase",",,,") ) /// The '|' character is not permitted in active pattern case identifiers - /// (Originally from ..\FSComp.txt:455) + /// (Originally from ..\FSComp.txt:457) static member parsActivePatternCaseContainsPipe() = (624, GetStringFunc("parsActivePatternCaseContainsPipe",",,,") ) /// Denominator must not be 0 in unit-of-measure exponent - /// (Originally from ..\FSComp.txt:456) + /// (Originally from ..\FSComp.txt:458) static member parsIllegalDenominatorForMeasureExponent() = (625, GetStringFunc("parsIllegalDenominatorForMeasureExponent",",,,") ) /// No '=' symbol should follow a 'namespace' declaration - /// (Originally from ..\FSComp.txt:457) + /// (Originally from ..\FSComp.txt:459) static member parsNoEqualShouldFollowNamespace() = (GetStringFunc("parsNoEqualShouldFollowNamespace",",,,") ) /// The syntax 'module ... = struct .. end' is not used in F# code. Consider using 'module ... = begin .. end' - /// (Originally from ..\FSComp.txt:458) + /// (Originally from ..\FSComp.txt:460) static member parsSyntaxModuleStructEndDeprecated() = (GetStringFunc("parsSyntaxModuleStructEndDeprecated",",,,") ) /// The syntax 'module ... : sig .. end' is not used in F# code. Consider using 'module ... = begin .. end' - /// (Originally from ..\FSComp.txt:459) + /// (Originally from ..\FSComp.txt:461) static member parsSyntaxModuleSigEndDeprecated() = (GetStringFunc("parsSyntaxModuleSigEndDeprecated",",,,") ) /// A static field was used where an instance field is expected - /// (Originally from ..\FSComp.txt:460) + /// (Originally from ..\FSComp.txt:462) static member tcStaticFieldUsedWhenInstanceFieldExpected() = (627, GetStringFunc("tcStaticFieldUsedWhenInstanceFieldExpected",",,,") ) /// Method '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:461) + /// (Originally from ..\FSComp.txt:463) static member tcMethodNotAccessible(a0 : System.String) = (629, GetStringFunc("tcMethodNotAccessible",",,,%s,,,") a0) /// Implicit product of measures following / - /// (Originally from ..\FSComp.txt:463) + /// (Originally from ..\FSComp.txt:465) static member tcImplicitMeasureFollowingSlash() = (632, GetStringFunc("tcImplicitMeasureFollowingSlash",",,,") ) /// Unexpected SynMeasure.Anon - /// (Originally from ..\FSComp.txt:464) + /// (Originally from ..\FSComp.txt:466) static member tcUnexpectedMeasureAnon() = (633, GetStringFunc("tcUnexpectedMeasureAnon",",,,") ) /// Non-zero constants cannot have generic units. For generic zero, write 0.0<_>. - /// (Originally from ..\FSComp.txt:465) + /// (Originally from ..\FSComp.txt:467) static member tcNonZeroConstantCannotHaveGenericUnit() = (634, GetStringFunc("tcNonZeroConstantCannotHaveGenericUnit",",,,") ) /// In sequence expressions, results are generated using 'yield' - /// (Originally from ..\FSComp.txt:466) + /// (Originally from ..\FSComp.txt:468) static member tcSeqResultsUseYield() = (635, GetStringFunc("tcSeqResultsUseYield",",,,") ) /// Unexpected big rational constant - /// (Originally from ..\FSComp.txt:467) + /// (Originally from ..\FSComp.txt:469) static member tcUnexpectedBigRationalConstant() = (GetStringFunc("tcUnexpectedBigRationalConstant",",,,") ) /// Units-of-measure supported only on float, float32, decimal and signed integer types - /// (Originally from ..\FSComp.txt:468) + /// (Originally from ..\FSComp.txt:470) static member tcInvalidTypeForUnitsOfMeasure() = (636, GetStringFunc("tcInvalidTypeForUnitsOfMeasure",",,,") ) /// Unexpected Const_uint16array - /// (Originally from ..\FSComp.txt:469) + /// (Originally from ..\FSComp.txt:471) static member tcUnexpectedConstUint16Array() = (GetStringFunc("tcUnexpectedConstUint16Array",",,,") ) /// Unexpected Const_bytearray - /// (Originally from ..\FSComp.txt:470) + /// (Originally from ..\FSComp.txt:472) static member tcUnexpectedConstByteArray() = (GetStringFunc("tcUnexpectedConstByteArray",",,,") ) /// A parameter with attributes must also be given a name, e.g. '[] Name : Type' - /// (Originally from ..\FSComp.txt:471) + /// (Originally from ..\FSComp.txt:473) static member tcParameterRequiresName() = (640, GetStringFunc("tcParameterRequiresName",",,,") ) /// Return values cannot have names - /// (Originally from ..\FSComp.txt:472) + /// (Originally from ..\FSComp.txt:474) static member tcReturnValuesCannotHaveNames() = (641, GetStringFunc("tcReturnValuesCannotHaveNames",",,,") ) /// MemberKind.PropertyGetSet only expected in parse trees - /// (Originally from ..\FSComp.txt:473) + /// (Originally from ..\FSComp.txt:475) static member tcMemberKindPropertyGetSetNotExpected() = (GetStringFunc("tcMemberKindPropertyGetSetNotExpected",",,,") ) /// Namespaces cannot contain values. Consider using a module to hold your value declarations. - /// (Originally from ..\FSComp.txt:474) + /// (Originally from ..\FSComp.txt:476) static member tcNamespaceCannotContainValues() = (201, GetStringFunc("tcNamespaceCannotContainValues",",,,") ) /// Namespaces cannot contain extension members except in the same file and namespace declaration group where the type is defined. Consider using a module to hold declarations of extension members. - /// (Originally from ..\FSComp.txt:475) + /// (Originally from ..\FSComp.txt:477) static member tcNamespaceCannotContainExtensionMembers() = (644, GetStringFunc("tcNamespaceCannotContainExtensionMembers",",,,") ) /// Multiple visibility attributes have been specified for this identifier - /// (Originally from ..\FSComp.txt:476) + /// (Originally from ..\FSComp.txt:478) static member tcMultipleVisibilityAttributes() = (645, GetStringFunc("tcMultipleVisibilityAttributes",",,,") ) /// Multiple visibility attributes have been specified for this identifier. 'let' bindings in classes are always private, as are any 'let' bindings inside expressions. - /// (Originally from ..\FSComp.txt:477) + /// (Originally from ..\FSComp.txt:479) static member tcMultipleVisibilityAttributesWithLet() = (646, GetStringFunc("tcMultipleVisibilityAttributesWithLet",",,,") ) /// The name '(%s)' should not be used as a member name. To define comparison semantics for a type, implement the 'System.IComparable' interface. If defining a static member for use from other CLI languages then use the name '%s' instead. - /// (Originally from ..\FSComp.txt:478) + /// (Originally from ..\FSComp.txt:480) static member tcInvalidMethodNameForRelationalOperator(a0 : System.String, a1 : System.String) = (GetStringFunc("tcInvalidMethodNameForRelationalOperator",",,,%s,,,%s,,,") a0 a1) /// The name '(%s)' should not be used as a member name. To define equality semantics for a type, override the 'Object.Equals' member. If defining a static member for use from other CLI languages then use the name '%s' instead. - /// (Originally from ..\FSComp.txt:479) + /// (Originally from ..\FSComp.txt:481) static member tcInvalidMethodNameForEquality(a0 : System.String, a1 : System.String) = (GetStringFunc("tcInvalidMethodNameForEquality",",,,%s,,,%s,,,") a0 a1) /// The name '(%s)' should not be used as a member name. If defining a static member for use from other CLI languages then use the name '%s' instead. - /// (Originally from ..\FSComp.txt:480) + /// (Originally from ..\FSComp.txt:482) static member tcInvalidMemberName(a0 : System.String, a1 : System.String) = (GetStringFunc("tcInvalidMemberName",",,,%s,,,%s,,,") a0 a1) /// The name '(%s)' should not be used as a member name because it is given a standard definition in the F# library over fixed types - /// (Originally from ..\FSComp.txt:481) + /// (Originally from ..\FSComp.txt:483) static member tcInvalidMemberNameFixedTypes(a0 : System.String) = (GetStringFunc("tcInvalidMemberNameFixedTypes",",,,%s,,,") a0) /// The '%s' operator should not normally be redefined. To define overloaded comparison semantics for a particular type, implement the 'System.IComparable' interface in the definition of that type. - /// (Originally from ..\FSComp.txt:482) + /// (Originally from ..\FSComp.txt:484) static member tcInvalidOperatorDefinitionRelational(a0 : System.String) = (GetStringFunc("tcInvalidOperatorDefinitionRelational",",,,%s,,,") a0) /// The '%s' operator should not normally be redefined. To define equality semantics for a type, override the 'Object.Equals' member in the definition of that type. - /// (Originally from ..\FSComp.txt:483) + /// (Originally from ..\FSComp.txt:485) static member tcInvalidOperatorDefinitionEquality(a0 : System.String) = (GetStringFunc("tcInvalidOperatorDefinitionEquality",",,,%s,,,") a0) /// The '%s' operator should not normally be redefined. Consider using a different operator name - /// (Originally from ..\FSComp.txt:484) + /// (Originally from ..\FSComp.txt:486) static member tcInvalidOperatorDefinition(a0 : System.String) = (GetStringFunc("tcInvalidOperatorDefinition",",,,%s,,,") a0) /// The '%s' operator cannot be redefined. Consider using a different operator name - /// (Originally from ..\FSComp.txt:485) + /// (Originally from ..\FSComp.txt:487) static member tcInvalidIndexOperatorDefinition(a0 : System.String) = (GetStringFunc("tcInvalidIndexOperatorDefinition",",,,%s,,,") a0) /// Expected module or namespace parent %s - /// (Originally from ..\FSComp.txt:486) + /// (Originally from ..\FSComp.txt:488) static member tcExpectModuleOrNamespaceParent(a0 : System.String) = (GetStringFunc("tcExpectModuleOrNamespaceParent",",,,%s,,,") a0) /// The struct, record or union type '%s' implements the interface 'System.IComparable' explicitly. You must apply the 'CustomComparison' attribute to the type. - /// (Originally from ..\FSComp.txt:487) + /// (Originally from ..\FSComp.txt:489) static member tcImplementsIComparableExplicitly(a0 : System.String) = (647, GetStringFunc("tcImplementsIComparableExplicitly",",,,%s,,,") a0) /// The struct, record or union type '%s' implements the interface 'System.IComparable<_>' explicitly. You must apply the 'CustomComparison' attribute to the type, and should also provide a consistent implementation of the non-generic interface System.IComparable. - /// (Originally from ..\FSComp.txt:488) + /// (Originally from ..\FSComp.txt:490) static member tcImplementsGenericIComparableExplicitly(a0 : System.String) = (648, GetStringFunc("tcImplementsGenericIComparableExplicitly",",,,%s,,,") a0) /// The struct, record or union type '%s' implements the interface 'System.IStructuralComparable' explicitly. Apply the 'CustomComparison' attribute to the type. - /// (Originally from ..\FSComp.txt:489) + /// (Originally from ..\FSComp.txt:491) static member tcImplementsIStructuralComparableExplicitly(a0 : System.String) = (649, GetStringFunc("tcImplementsIStructuralComparableExplicitly",",,,%s,,,") a0) /// This record contains fields from inconsistent types - /// (Originally from ..\FSComp.txt:490) + /// (Originally from ..\FSComp.txt:492) static member tcRecordFieldInconsistentTypes() = (656, GetStringFunc("tcRecordFieldInconsistentTypes",",,,") ) /// DLLImport stubs cannot be inlined - /// (Originally from ..\FSComp.txt:491) + /// (Originally from ..\FSComp.txt:493) static member tcDllImportStubsCannotBeInlined() = (657, GetStringFunc("tcDllImportStubsCannotBeInlined",",,,") ) /// Structs may only bind a 'this' parameter at member declarations - /// (Originally from ..\FSComp.txt:492) + /// (Originally from ..\FSComp.txt:494) static member tcStructsCanOnlyBindThisAtMemberDeclaration() = (658, GetStringFunc("tcStructsCanOnlyBindThisAtMemberDeclaration",",,,") ) /// Unexpected expression at recursive inference point - /// (Originally from ..\FSComp.txt:493) + /// (Originally from ..\FSComp.txt:495) static member tcUnexpectedExprAtRecInfPoint() = (659, GetStringFunc("tcUnexpectedExprAtRecInfPoint",",,,") ) /// This code is less generic than required by its annotations because the explicit type variable '%s' could not be generalized. It was constrained to be '%s'. - /// (Originally from ..\FSComp.txt:494) + /// (Originally from ..\FSComp.txt:496) static member tcLessGenericBecauseOfAnnotation(a0 : System.String, a1 : System.String) = (660, GetStringFunc("tcLessGenericBecauseOfAnnotation",",,,%s,,,%s,,,") a0 a1) /// One or more of the explicit class or function type variables for this binding could not be generalized, because they were constrained to other types - /// (Originally from ..\FSComp.txt:495) + /// (Originally from ..\FSComp.txt:497) static member tcConstrainedTypeVariableCannotBeGeneralized() = (661, GetStringFunc("tcConstrainedTypeVariableCannotBeGeneralized",",,,") ) /// A generic type parameter has been used in a way that constrains it to always be '%s' - /// (Originally from ..\FSComp.txt:496) + /// (Originally from ..\FSComp.txt:498) static member tcGenericParameterHasBeenConstrained(a0 : System.String) = (662, GetStringFunc("tcGenericParameterHasBeenConstrained",",,,%s,,,") a0) /// This type parameter has been used in a way that constrains it to always be '%s' - /// (Originally from ..\FSComp.txt:497) + /// (Originally from ..\FSComp.txt:499) static member tcTypeParameterHasBeenConstrained(a0 : System.String) = (663, GetStringFunc("tcTypeParameterHasBeenConstrained",",,,%s,,,") a0) /// The type parameters inferred for this value are not stable under the erasure of type abbreviations. This is due to the use of type abbreviations which drop or reorder type parameters, e.g. \n\ttype taggedInt<'a> = int or\n\ttype swap<'a,'b> = 'b * 'a.\nConsider declaring the type parameters for this value explicitly, e.g.\n\tlet f<'a,'b> ((x,y) : swap<'b,'a>) : swap<'a,'b> = (y,x). - /// (Originally from ..\FSComp.txt:498) + /// (Originally from ..\FSComp.txt:500) static member tcTypeParametersInferredAreNotStable() = (664, GetStringFunc("tcTypeParametersInferredAreNotStable",",,,") ) /// Explicit type parameters may only be used on module or member bindings - /// (Originally from ..\FSComp.txt:499) + /// (Originally from ..\FSComp.txt:501) static member tcExplicitTypeParameterInvalid() = (665, GetStringFunc("tcExplicitTypeParameterInvalid",",,,") ) /// You must explicitly declare either all or no type parameters when overriding a generic abstract method - /// (Originally from ..\FSComp.txt:500) + /// (Originally from ..\FSComp.txt:502) static member tcOverridingMethodRequiresAllOrNoTypeParameters() = (666, GetStringFunc("tcOverridingMethodRequiresAllOrNoTypeParameters",",,,") ) /// The field labels and expected type of this record expression or pattern do not uniquely determine a corresponding record type - /// (Originally from ..\FSComp.txt:501) + /// (Originally from ..\FSComp.txt:503) static member tcFieldsDoNotDetermineUniqueRecordType() = (667, GetStringFunc("tcFieldsDoNotDetermineUniqueRecordType",",,,") ) /// The field '%s' appears twice in this record expression or pattern - /// (Originally from ..\FSComp.txt:502) + /// (Originally from ..\FSComp.txt:504) static member tcFieldAppearsTwiceInRecord(a0 : System.String) = (668, GetStringFunc("tcFieldAppearsTwiceInRecord",",,,%s,,,") a0) /// Unknown union case - /// (Originally from ..\FSComp.txt:503) + /// (Originally from ..\FSComp.txt:505) static member tcUnknownUnion() = (669, GetStringFunc("tcUnknownUnion",",,,") ) /// This code is not sufficiently generic. The type variable %s could not be generalized because it would escape its scope. - /// (Originally from ..\FSComp.txt:504) + /// (Originally from ..\FSComp.txt:506) static member tcNotSufficientlyGenericBecauseOfScope(a0 : System.String) = (670, GetStringFunc("tcNotSufficientlyGenericBecauseOfScope",",,,%s,,,") a0) /// A property cannot have explicit type parameters. Consider using a method instead. - /// (Originally from ..\FSComp.txt:505) + /// (Originally from ..\FSComp.txt:507) static member tcPropertyRequiresExplicitTypeParameters() = (671, GetStringFunc("tcPropertyRequiresExplicitTypeParameters",",,,") ) /// A constructor cannot have explicit type parameters. Consider using a static construction method instead. - /// (Originally from ..\FSComp.txt:506) + /// (Originally from ..\FSComp.txt:508) static member tcConstructorCannotHaveTypeParameters() = (672, GetStringFunc("tcConstructorCannotHaveTypeParameters",",,,") ) /// This instance member needs a parameter to represent the object being invoked. Make the member static or use the notation 'member x.Member(args) = ...'. - /// (Originally from ..\FSComp.txt:507) + /// (Originally from ..\FSComp.txt:509) static member tcInstanceMemberRequiresTarget() = (673, GetStringFunc("tcInstanceMemberRequiresTarget",",,,") ) /// Unexpected source-level property specification in syntax tree - /// (Originally from ..\FSComp.txt:508) + /// (Originally from ..\FSComp.txt:510) static member tcUnexpectedPropertyInSyntaxTree() = (674, GetStringFunc("tcUnexpectedPropertyInSyntaxTree",",,,") ) /// A static initializer requires an argument - /// (Originally from ..\FSComp.txt:509) + /// (Originally from ..\FSComp.txt:511) static member tcStaticInitializerRequiresArgument() = (675, GetStringFunc("tcStaticInitializerRequiresArgument",",,,") ) /// An object constructor requires an argument - /// (Originally from ..\FSComp.txt:510) + /// (Originally from ..\FSComp.txt:512) static member tcObjectConstructorRequiresArgument() = (676, GetStringFunc("tcObjectConstructorRequiresArgument",",,,") ) /// This static member should not have a 'this' parameter. Consider using the notation 'member Member(args) = ...'. - /// (Originally from ..\FSComp.txt:511) + /// (Originally from ..\FSComp.txt:513) static member tcStaticMemberShouldNotHaveThis() = (677, GetStringFunc("tcStaticMemberShouldNotHaveThis",",,,") ) /// An explicit static initializer should use the syntax 'static new(args) = expr' - /// (Originally from ..\FSComp.txt:512) + /// (Originally from ..\FSComp.txt:514) static member tcExplicitStaticInitializerSyntax() = (678, GetStringFunc("tcExplicitStaticInitializerSyntax",",,,") ) /// An explicit object constructor should use the syntax 'new(args) = expr' - /// (Originally from ..\FSComp.txt:513) + /// (Originally from ..\FSComp.txt:515) static member tcExplicitObjectConstructorSyntax() = (679, GetStringFunc("tcExplicitObjectConstructorSyntax",",,,") ) /// Unexpected source-level property specification - /// (Originally from ..\FSComp.txt:514) + /// (Originally from ..\FSComp.txt:516) static member tcUnexpectedPropertySpec() = (680, GetStringFunc("tcUnexpectedPropertySpec",",,,") ) /// This form of object expression is not used in F#. Use 'member this.MemberName ... = ...' to define member implementations in object expressions. - /// (Originally from ..\FSComp.txt:515) + /// (Originally from ..\FSComp.txt:517) static member tcObjectExpressionFormDeprecated() = (GetStringFunc("tcObjectExpressionFormDeprecated",",,,") ) /// Invalid declaration - /// (Originally from ..\FSComp.txt:516) + /// (Originally from ..\FSComp.txt:518) static member tcInvalidDeclaration() = (682, GetStringFunc("tcInvalidDeclaration",",,,") ) /// Attributes are not allowed within patterns - /// (Originally from ..\FSComp.txt:517) + /// (Originally from ..\FSComp.txt:519) static member tcAttributesInvalidInPatterns() = (683, GetStringFunc("tcAttributesInvalidInPatterns",",,,") ) /// The generic function '%s' must be given explicit type argument(s) - /// (Originally from ..\FSComp.txt:518) + /// (Originally from ..\FSComp.txt:520) static member tcFunctionRequiresExplicitTypeArguments(a0 : System.String) = (685, GetStringFunc("tcFunctionRequiresExplicitTypeArguments",",,,%s,,,") a0) /// The method or function '%s' should not be given explicit type argument(s) because it does not declare its type parameters explicitly - /// (Originally from ..\FSComp.txt:519) + /// (Originally from ..\FSComp.txt:521) static member tcDoesNotAllowExplicitTypeArguments(a0 : System.String) = (686, GetStringFunc("tcDoesNotAllowExplicitTypeArguments",",,,%s,,,") a0) /// This value, type or method expects %d type parameter(s) but was given %d - /// (Originally from ..\FSComp.txt:520) + /// (Originally from ..\FSComp.txt:522) static member tcTypeParameterArityMismatch(a0 : System.Int32, a1 : System.Int32) = (687, GetStringFunc("tcTypeParameterArityMismatch",",,,%d,,,%d,,,") a0 a1) /// The default, zero-initializing constructor of a struct type may only be used if all the fields of the struct type admit default initialization - /// (Originally from ..\FSComp.txt:521) + /// (Originally from ..\FSComp.txt:523) static member tcDefaultStructConstructorCall() = (688, GetStringFunc("tcDefaultStructConstructorCall",",,,") ) /// Couldn't find Dispose on IDisposable, or it was overloaded - /// (Originally from ..\FSComp.txt:522) + /// (Originally from ..\FSComp.txt:524) static member tcCouldNotFindIDisposable() = (GetStringFunc("tcCouldNotFindIDisposable",",,,") ) /// This value is not a literal and cannot be used in a pattern - /// (Originally from ..\FSComp.txt:523) + /// (Originally from ..\FSComp.txt:525) static member tcNonLiteralCannotBeUsedInPattern() = (689, GetStringFunc("tcNonLiteralCannotBeUsedInPattern",",,,") ) /// This field is readonly - /// (Originally from ..\FSComp.txt:524) + /// (Originally from ..\FSComp.txt:526) static member tcFieldIsReadonly() = (690, GetStringFunc("tcFieldIsReadonly",",,,") ) /// Named arguments must appear after all other arguments - /// (Originally from ..\FSComp.txt:525) + /// (Originally from ..\FSComp.txt:527) static member tcNameArgumentsMustAppearLast() = (691, GetStringFunc("tcNameArgumentsMustAppearLast",",,,") ) /// This function value is being used to construct a delegate type whose signature includes a byref argument. You must use an explicit lambda expression taking %d arguments. - /// (Originally from ..\FSComp.txt:526) + /// (Originally from ..\FSComp.txt:528) static member tcFunctionRequiresExplicitLambda(a0 : System.Int32) = (692, GetStringFunc("tcFunctionRequiresExplicitLambda",",,,%d,,,") a0) /// The type '%s' is not a type whose values can be enumerated with this syntax, i.e. is not compatible with either seq<_>, IEnumerable<_> or IEnumerable and does not have a GetEnumerator method - /// (Originally from ..\FSComp.txt:527) + /// (Originally from ..\FSComp.txt:529) static member tcTypeCannotBeEnumerated(a0 : System.String) = (693, GetStringFunc("tcTypeCannotBeEnumerated",",,,%s,,,") a0) /// This recursive binding uses an invalid mixture of recursive forms - /// (Originally from ..\FSComp.txt:528) + /// (Originally from ..\FSComp.txt:530) static member tcInvalidMixtureOfRecursiveForms() = (695, GetStringFunc("tcInvalidMixtureOfRecursiveForms",",,,") ) /// This is not a valid object construction expression. Explicit object constructors must either call an alternate constructor or initialize all fields of the object and specify a call to a super class constructor. - /// (Originally from ..\FSComp.txt:529) + /// (Originally from ..\FSComp.txt:531) static member tcInvalidObjectConstructionExpression() = (696, GetStringFunc("tcInvalidObjectConstructionExpression",",,,") ) /// Invalid constraint - /// (Originally from ..\FSComp.txt:530) + /// (Originally from ..\FSComp.txt:532) static member tcInvalidConstraint() = (697, GetStringFunc("tcInvalidConstraint",",,,") ) /// Invalid constraint: the type used for the constraint is sealed, which means the constraint could only be satisfied by at most one solution - /// (Originally from ..\FSComp.txt:531) + /// (Originally from ..\FSComp.txt:533) static member tcInvalidConstraintTypeSealed() = (698, GetStringFunc("tcInvalidConstraintTypeSealed",",,,") ) /// An 'enum' constraint must be of the form 'enum' - /// (Originally from ..\FSComp.txt:532) + /// (Originally from ..\FSComp.txt:534) static member tcInvalidEnumConstraint() = (699, GetStringFunc("tcInvalidEnumConstraint",",,,") ) /// 'new' constraints must take one argument of type 'unit' and return the constructed type - /// (Originally from ..\FSComp.txt:533) + /// (Originally from ..\FSComp.txt:535) static member tcInvalidNewConstraint() = (700, GetStringFunc("tcInvalidNewConstraint",",,,") ) /// This property has an invalid type. Properties taking multiple indexer arguments should have types of the form 'ty1 * ty2 -> ty3'. Properties returning functions should have types of the form '(ty1 -> ty2)'. - /// (Originally from ..\FSComp.txt:534) + /// (Originally from ..\FSComp.txt:536) static member tcInvalidPropertyType() = (701, GetStringFunc("tcInvalidPropertyType",",,,") ) /// Expected unit-of-measure parameter, not type parameter. Explicit unit-of-measure parameters must be marked with the [] attribute. - /// (Originally from ..\FSComp.txt:535) + /// (Originally from ..\FSComp.txt:537) static member tcExpectedUnitOfMeasureMarkWithAttribute() = (702, GetStringFunc("tcExpectedUnitOfMeasureMarkWithAttribute",",,,") ) /// Expected type parameter, not unit-of-measure parameter - /// (Originally from ..\FSComp.txt:536) + /// (Originally from ..\FSComp.txt:538) static member tcExpectedTypeParameter() = (703, GetStringFunc("tcExpectedTypeParameter",",,,") ) /// Expected type, not unit-of-measure - /// (Originally from ..\FSComp.txt:537) + /// (Originally from ..\FSComp.txt:539) static member tcExpectedTypeNotUnitOfMeasure() = (704, GetStringFunc("tcExpectedTypeNotUnitOfMeasure",",,,") ) /// Expected unit-of-measure, not type - /// (Originally from ..\FSComp.txt:538) + /// (Originally from ..\FSComp.txt:540) static member tcExpectedUnitOfMeasureNotType() = (705, GetStringFunc("tcExpectedUnitOfMeasureNotType",",,,") ) /// Units-of-measure cannot be used as prefix arguments to a type. Rewrite as postfix arguments in angle brackets. - /// (Originally from ..\FSComp.txt:539) + /// (Originally from ..\FSComp.txt:541) static member tcInvalidUnitsOfMeasurePrefix() = (706, GetStringFunc("tcInvalidUnitsOfMeasurePrefix",",,,") ) /// Unit-of-measure cannot be used in type constructor application - /// (Originally from ..\FSComp.txt:540) + /// (Originally from ..\FSComp.txt:542) static member tcUnitsOfMeasureInvalidInTypeConstructor() = (707, GetStringFunc("tcUnitsOfMeasureInvalidInTypeConstructor",",,,") ) /// This control construct may only be used if the computation expression builder defines a '%s' method - /// (Originally from ..\FSComp.txt:541) + /// (Originally from ..\FSComp.txt:543) static member tcRequireBuilderMethod(a0 : System.String) = (708, GetStringFunc("tcRequireBuilderMethod",",,,%s,,,") a0) /// This type has no nested types - /// (Originally from ..\FSComp.txt:542) + /// (Originally from ..\FSComp.txt:544) static member tcTypeHasNoNestedTypes() = (709, GetStringFunc("tcTypeHasNoNestedTypes",",,,") ) /// Unexpected %s in type expression - /// (Originally from ..\FSComp.txt:543) + /// (Originally from ..\FSComp.txt:545) static member tcUnexpectedSymbolInTypeExpression(a0 : System.String) = (711, GetStringFunc("tcUnexpectedSymbolInTypeExpression",",,,%s,,,") a0) /// Type parameter cannot be used as type constructor - /// (Originally from ..\FSComp.txt:544) + /// (Originally from ..\FSComp.txt:546) static member tcTypeParameterInvalidAsTypeConstructor() = (712, GetStringFunc("tcTypeParameterInvalidAsTypeConstructor",",,,") ) /// Illegal syntax in type expression - /// (Originally from ..\FSComp.txt:545) + /// (Originally from ..\FSComp.txt:547) static member tcIllegalSyntaxInTypeExpression() = (713, GetStringFunc("tcIllegalSyntaxInTypeExpression",",,,") ) /// Anonymous unit-of-measure cannot be nested inside another unit-of-measure expression - /// (Originally from ..\FSComp.txt:546) + /// (Originally from ..\FSComp.txt:548) static member tcAnonymousUnitsOfMeasureCannotBeNested() = (714, GetStringFunc("tcAnonymousUnitsOfMeasureCannotBeNested",",,,") ) /// Anonymous type variables are not permitted in this declaration - /// (Originally from ..\FSComp.txt:547) + /// (Originally from ..\FSComp.txt:549) static member tcAnonymousTypeInvalidInDeclaration() = (715, GetStringFunc("tcAnonymousTypeInvalidInDeclaration",",,,") ) /// Unexpected / in type - /// (Originally from ..\FSComp.txt:548) + /// (Originally from ..\FSComp.txt:550) static member tcUnexpectedSlashInType() = (716, GetStringFunc("tcUnexpectedSlashInType",",,,") ) /// Unexpected type arguments - /// (Originally from ..\FSComp.txt:549) + /// (Originally from ..\FSComp.txt:551) static member tcUnexpectedTypeArguments() = (717, GetStringFunc("tcUnexpectedTypeArguments",",,,") ) /// Optional arguments are only permitted on type members - /// (Originally from ..\FSComp.txt:550) + /// (Originally from ..\FSComp.txt:552) static member tcOptionalArgsOnlyOnMembers() = (718, GetStringFunc("tcOptionalArgsOnlyOnMembers",",,,") ) /// Name '%s' not bound in pattern context - /// (Originally from ..\FSComp.txt:551) + /// (Originally from ..\FSComp.txt:553) static member tcNameNotBoundInPattern(a0 : System.String) = (719, GetStringFunc("tcNameNotBoundInPattern",",,,%s,,,") a0) /// Non-primitive numeric literal constants cannot be used in pattern matches because they can be mapped to multiple different types through the use of a NumericLiteral module. Consider using replacing with a variable, and use 'when = ' at the end of the match clause. - /// (Originally from ..\FSComp.txt:552) + /// (Originally from ..\FSComp.txt:554) static member tcInvalidNonPrimitiveLiteralInPatternMatch() = (720, GetStringFunc("tcInvalidNonPrimitiveLiteralInPatternMatch",",,,") ) /// Type arguments cannot be specified here - /// (Originally from ..\FSComp.txt:553) + /// (Originally from ..\FSComp.txt:555) static member tcInvalidTypeArgumentUsage() = (721, GetStringFunc("tcInvalidTypeArgumentUsage",",,,") ) /// Only active patterns returning exactly one result may accept arguments - /// (Originally from ..\FSComp.txt:554) + /// (Originally from ..\FSComp.txt:556) static member tcRequireActivePatternWithOneResult() = (722, GetStringFunc("tcRequireActivePatternWithOneResult",",,,") ) /// Invalid argument to parameterized pattern label - /// (Originally from ..\FSComp.txt:555) + /// (Originally from ..\FSComp.txt:557) static member tcInvalidArgForParameterizedPattern() = (723, GetStringFunc("tcInvalidArgForParameterizedPattern",",,,") ) /// Internal error. Invalid index into active pattern array - /// (Originally from ..\FSComp.txt:556) + /// (Originally from ..\FSComp.txt:558) static member tcInvalidIndexIntoActivePatternArray() = (724, GetStringFunc("tcInvalidIndexIntoActivePatternArray",",,,") ) /// This union case does not take arguments - /// (Originally from ..\FSComp.txt:557) + /// (Originally from ..\FSComp.txt:559) static member tcUnionCaseDoesNotTakeArguments() = (725, GetStringFunc("tcUnionCaseDoesNotTakeArguments",",,,") ) /// This union case takes one argument - /// (Originally from ..\FSComp.txt:558) + /// (Originally from ..\FSComp.txt:560) static member tcUnionCaseRequiresOneArgument() = (726, GetStringFunc("tcUnionCaseRequiresOneArgument",",,,") ) /// This union case expects %d arguments in tupled form - /// (Originally from ..\FSComp.txt:559) + /// (Originally from ..\FSComp.txt:561) static member tcUnionCaseExpectsTupledArguments(a0 : System.Int32) = (727, GetStringFunc("tcUnionCaseExpectsTupledArguments",",,,%d,,,") a0) /// Field '%s' is not static - /// (Originally from ..\FSComp.txt:560) + /// (Originally from ..\FSComp.txt:562) static member tcFieldIsNotStatic(a0 : System.String) = (728, GetStringFunc("tcFieldIsNotStatic",",,,%s,,,") a0) /// This field is not a literal and cannot be used in a pattern - /// (Originally from ..\FSComp.txt:561) + /// (Originally from ..\FSComp.txt:563) static member tcFieldNotLiteralCannotBeUsedInPattern() = (729, GetStringFunc("tcFieldNotLiteralCannotBeUsedInPattern",",,,") ) /// This is not a variable, constant, active recognizer or literal - /// (Originally from ..\FSComp.txt:562) + /// (Originally from ..\FSComp.txt:564) static member tcRequireVarConstRecogOrLiteral() = (730, GetStringFunc("tcRequireVarConstRecogOrLiteral",",,,") ) /// This is not a valid pattern - /// (Originally from ..\FSComp.txt:563) + /// (Originally from ..\FSComp.txt:565) static member tcInvalidPattern() = (731, GetStringFunc("tcInvalidPattern",",,,") ) /// Character range matches have been removed in F#. Consider using a 'when' pattern guard instead. - /// (Originally from ..\FSComp.txt:564) + /// (Originally from ..\FSComp.txt:566) static member tcUseWhenPatternGuard() = (GetStringFunc("tcUseWhenPatternGuard",",,,") ) /// Illegal pattern - /// (Originally from ..\FSComp.txt:565) + /// (Originally from ..\FSComp.txt:567) static member tcIllegalPattern() = (733, GetStringFunc("tcIllegalPattern",",,,") ) /// Syntax error - unexpected '?' symbol - /// (Originally from ..\FSComp.txt:566) + /// (Originally from ..\FSComp.txt:568) static member tcSyntaxErrorUnexpectedQMark() = (734, GetStringFunc("tcSyntaxErrorUnexpectedQMark",",,,") ) /// Expected %d expressions, got %d - /// (Originally from ..\FSComp.txt:567) + /// (Originally from ..\FSComp.txt:569) static member tcExpressionCountMisMatch(a0 : System.Int32, a1 : System.Int32) = (735, GetStringFunc("tcExpressionCountMisMatch",",,,%d,,,%d,,,") a0 a1) /// TcExprUndelayed: delayed - /// (Originally from ..\FSComp.txt:568) + /// (Originally from ..\FSComp.txt:570) static member tcExprUndelayed() = (736, GetStringFunc("tcExprUndelayed",",,,") ) /// This expression form may only be used in sequence and computation expressions - /// (Originally from ..\FSComp.txt:569) + /// (Originally from ..\FSComp.txt:571) static member tcExpressionRequiresSequence() = (737, GetStringFunc("tcExpressionRequiresSequence",",,,") ) /// Invalid object expression. Objects without overrides or interfaces should use the expression form 'new Type(args)' without braces. - /// (Originally from ..\FSComp.txt:570) + /// (Originally from ..\FSComp.txt:572) static member tcInvalidObjectExpressionSyntaxForm() = (738, GetStringFunc("tcInvalidObjectExpressionSyntaxForm",",,,") ) /// Invalid object, sequence or record expression - /// (Originally from ..\FSComp.txt:571) + /// (Originally from ..\FSComp.txt:573) static member tcInvalidObjectSequenceOrRecordExpression() = (739, GetStringFunc("tcInvalidObjectSequenceOrRecordExpression",",,,") ) /// Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }' - /// (Originally from ..\FSComp.txt:572) + /// (Originally from ..\FSComp.txt:574) static member tcInvalidSequenceExpressionSyntaxForm() = (740, GetStringFunc("tcInvalidSequenceExpressionSyntaxForm",",,,") ) /// This list or array expression includes an element of the form 'if ... then ... else'. Parenthesize this expression to indicate it is an individual element of the list or array, to disambiguate this from a list generated using a sequence expression - /// (Originally from ..\FSComp.txt:573) + /// (Originally from ..\FSComp.txt:575) static member tcExpressionWithIfRequiresParenthesis() = (GetStringFunc("tcExpressionWithIfRequiresParenthesis",",,,") ) /// Unable to parse format string '%s' - /// (Originally from ..\FSComp.txt:574) + /// (Originally from ..\FSComp.txt:576) static member tcUnableToParseFormatString(a0 : System.String) = (741, GetStringFunc("tcUnableToParseFormatString",",,,%s,,,") a0) /// This list expression exceeds the maximum size for list literals. Use an array for larger literals and call Array.ToList. - /// (Originally from ..\FSComp.txt:575) + /// (Originally from ..\FSComp.txt:577) static member tcListLiteralMaxSize() = (742, GetStringFunc("tcListLiteralMaxSize",",,,") ) /// The expression form 'expr then expr' may only be used as part of an explicit object constructor - /// (Originally from ..\FSComp.txt:576) + /// (Originally from ..\FSComp.txt:578) static member tcExpressionFormRequiresObjectConstructor() = (743, GetStringFunc("tcExpressionFormRequiresObjectConstructor",",,,") ) /// Named arguments cannot be given to member trait calls - /// (Originally from ..\FSComp.txt:577) + /// (Originally from ..\FSComp.txt:579) static member tcNamedArgumentsCannotBeUsedInMemberTraits() = (744, GetStringFunc("tcNamedArgumentsCannotBeUsedInMemberTraits",",,,") ) /// This is not a valid name for an enumeration case - /// (Originally from ..\FSComp.txt:578) + /// (Originally from ..\FSComp.txt:580) static member tcNotValidEnumCaseName() = (745, GetStringFunc("tcNotValidEnumCaseName",",,,") ) /// This field is not mutable - /// (Originally from ..\FSComp.txt:579) + /// (Originally from ..\FSComp.txt:581) static member tcFieldIsNotMutable() = (746, GetStringFunc("tcFieldIsNotMutable",",,,") ) /// This construct may only be used within list, array and sequence expressions, e.g. expressions of the form 'seq { ... }', '[ ... ]' or '[| ... |]'. These use the syntax 'for ... in ... do ... yield...' to generate elements - /// (Originally from ..\FSComp.txt:580) + /// (Originally from ..\FSComp.txt:582) static member tcConstructRequiresListArrayOrSequence() = (747, GetStringFunc("tcConstructRequiresListArrayOrSequence",",,,") ) /// This construct may only be used within computation expressions. To return a value from an ordinary function simply write the expression without 'return'. - /// (Originally from ..\FSComp.txt:581) + /// (Originally from ..\FSComp.txt:583) static member tcConstructRequiresComputationExpressions() = (748, GetStringFunc("tcConstructRequiresComputationExpressions",",,,") ) /// This construct may only be used within sequence or computation expressions - /// (Originally from ..\FSComp.txt:582) + /// (Originally from ..\FSComp.txt:584) static member tcConstructRequiresSequenceOrComputations() = (749, GetStringFunc("tcConstructRequiresSequenceOrComputations",",,,") ) /// This construct may only be used within computation expressions - /// (Originally from ..\FSComp.txt:583) + /// (Originally from ..\FSComp.txt:585) static member tcConstructRequiresComputationExpression() = (750, GetStringFunc("tcConstructRequiresComputationExpression",",,,") ) /// Invalid indexer expression - /// (Originally from ..\FSComp.txt:584) + /// (Originally from ..\FSComp.txt:586) static member tcInvalidIndexerExpression() = (751, GetStringFunc("tcInvalidIndexerExpression",",,,") ) /// The operator 'expr.[idx]' has been used on an object of indeterminate type based on information prior to this program point. Consider adding further type constraints - /// (Originally from ..\FSComp.txt:585) + /// (Originally from ..\FSComp.txt:587) static member tcObjectOfIndeterminateTypeUsedRequireTypeConstraint() = (752, GetStringFunc("tcObjectOfIndeterminateTypeUsedRequireTypeConstraint",",,,") ) /// Cannot inherit from a variable type - /// (Originally from ..\FSComp.txt:586) + /// (Originally from ..\FSComp.txt:588) static member tcCannotInheritFromVariableType() = (753, GetStringFunc("tcCannotInheritFromVariableType",",,,") ) /// Calls to object constructors on type parameters cannot be given arguments - /// (Originally from ..\FSComp.txt:587) + /// (Originally from ..\FSComp.txt:589) static member tcObjectConstructorsOnTypeParametersCannotTakeArguments() = (754, GetStringFunc("tcObjectConstructorsOnTypeParametersCannotTakeArguments",",,,") ) /// The 'CompiledName' attribute cannot be used with this language element - /// (Originally from ..\FSComp.txt:588) + /// (Originally from ..\FSComp.txt:590) static member tcCompiledNameAttributeMisused() = (755, GetStringFunc("tcCompiledNameAttributeMisused",",,,") ) /// '%s' may only be used with named types - /// (Originally from ..\FSComp.txt:589) + /// (Originally from ..\FSComp.txt:591) static member tcNamedTypeRequired(a0 : System.String) = (756, GetStringFunc("tcNamedTypeRequired",",,,%s,,,") a0) /// 'inherit' cannot be used on interface types. Consider implementing the interface by using 'interface ... with ... end' instead. - /// (Originally from ..\FSComp.txt:590) + /// (Originally from ..\FSComp.txt:592) static member tcInheritCannotBeUsedOnInterfaceType() = (757, GetStringFunc("tcInheritCannotBeUsedOnInterfaceType",",,,") ) /// 'new' cannot be used on interface types. Consider using an object expression '{ new ... with ... }' instead. - /// (Originally from ..\FSComp.txt:591) + /// (Originally from ..\FSComp.txt:593) static member tcNewCannotBeUsedOnInterfaceType() = (758, GetStringFunc("tcNewCannotBeUsedOnInterfaceType",",,,") ) /// Instances of this type cannot be created since it has been marked abstract or not all methods have been given implementations. Consider using an object expression '{ new ... with ... }' instead. - /// (Originally from ..\FSComp.txt:592) + /// (Originally from ..\FSComp.txt:594) static member tcAbstractTypeCannotBeInstantiated() = (759, GetStringFunc("tcAbstractTypeCannotBeInstantiated",",,,") ) /// It is recommended that objects supporting the IDisposable interface are created using the syntax 'new Type(args)', rather than 'Type(args)' or 'Type' as a function value representing the constructor, to indicate that resources may be owned by the generated value - /// (Originally from ..\FSComp.txt:593) + /// (Originally from ..\FSComp.txt:595) static member tcIDisposableTypeShouldUseNew() = (760, GetStringFunc("tcIDisposableTypeShouldUseNew",",,,") ) /// '%s' may only be used to construct object types - /// (Originally from ..\FSComp.txt:594) + /// (Originally from ..\FSComp.txt:596) static member tcSyntaxCanOnlyBeUsedToCreateObjectTypes(a0 : System.String) = (761, GetStringFunc("tcSyntaxCanOnlyBeUsedToCreateObjectTypes",",,,%s,,,") a0) /// Constructors for the type '%s' must directly or indirectly call its implicit object constructor. Use a call to the implicit object constructor instead of a record expression. - /// (Originally from ..\FSComp.txt:595) + /// (Originally from ..\FSComp.txt:597) static member tcConstructorRequiresCall(a0 : System.String) = (762, GetStringFunc("tcConstructorRequiresCall",",,,%s,,,") a0) /// The field '%s' has been given a value, but is not present in the type '%s' - /// (Originally from ..\FSComp.txt:596) + /// (Originally from ..\FSComp.txt:598) static member tcUndefinedField(a0 : System.String, a1 : System.String) = (763, GetStringFunc("tcUndefinedField",",,,%s,,,%s,,,") a0 a1) /// No assignment given for field '%s' of type '%s' - /// (Originally from ..\FSComp.txt:597) + /// (Originally from ..\FSComp.txt:599) static member tcFieldRequiresAssignment(a0 : System.String, a1 : System.String) = (764, GetStringFunc("tcFieldRequiresAssignment",",,,%s,,,%s,,,") a0 a1) /// Extraneous fields have been given values - /// (Originally from ..\FSComp.txt:598) + /// (Originally from ..\FSComp.txt:600) static member tcExtraneousFieldsGivenValues() = (765, GetStringFunc("tcExtraneousFieldsGivenValues",",,,") ) /// Only overrides of abstract and virtual members may be specified in object expressions - /// (Originally from ..\FSComp.txt:599) + /// (Originally from ..\FSComp.txt:601) static member tcObjectExpressionsCanOnlyOverrideAbstractOrVirtual() = (766, GetStringFunc("tcObjectExpressionsCanOnlyOverrideAbstractOrVirtual",",,,") ) /// The member '%s' does not correspond to any abstract or virtual method available to override or implement. - /// (Originally from ..\FSComp.txt:600) + /// (Originally from ..\FSComp.txt:602) static member tcNoAbstractOrVirtualMemberFound(a0 : System.String) = (767, GetStringFunc("tcNoAbstractOrVirtualMemberFound",",,,%s,,,") a0) /// The type %s contains the member '%s' but it is not a virtual or abstract method that is available to override or implement. - /// (Originally from ..\FSComp.txt:601) + /// (Originally from ..\FSComp.txt:603) static member tcMemberFoundIsNotAbstractOrVirtual(a0 : System.String, a1 : System.String) = (767, GetStringFunc("tcMemberFoundIsNotAbstractOrVirtual",",,,%s,,,%s,,,") a0 a1) /// The member '%s' does not accept the correct number of arguments. %d argument(s) are expected, but %d were given. The required signature is '%s'.%s - /// (Originally from ..\FSComp.txt:602) + /// (Originally from ..\FSComp.txt:604) static member tcArgumentArityMismatch(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String, a4 : System.String) = (768, GetStringFunc("tcArgumentArityMismatch",",,,%s,,,%d,,,%d,,,%s,,,%s,,,") a0 a1 a2 a3 a4) /// The member '%s' does not accept the correct number of arguments. One overload accepts %d arguments, but %d were given. The required signature is '%s'.%s - /// (Originally from ..\FSComp.txt:603) + /// (Originally from ..\FSComp.txt:605) static member tcArgumentArityMismatchOneOverload(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String, a4 : System.String) = (769, GetStringFunc("tcArgumentArityMismatchOneOverload",",,,%s,,,%d,,,%d,,,%s,,,%s,,,") a0 a1 a2 a3 a4) /// A simple method name is required here - /// (Originally from ..\FSComp.txt:604) + /// (Originally from ..\FSComp.txt:606) static member tcSimpleMethodNameRequired() = (770, GetStringFunc("tcSimpleMethodNameRequired",",,,") ) /// The types System.ValueType, System.Enum, System.Delegate, System.MulticastDelegate and System.Array cannot be used as super types in an object expression or class - /// (Originally from ..\FSComp.txt:605) + /// (Originally from ..\FSComp.txt:607) static member tcPredefinedTypeCannotBeUsedAsSuperType() = (771, GetStringFunc("tcPredefinedTypeCannotBeUsedAsSuperType",",,,") ) /// 'new' must be used with a named type - /// (Originally from ..\FSComp.txt:606) + /// (Originally from ..\FSComp.txt:608) static member tcNewMustBeUsedWithNamedType() = (772, GetStringFunc("tcNewMustBeUsedWithNamedType",",,,") ) /// Cannot create an extension of a sealed type - /// (Originally from ..\FSComp.txt:607) + /// (Originally from ..\FSComp.txt:609) static member tcCannotCreateExtensionOfSealedType() = (773, GetStringFunc("tcCannotCreateExtensionOfSealedType",",,,") ) /// No arguments may be given when constructing a record value - /// (Originally from ..\FSComp.txt:608) + /// (Originally from ..\FSComp.txt:610) static member tcNoArgumentsForRecordValue() = (774, GetStringFunc("tcNoArgumentsForRecordValue",",,,") ) /// Interface implementations cannot be given on construction expressions - /// (Originally from ..\FSComp.txt:609) + /// (Originally from ..\FSComp.txt:611) static member tcNoInterfaceImplementationForConstructionExpression() = (775, GetStringFunc("tcNoInterfaceImplementationForConstructionExpression",",,,") ) /// Object construction expressions may only be used to implement constructors in class types - /// (Originally from ..\FSComp.txt:610) + /// (Originally from ..\FSComp.txt:612) static member tcObjectConstructionCanOnlyBeUsedInClassTypes() = (776, GetStringFunc("tcObjectConstructionCanOnlyBeUsedInClassTypes",",,,") ) /// Only simple bindings of the form 'id = expr' can be used in construction expressions - /// (Originally from ..\FSComp.txt:611) + /// (Originally from ..\FSComp.txt:613) static member tcOnlySimpleBindingsCanBeUsedInConstructionExpressions() = (777, GetStringFunc("tcOnlySimpleBindingsCanBeUsedInConstructionExpressions",",,,") ) /// Objects must be initialized by an object construction expression that calls an inherited object constructor and assigns a value to each field - /// (Originally from ..\FSComp.txt:612) + /// (Originally from ..\FSComp.txt:614) static member tcObjectsMustBeInitializedWithObjectExpression() = (778, GetStringFunc("tcObjectsMustBeInitializedWithObjectExpression",",,,") ) /// Expected an interface type - /// (Originally from ..\FSComp.txt:613) + /// (Originally from ..\FSComp.txt:615) static member tcExpectedInterfaceType() = (779, GetStringFunc("tcExpectedInterfaceType",",,,") ) /// Constructor expressions for interfaces do not take arguments - /// (Originally from ..\FSComp.txt:614) + /// (Originally from ..\FSComp.txt:616) static member tcConstructorForInterfacesDoNotTakeArguments() = (780, GetStringFunc("tcConstructorForInterfacesDoNotTakeArguments",",,,") ) /// This object constructor requires arguments - /// (Originally from ..\FSComp.txt:615) + /// (Originally from ..\FSComp.txt:617) static member tcConstructorRequiresArguments() = (781, GetStringFunc("tcConstructorRequiresArguments",",,,") ) /// 'new' may only be used with object constructors - /// (Originally from ..\FSComp.txt:616) + /// (Originally from ..\FSComp.txt:618) static member tcNewRequiresObjectConstructor() = (782, GetStringFunc("tcNewRequiresObjectConstructor",",,,") ) /// At least one override did not correctly implement its corresponding abstract member - /// (Originally from ..\FSComp.txt:617) + /// (Originally from ..\FSComp.txt:619) static member tcAtLeastOneOverrideIsInvalid() = (783, GetStringFunc("tcAtLeastOneOverrideIsInvalid",",,,") ) /// This numeric literal requires that a module '%s' defining functions FromZero, FromOne, FromInt32, FromInt64 and FromString be in scope - /// (Originally from ..\FSComp.txt:618) + /// (Originally from ..\FSComp.txt:620) static member tcNumericLiteralRequiresModule(a0 : System.String) = (784, GetStringFunc("tcNumericLiteralRequiresModule",",,,%s,,,") a0) /// Invalid record construction - /// (Originally from ..\FSComp.txt:619) + /// (Originally from ..\FSComp.txt:621) static member tcInvalidRecordConstruction() = (785, GetStringFunc("tcInvalidRecordConstruction",",,,") ) /// The expression form { expr with ... } may only be used with record types. To build object types use { new Type(...) with ... } - /// (Originally from ..\FSComp.txt:620) + /// (Originally from ..\FSComp.txt:622) static member tcExpressionFormRequiresRecordTypes() = (786, GetStringFunc("tcExpressionFormRequiresRecordTypes",",,,") ) /// The inherited type is not an object model type - /// (Originally from ..\FSComp.txt:621) + /// (Originally from ..\FSComp.txt:623) static member tcInheritedTypeIsNotObjectModelType() = (787, GetStringFunc("tcInheritedTypeIsNotObjectModelType",",,,") ) /// Object construction expressions (i.e. record expressions with inheritance specifications) may only be used to implement constructors in object model types. Use 'new ObjectType(args)' to construct instances of object model types outside of constructors - /// (Originally from ..\FSComp.txt:622) + /// (Originally from ..\FSComp.txt:624) static member tcObjectConstructionExpressionCanOnlyImplementConstructorsInObjectModelTypes() = (788, GetStringFunc("tcObjectConstructionExpressionCanOnlyImplementConstructorsInObjectModelTypes",",,,") ) /// '{ }' is not a valid expression. Records must include at least one field. Empty sequences are specified by using Seq.empty or an empty list '[]'. - /// (Originally from ..\FSComp.txt:623) + /// (Originally from ..\FSComp.txt:625) static member tcEmptyRecordInvalid() = (789, GetStringFunc("tcEmptyRecordInvalid",",,,") ) /// This type is not a record type. Values of class and struct types must be created using calls to object constructors. - /// (Originally from ..\FSComp.txt:624) + /// (Originally from ..\FSComp.txt:626) static member tcTypeIsNotARecordTypeNeedConstructor() = (790, GetStringFunc("tcTypeIsNotARecordTypeNeedConstructor",",,,") ) /// This type is not a record type - /// (Originally from ..\FSComp.txt:625) + /// (Originally from ..\FSComp.txt:627) static member tcTypeIsNotARecordType() = (791, GetStringFunc("tcTypeIsNotARecordType",",,,") ) /// This construct is ambiguous as part of a computation expression. Nested expressions may be written using 'let _ = (...)' and nested computations using 'let! res = builder { ... }'. - /// (Originally from ..\FSComp.txt:626) + /// (Originally from ..\FSComp.txt:628) static member tcConstructIsAmbiguousInComputationExpression() = (792, GetStringFunc("tcConstructIsAmbiguousInComputationExpression",",,,") ) /// This construct is ambiguous as part of a sequence expression. Nested expressions may be written using 'let _ = (...)' and nested sequences using 'yield! seq {... }'. - /// (Originally from ..\FSComp.txt:627) + /// (Originally from ..\FSComp.txt:629) static member tcConstructIsAmbiguousInSequenceExpression() = (793, GetStringFunc("tcConstructIsAmbiguousInSequenceExpression",",,,") ) /// 'do!' cannot be used within sequence expressions - /// (Originally from ..\FSComp.txt:628) + /// (Originally from ..\FSComp.txt:630) static member tcDoBangIllegalInSequenceExpression() = (794, GetStringFunc("tcDoBangIllegalInSequenceExpression",",,,") ) /// The use of 'let! x = coll' in sequence expressions is not permitted. Use 'for x in coll' instead. - /// (Originally from ..\FSComp.txt:629) + /// (Originally from ..\FSComp.txt:631) static member tcUseForInSequenceExpression() = (795, GetStringFunc("tcUseForInSequenceExpression",",,,") ) /// 'try'/'with' cannot be used within sequence expressions - /// (Originally from ..\FSComp.txt:630) + /// (Originally from ..\FSComp.txt:632) static member tcTryIllegalInSequenceExpression() = (796, GetStringFunc("tcTryIllegalInSequenceExpression",",,,") ) /// In sequence expressions, multiple results are generated using 'yield!' - /// (Originally from ..\FSComp.txt:631) + /// (Originally from ..\FSComp.txt:633) static member tcUseYieldBangForMultipleResults() = (797, GetStringFunc("tcUseYieldBangForMultipleResults",",,,") ) /// Invalid assignment - /// (Originally from ..\FSComp.txt:632) + /// (Originally from ..\FSComp.txt:634) static member tcInvalidAssignment() = (799, GetStringFunc("tcInvalidAssignment",",,,") ) /// Invalid use of a type name - /// (Originally from ..\FSComp.txt:633) + /// (Originally from ..\FSComp.txt:635) static member tcInvalidUseOfTypeName() = (800, GetStringFunc("tcInvalidUseOfTypeName",",,,") ) /// This type has no accessible object constructors - /// (Originally from ..\FSComp.txt:634) + /// (Originally from ..\FSComp.txt:636) static member tcTypeHasNoAccessibleConstructor() = (801, GetStringFunc("tcTypeHasNoAccessibleConstructor",",,,") ) /// Invalid use of an interface type - /// (Originally from ..\FSComp.txt:637) + /// (Originally from ..\FSComp.txt:639) static member tcInvalidUseOfInterfaceType() = (804, GetStringFunc("tcInvalidUseOfInterfaceType",",,,") ) /// Invalid use of a delegate constructor. Use the syntax 'new Type(args)' or just 'Type(args)'. - /// (Originally from ..\FSComp.txt:638) + /// (Originally from ..\FSComp.txt:640) static member tcInvalidUseOfDelegate() = (805, GetStringFunc("tcInvalidUseOfDelegate",",,,") ) /// Property '%s' is not static - /// (Originally from ..\FSComp.txt:639) + /// (Originally from ..\FSComp.txt:641) static member tcPropertyIsNotStatic(a0 : System.String) = (806, GetStringFunc("tcPropertyIsNotStatic",",,,%s,,,") a0) /// Property '%s' is not readable - /// (Originally from ..\FSComp.txt:640) + /// (Originally from ..\FSComp.txt:642) static member tcPropertyIsNotReadable(a0 : System.String) = (807, GetStringFunc("tcPropertyIsNotReadable",",,,%s,,,") a0) /// This lookup cannot be used here - /// (Originally from ..\FSComp.txt:641) + /// (Originally from ..\FSComp.txt:643) static member tcLookupMayNotBeUsedHere() = (808, GetStringFunc("tcLookupMayNotBeUsedHere",",,,") ) /// Property '%s' is static - /// (Originally from ..\FSComp.txt:642) + /// (Originally from ..\FSComp.txt:644) static member tcPropertyIsStatic(a0 : System.String) = (809, GetStringFunc("tcPropertyIsStatic",",,,%s,,,") a0) /// Property '%s' cannot be set - /// (Originally from ..\FSComp.txt:643) + /// (Originally from ..\FSComp.txt:645) static member tcPropertyCannotBeSet1(a0 : System.String) = (810, GetStringFunc("tcPropertyCannotBeSet1",",,,%s,,,") a0) /// Constructors must be applied to arguments and cannot be used as first-class values. If necessary use an anonymous function '(fun arg1 ... argN -> new Type(arg1,...,argN))'. - /// (Originally from ..\FSComp.txt:644) + /// (Originally from ..\FSComp.txt:646) static member tcConstructorsCannotBeFirstClassValues() = (811, GetStringFunc("tcConstructorsCannotBeFirstClassValues",",,,") ) /// The syntax 'expr.id' may only be used with record labels, properties and fields - /// (Originally from ..\FSComp.txt:645) + /// (Originally from ..\FSComp.txt:647) static member tcSyntaxFormUsedOnlyWithRecordLabelsPropertiesAndFields() = (812, GetStringFunc("tcSyntaxFormUsedOnlyWithRecordLabelsPropertiesAndFields",",,,") ) /// Event '%s' is static - /// (Originally from ..\FSComp.txt:646) + /// (Originally from ..\FSComp.txt:648) static member tcEventIsStatic(a0 : System.String) = (813, GetStringFunc("tcEventIsStatic",",,,%s,,,") a0) /// Event '%s' is not static - /// (Originally from ..\FSComp.txt:647) + /// (Originally from ..\FSComp.txt:649) static member tcEventIsNotStatic(a0 : System.String) = (814, GetStringFunc("tcEventIsNotStatic",",,,%s,,,") a0) /// The named argument '%s' did not match any argument or mutable property - /// (Originally from ..\FSComp.txt:648) + /// (Originally from ..\FSComp.txt:650) static member tcNamedArgumentDidNotMatch(a0 : System.String) = (815, GetStringFunc("tcNamedArgumentDidNotMatch",",,,%s,,,") a0) /// One or more of the overloads of this method has curried arguments. Consider redesigning these members to take arguments in tupled form. - /// (Originally from ..\FSComp.txt:649) + /// (Originally from ..\FSComp.txt:651) static member tcOverloadsCannotHaveCurriedArguments() = (816, GetStringFunc("tcOverloadsCannotHaveCurriedArguments",",,,") ) /// The unnamed arguments do not form a prefix of the arguments of the method called - /// (Originally from ..\FSComp.txt:650) + /// (Originally from ..\FSComp.txt:652) static member tcUnnamedArgumentsDoNotFormPrefix() = (GetStringFunc("tcUnnamedArgumentsDoNotFormPrefix",",,,") ) /// Static optimization conditionals are only for use within the F# library - /// (Originally from ..\FSComp.txt:651) + /// (Originally from ..\FSComp.txt:653) static member tcStaticOptimizationConditionalsOnlyForFSharpLibrary() = (817, GetStringFunc("tcStaticOptimizationConditionalsOnlyForFSharpLibrary",",,,") ) /// The corresponding formal argument is not optional - /// (Originally from ..\FSComp.txt:652) + /// (Originally from ..\FSComp.txt:654) static member tcFormalArgumentIsNotOptional() = (818, GetStringFunc("tcFormalArgumentIsNotOptional",",,,") ) /// Invalid optional assignment to a property or field - /// (Originally from ..\FSComp.txt:653) + /// (Originally from ..\FSComp.txt:655) static member tcInvalidOptionalAssignmentToPropertyOrField() = (819, GetStringFunc("tcInvalidOptionalAssignmentToPropertyOrField",",,,") ) /// A delegate constructor must be passed a single function value - /// (Originally from ..\FSComp.txt:654) + /// (Originally from ..\FSComp.txt:656) static member tcDelegateConstructorMustBePassed() = (820, GetStringFunc("tcDelegateConstructorMustBePassed",",,,") ) /// A binding cannot be marked both 'use' and 'rec' - /// (Originally from ..\FSComp.txt:655) + /// (Originally from ..\FSComp.txt:657) static member tcBindingCannotBeUseAndRec() = (821, GetStringFunc("tcBindingCannotBeUseAndRec",",,,") ) /// The 'VolatileField' attribute may only be used on 'let' bindings in classes - /// (Originally from ..\FSComp.txt:656) + /// (Originally from ..\FSComp.txt:658) static member tcVolatileOnlyOnClassLetBindings() = (823, GetStringFunc("tcVolatileOnlyOnClassLetBindings",",,,") ) /// Attributes are not permitted on 'let' bindings in expressions - /// (Originally from ..\FSComp.txt:657) + /// (Originally from ..\FSComp.txt:659) static member tcAttributesAreNotPermittedOnLetBindings() = (824, GetStringFunc("tcAttributesAreNotPermittedOnLetBindings",",,,") ) /// The 'DefaultValue' attribute may only be used on 'val' declarations - /// (Originally from ..\FSComp.txt:658) + /// (Originally from ..\FSComp.txt:660) static member tcDefaultValueAttributeRequiresVal() = (825, GetStringFunc("tcDefaultValueAttributeRequiresVal",",,,") ) /// The 'ConditionalAttribute' attribute may only be used on members - /// (Originally from ..\FSComp.txt:659) + /// (Originally from ..\FSComp.txt:661) static member tcConditionalAttributeRequiresMembers() = (826, GetStringFunc("tcConditionalAttributeRequiresMembers",",,,") ) /// This is not a valid name for an active pattern - /// (Originally from ..\FSComp.txt:660) + /// (Originally from ..\FSComp.txt:662) static member tcInvalidActivePatternName() = (827, GetStringFunc("tcInvalidActivePatternName",",,,") ) /// The 'EntryPointAttribute' attribute may only be used on function definitions in modules - /// (Originally from ..\FSComp.txt:661) + /// (Originally from ..\FSComp.txt:663) static member tcEntryPointAttributeRequiresFunctionInModule() = (828, GetStringFunc("tcEntryPointAttributeRequiresFunctionInModule",",,,") ) /// Mutable values cannot be marked 'inline' - /// (Originally from ..\FSComp.txt:662) + /// (Originally from ..\FSComp.txt:664) static member tcMutableValuesCannotBeInline() = (829, GetStringFunc("tcMutableValuesCannotBeInline",",,,") ) /// Mutable values cannot have generic parameters - /// (Originally from ..\FSComp.txt:663) + /// (Originally from ..\FSComp.txt:665) static member tcMutableValuesMayNotHaveGenericParameters() = (830, GetStringFunc("tcMutableValuesMayNotHaveGenericParameters",",,,") ) /// Mutable function values should be written 'let mutable f = (fun args -> ...)' - /// (Originally from ..\FSComp.txt:664) + /// (Originally from ..\FSComp.txt:666) static member tcMutableValuesSyntax() = (831, GetStringFunc("tcMutableValuesSyntax",",,,") ) /// Only functions may be marked 'inline' - /// (Originally from ..\FSComp.txt:665) + /// (Originally from ..\FSComp.txt:667) static member tcOnlyFunctionsCanBeInline() = (832, GetStringFunc("tcOnlyFunctionsCanBeInline",",,,") ) /// A literal value cannot be given the [] or [] attributes - /// (Originally from ..\FSComp.txt:666) + /// (Originally from ..\FSComp.txt:668) static member tcIllegalAttributesForLiteral() = (833, GetStringFunc("tcIllegalAttributesForLiteral",",,,") ) /// A literal value cannot be marked 'mutable' - /// (Originally from ..\FSComp.txt:667) + /// (Originally from ..\FSComp.txt:669) static member tcLiteralCannotBeMutable() = (834, GetStringFunc("tcLiteralCannotBeMutable",",,,") ) /// A literal value cannot be marked 'inline' - /// (Originally from ..\FSComp.txt:668) + /// (Originally from ..\FSComp.txt:670) static member tcLiteralCannotBeInline() = (835, GetStringFunc("tcLiteralCannotBeInline",",,,") ) /// Literal values cannot have generic parameters - /// (Originally from ..\FSComp.txt:669) + /// (Originally from ..\FSComp.txt:671) static member tcLiteralCannotHaveGenericParameters() = (836, GetStringFunc("tcLiteralCannotHaveGenericParameters",",,,") ) /// This is not a valid constant expression - /// (Originally from ..\FSComp.txt:670) + /// (Originally from ..\FSComp.txt:672) static member tcInvalidConstantExpression() = (837, GetStringFunc("tcInvalidConstantExpression",",,,") ) /// This type is not accessible from this code location - /// (Originally from ..\FSComp.txt:671) + /// (Originally from ..\FSComp.txt:673) static member tcTypeIsInaccessible() = (838, GetStringFunc("tcTypeIsInaccessible",",,,") ) /// Unexpected condition in imported assembly: failed to decode AttributeUsage attribute - /// (Originally from ..\FSComp.txt:672) + /// (Originally from ..\FSComp.txt:674) static member tcUnexpectedConditionInImportedAssembly() = (839, GetStringFunc("tcUnexpectedConditionInImportedAssembly",",,,") ) /// Unrecognized attribute target. Valid attribute targets are 'assembly', 'module', 'type', 'method', 'property', 'return', 'param', 'field', 'event', 'constructor'. - /// (Originally from ..\FSComp.txt:673) + /// (Originally from ..\FSComp.txt:675) static member tcUnrecognizedAttributeTarget() = (840, GetStringFunc("tcUnrecognizedAttributeTarget",",,,") ) /// This attribute is not valid for use on this language element. Assembly attributes should be attached to a 'do ()' declaration, if necessary within an F# module. - /// (Originally from ..\FSComp.txt:674) + /// (Originally from ..\FSComp.txt:676) static member tcAttributeIsNotValidForLanguageElementUseDo() = (841, GetStringFunc("tcAttributeIsNotValidForLanguageElementUseDo",",,,") ) /// This attribute is not valid for use on this language element - /// (Originally from ..\FSComp.txt:675) + /// (Originally from ..\FSComp.txt:677) static member tcAttributeIsNotValidForLanguageElement() = (842, GetStringFunc("tcAttributeIsNotValidForLanguageElement",",,,") ) /// Optional arguments cannot be used in custom attributes - /// (Originally from ..\FSComp.txt:676) + /// (Originally from ..\FSComp.txt:678) static member tcOptionalArgumentsCannotBeUsedInCustomAttribute() = (843, GetStringFunc("tcOptionalArgumentsCannotBeUsedInCustomAttribute",",,,") ) /// This property cannot be set - /// (Originally from ..\FSComp.txt:677) + /// (Originally from ..\FSComp.txt:679) static member tcPropertyCannotBeSet0() = (844, GetStringFunc("tcPropertyCannotBeSet0",",,,") ) /// This property or field was not found on this custom attribute type - /// (Originally from ..\FSComp.txt:678) + /// (Originally from ..\FSComp.txt:680) static member tcPropertyOrFieldNotFoundInAttribute() = (845, GetStringFunc("tcPropertyOrFieldNotFoundInAttribute",",,,") ) /// A custom attribute must be a reference type - /// (Originally from ..\FSComp.txt:679) + /// (Originally from ..\FSComp.txt:681) static member tcCustomAttributeMustBeReferenceType() = (846, GetStringFunc("tcCustomAttributeMustBeReferenceType",",,,") ) /// The number of args for a custom attribute does not match the expected number of args for the attribute constructor - /// (Originally from ..\FSComp.txt:680) + /// (Originally from ..\FSComp.txt:682) static member tcCustomAttributeArgumentMismatch() = (847, GetStringFunc("tcCustomAttributeArgumentMismatch",",,,") ) /// A custom attribute must invoke an object constructor - /// (Originally from ..\FSComp.txt:681) + /// (Originally from ..\FSComp.txt:683) static member tcCustomAttributeMustInvokeConstructor() = (848, GetStringFunc("tcCustomAttributeMustInvokeConstructor",",,,") ) /// Attribute expressions must be calls to object constructors - /// (Originally from ..\FSComp.txt:682) + /// (Originally from ..\FSComp.txt:684) static member tcAttributeExpressionsMustBeConstructorCalls() = (849, GetStringFunc("tcAttributeExpressionsMustBeConstructorCalls",",,,") ) /// This attribute cannot be used in this version of F# - /// (Originally from ..\FSComp.txt:683) + /// (Originally from ..\FSComp.txt:685) static member tcUnsupportedAttribute() = (850, GetStringFunc("tcUnsupportedAttribute",",,,") ) /// Invalid inline specification - /// (Originally from ..\FSComp.txt:684) + /// (Originally from ..\FSComp.txt:686) static member tcInvalidInlineSpecification() = (851, GetStringFunc("tcInvalidInlineSpecification",",,,") ) /// 'use' bindings must be of the form 'use = ' - /// (Originally from ..\FSComp.txt:685) + /// (Originally from ..\FSComp.txt:687) static member tcInvalidUseBinding() = (852, GetStringFunc("tcInvalidUseBinding",",,,") ) /// Abstract members are not permitted in an augmentation - they must be defined as part of the type itself - /// (Originally from ..\FSComp.txt:686) + /// (Originally from ..\FSComp.txt:688) static member tcAbstractMembersIllegalInAugmentation() = (853, GetStringFunc("tcAbstractMembersIllegalInAugmentation",",,,") ) /// Method overrides and interface implementations are not permitted here - /// (Originally from ..\FSComp.txt:687) + /// (Originally from ..\FSComp.txt:689) static member tcMethodOverridesIllegalHere() = (854, GetStringFunc("tcMethodOverridesIllegalHere",",,,") ) /// No abstract or interface member was found that corresponds to this override - /// (Originally from ..\FSComp.txt:688) + /// (Originally from ..\FSComp.txt:690) static member tcNoMemberFoundForOverride() = (855, GetStringFunc("tcNoMemberFoundForOverride",",,,") ) /// This override takes a different number of arguments to the corresponding abstract member. The following abstract members were found:%s - /// (Originally from ..\FSComp.txt:689) + /// (Originally from ..\FSComp.txt:691) static member tcOverrideArityMismatch(a0 : System.String) = (856, GetStringFunc("tcOverrideArityMismatch",",,,%s,,,") a0) /// This method already has a default implementation - /// (Originally from ..\FSComp.txt:690) + /// (Originally from ..\FSComp.txt:692) static member tcDefaultImplementationAlreadyExists() = (857, GetStringFunc("tcDefaultImplementationAlreadyExists",",,,") ) /// The method implemented by this default is ambiguous - /// (Originally from ..\FSComp.txt:691) + /// (Originally from ..\FSComp.txt:693) static member tcDefaultAmbiguous() = (858, GetStringFunc("tcDefaultAmbiguous",",,,") ) /// No abstract property was found that corresponds to this override - /// (Originally from ..\FSComp.txt:692) + /// (Originally from ..\FSComp.txt:694) static member tcNoPropertyFoundForOverride() = (859, GetStringFunc("tcNoPropertyFoundForOverride",",,,") ) /// This property overrides or implements an abstract property but the abstract property doesn't have a corresponding %s - /// (Originally from ..\FSComp.txt:693) + /// (Originally from ..\FSComp.txt:695) static member tcAbstractPropertyMissingGetOrSet(a0 : System.String) = (860, GetStringFunc("tcAbstractPropertyMissingGetOrSet",",,,%s,,,") a0) /// Invalid signature for set member - /// (Originally from ..\FSComp.txt:694) + /// (Originally from ..\FSComp.txt:696) static member tcInvalidSignatureForSet() = (861, GetStringFunc("tcInvalidSignatureForSet",",,,") ) /// This new member hides the abstract member '%s'. Rename the member or use 'override' instead. - /// (Originally from ..\FSComp.txt:695) + /// (Originally from ..\FSComp.txt:697) static member tcNewMemberHidesAbstractMember(a0 : System.String) = (864, GetStringFunc("tcNewMemberHidesAbstractMember",",,,%s,,,") a0) /// This new member hides the abstract member '%s' once tuples, functions, units of measure and/or provided types are erased. Rename the member or use 'override' instead. - /// (Originally from ..\FSComp.txt:696) + /// (Originally from ..\FSComp.txt:698) static member tcNewMemberHidesAbstractMemberWithSuffix(a0 : System.String) = (864, GetStringFunc("tcNewMemberHidesAbstractMemberWithSuffix",",,,%s,,,") a0) /// Interfaces cannot contain definitions of static initializers - /// (Originally from ..\FSComp.txt:697) + /// (Originally from ..\FSComp.txt:699) static member tcStaticInitializersIllegalInInterface() = (865, GetStringFunc("tcStaticInitializersIllegalInInterface",",,,") ) /// Interfaces cannot contain definitions of object constructors - /// (Originally from ..\FSComp.txt:698) + /// (Originally from ..\FSComp.txt:700) static member tcObjectConstructorsIllegalInInterface() = (866, GetStringFunc("tcObjectConstructorsIllegalInInterface",",,,") ) /// Interfaces cannot contain definitions of member overrides - /// (Originally from ..\FSComp.txt:699) + /// (Originally from ..\FSComp.txt:701) static member tcMemberOverridesIllegalInInterface() = (867, GetStringFunc("tcMemberOverridesIllegalInInterface",",,,") ) /// Interfaces cannot contain definitions of concrete members. You may need to define a constructor on your type to indicate that the type is a class. - /// (Originally from ..\FSComp.txt:700) + /// (Originally from ..\FSComp.txt:702) static member tcConcreteMembersIllegalInInterface() = (868, GetStringFunc("tcConcreteMembersIllegalInInterface",",,,") ) /// Constructors cannot be specified in exception augmentations - /// (Originally from ..\FSComp.txt:701) + /// (Originally from ..\FSComp.txt:703) static member tcConstructorsDisallowedInExceptionAugmentation() = (869, GetStringFunc("tcConstructorsDisallowedInExceptionAugmentation",",,,") ) /// Structs cannot have an object constructor with no arguments. This is a restriction imposed on all CLI languages as structs automatically support a default constructor. - /// (Originally from ..\FSComp.txt:702) + /// (Originally from ..\FSComp.txt:704) static member tcStructsCannotHaveConstructorWithNoArguments() = (870, GetStringFunc("tcStructsCannotHaveConstructorWithNoArguments",",,,") ) /// Constructors cannot be defined for this type - /// (Originally from ..\FSComp.txt:703) + /// (Originally from ..\FSComp.txt:705) static member tcConstructorsIllegalForThisType() = (871, GetStringFunc("tcConstructorsIllegalForThisType",",,,") ) /// Recursive bindings that include member specifications can only occur as a direct augmentation of a type - /// (Originally from ..\FSComp.txt:704) + /// (Originally from ..\FSComp.txt:706) static member tcRecursiveBindingsWithMembersMustBeDirectAugmentation() = (872, GetStringFunc("tcRecursiveBindingsWithMembersMustBeDirectAugmentation",",,,") ) /// Only simple variable patterns can be bound in 'let rec' constructs - /// (Originally from ..\FSComp.txt:705) + /// (Originally from ..\FSComp.txt:707) static member tcOnlySimplePatternsInLetRec() = (873, GetStringFunc("tcOnlySimplePatternsInLetRec",",,,") ) /// Only record fields and simple, non-recursive 'let' bindings may be marked mutable - /// (Originally from ..\FSComp.txt:706) + /// (Originally from ..\FSComp.txt:708) static member tcOnlyRecordFieldsAndSimpleLetCanBeMutable() = (874, GetStringFunc("tcOnlyRecordFieldsAndSimpleLetCanBeMutable",",,,") ) /// This member is not sufficiently generic - /// (Originally from ..\FSComp.txt:707) + /// (Originally from ..\FSComp.txt:709) static member tcMemberIsNotSufficientlyGeneric() = (875, GetStringFunc("tcMemberIsNotSufficientlyGeneric",",,,") ) /// A declaration may only be the [] attribute if a constant value is also given, e.g. 'val x : int = 1' - /// (Originally from ..\FSComp.txt:708) + /// (Originally from ..\FSComp.txt:710) static member tcLiteralAttributeRequiresConstantValue() = (876, GetStringFunc("tcLiteralAttributeRequiresConstantValue",",,,") ) /// A declaration may only be given a value in a signature if the declaration has the [] attribute - /// (Originally from ..\FSComp.txt:709) + /// (Originally from ..\FSComp.txt:711) static member tcValueInSignatureRequiresLiteralAttribute() = (877, GetStringFunc("tcValueInSignatureRequiresLiteralAttribute",",,,") ) /// Thread-static and context-static variables must be static and given the [] attribute to indicate that the value is initialized to the default value on each new thread - /// (Originally from ..\FSComp.txt:710) + /// (Originally from ..\FSComp.txt:712) static member tcThreadStaticAndContextStaticMustBeStatic() = (878, GetStringFunc("tcThreadStaticAndContextStaticMustBeStatic",",,,") ) /// Volatile fields must be marked 'mutable' and cannot be thread-static - /// (Originally from ..\FSComp.txt:711) + /// (Originally from ..\FSComp.txt:713) static member tcVolatileFieldsMustBeMutable() = (879, GetStringFunc("tcVolatileFieldsMustBeMutable",",,,") ) /// Uninitialized 'val' fields must be mutable and marked with the '[]' attribute. Consider using a 'let' binding instead of a 'val' field. - /// (Originally from ..\FSComp.txt:712) + /// (Originally from ..\FSComp.txt:714) static member tcUninitializedValFieldsMustBeMutable() = (880, GetStringFunc("tcUninitializedValFieldsMustBeMutable",",,,") ) /// Static 'val' fields in types must be mutable, private and marked with the '[]' attribute. They are initialized to the 'null' or 'zero' value for their type. Consider also using a 'static let mutable' binding in a class type. - /// (Originally from ..\FSComp.txt:713) + /// (Originally from ..\FSComp.txt:715) static member tcStaticValFieldsMustBeMutableAndPrivate() = (881, GetStringFunc("tcStaticValFieldsMustBeMutableAndPrivate",",,,") ) /// This field requires a name - /// (Originally from ..\FSComp.txt:714) + /// (Originally from ..\FSComp.txt:716) static member tcFieldRequiresName() = (882, GetStringFunc("tcFieldRequiresName",",,,") ) /// Invalid namespace, module, type or union case name - /// (Originally from ..\FSComp.txt:715) + /// (Originally from ..\FSComp.txt:717) static member tcInvalidNamespaceModuleTypeUnionName() = (883, GetStringFunc("tcInvalidNamespaceModuleTypeUnionName",",,,") ) /// Explicit type declarations for constructors must be of the form 'ty1 * ... * tyN -> resTy'. Parentheses may be required around 'resTy' - /// (Originally from ..\FSComp.txt:716) + /// (Originally from ..\FSComp.txt:718) static member tcIllegalFormForExplicitTypeDeclaration() = (884, GetStringFunc("tcIllegalFormForExplicitTypeDeclaration",",,,") ) /// Return types of union cases must be identical to the type being defined, up to abbreviations - /// (Originally from ..\FSComp.txt:717) + /// (Originally from ..\FSComp.txt:719) static member tcReturnTypesForUnionMustBeSameAsType() = (885, GetStringFunc("tcReturnTypesForUnionMustBeSameAsType",",,,") ) /// This is not a valid value for an enumeration literal - /// (Originally from ..\FSComp.txt:718) + /// (Originally from ..\FSComp.txt:720) static member tcInvalidEnumerationLiteral() = (886, GetStringFunc("tcInvalidEnumerationLiteral",",,,") ) /// The type '%s' is not an interface type - /// (Originally from ..\FSComp.txt:719) + /// (Originally from ..\FSComp.txt:721) static member tcTypeIsNotInterfaceType1(a0 : System.String) = (887, GetStringFunc("tcTypeIsNotInterfaceType1",",,,%s,,,") a0) /// Duplicate specification of an interface - /// (Originally from ..\FSComp.txt:720) + /// (Originally from ..\FSComp.txt:722) static member tcDuplicateSpecOfInterface() = (888, GetStringFunc("tcDuplicateSpecOfInterface",",,,") ) /// A field/val declaration is not permitted here - /// (Originally from ..\FSComp.txt:721) + /// (Originally from ..\FSComp.txt:723) static member tcFieldValIllegalHere() = (889, GetStringFunc("tcFieldValIllegalHere",",,,") ) /// A inheritance declaration is not permitted here - /// (Originally from ..\FSComp.txt:722) + /// (Originally from ..\FSComp.txt:724) static member tcInheritIllegalHere() = (890, GetStringFunc("tcInheritIllegalHere",",,,") ) /// This declaration opens the module '%s', which is marked as 'RequireQualifiedAccess'. Adjust your code to use qualified references to the elements of the module instead, e.g. 'List.map' instead of 'map'. This change will ensure that your code is robust as new constructs are added to libraries. - /// (Originally from ..\FSComp.txt:723) + /// (Originally from ..\FSComp.txt:725) static member tcModuleRequiresQualifiedAccess(a0 : System.String) = (892, GetStringFunc("tcModuleRequiresQualifiedAccess",",,,%s,,,") a0) /// This declaration opens the namespace or module '%s' through a partially qualified path. Adjust this code to use the full path of the namespace. This change will make your code more robust as new constructs are added to the F# and CLI libraries. - /// (Originally from ..\FSComp.txt:724) + /// (Originally from ..\FSComp.txt:726) static member tcOpenUsedWithPartiallyQualifiedPath(a0 : System.String) = (893, GetStringFunc("tcOpenUsedWithPartiallyQualifiedPath",",,,%s,,,") a0) /// Local class bindings cannot be marked inline. Consider lifting the definition out of the class or else do not mark it as inline. - /// (Originally from ..\FSComp.txt:725) + /// (Originally from ..\FSComp.txt:727) static member tcLocalClassBindingsCannotBeInline() = (894, GetStringFunc("tcLocalClassBindingsCannotBeInline",",,,") ) /// Type abbreviations cannot have members - /// (Originally from ..\FSComp.txt:726) + /// (Originally from ..\FSComp.txt:728) static member tcTypeAbbreviationsMayNotHaveMembers() = (895, GetStringFunc("tcTypeAbbreviationsMayNotHaveMembers",",,,") ) /// As of F# 4.1, the accessibility of type abbreviations is checked at compile-time. Consider changing the accessibility of the type abbreviation. Ignoring this warning might lead to runtime errors. - /// (Originally from ..\FSComp.txt:727) + /// (Originally from ..\FSComp.txt:729) static member tcTypeAbbreviationsCheckedAtCompileTime() = (GetStringFunc("tcTypeAbbreviationsCheckedAtCompileTime",",,,") ) /// Enumerations cannot have members - /// (Originally from ..\FSComp.txt:728) + /// (Originally from ..\FSComp.txt:730) static member tcEnumerationsMayNotHaveMembers() = (896, GetStringFunc("tcEnumerationsMayNotHaveMembers",",,,") ) /// Measure declarations may have only static members - /// (Originally from ..\FSComp.txt:729) + /// (Originally from ..\FSComp.txt:731) static member tcMeasureDeclarationsRequireStaticMembers() = (897, GetStringFunc("tcMeasureDeclarationsRequireStaticMembers",",,,") ) /// Structs cannot contain 'do' bindings because the default constructor for structs would not execute these bindings - /// (Originally from ..\FSComp.txt:730) + /// (Originally from ..\FSComp.txt:732) static member tcStructsMayNotContainDoBindings() = (GetStringFunc("tcStructsMayNotContainDoBindings",",,,") ) /// Structs cannot contain value definitions because the default constructor for structs will not execute these bindings. Consider adding additional arguments to the primary constructor for the type. - /// (Originally from ..\FSComp.txt:731) + /// (Originally from ..\FSComp.txt:733) static member tcStructsMayNotContainLetBindings() = (901, GetStringFunc("tcStructsMayNotContainLetBindings",",,,") ) /// Static value definitions may only be used in types with a primary constructor. Consider adding arguments to the type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:732) + /// (Originally from ..\FSComp.txt:734) static member tcStaticLetBindingsRequireClassesWithImplicitConstructors() = (902, GetStringFunc("tcStaticLetBindingsRequireClassesWithImplicitConstructors",",,,") ) /// Measure declarations may have only static members: constructors are not available - /// (Originally from ..\FSComp.txt:733) + /// (Originally from ..\FSComp.txt:735) static member tcMeasureDeclarationsRequireStaticMembersNotConstructors() = (904, GetStringFunc("tcMeasureDeclarationsRequireStaticMembersNotConstructors",",,,") ) /// A member and a local class binding both have the name '%s' - /// (Originally from ..\FSComp.txt:734) + /// (Originally from ..\FSComp.txt:736) static member tcMemberAndLocalClassBindingHaveSameName(a0 : System.String) = (905, GetStringFunc("tcMemberAndLocalClassBindingHaveSameName",",,,%s,,,") a0) /// Type abbreviations cannot have interface declarations - /// (Originally from ..\FSComp.txt:735) + /// (Originally from ..\FSComp.txt:737) static member tcTypeAbbreviationsCannotHaveInterfaceDeclaration() = (906, GetStringFunc("tcTypeAbbreviationsCannotHaveInterfaceDeclaration",",,,") ) /// Enumerations cannot have interface declarations - /// (Originally from ..\FSComp.txt:736) + /// (Originally from ..\FSComp.txt:738) static member tcEnumerationsCannotHaveInterfaceDeclaration() = (907, GetStringFunc("tcEnumerationsCannotHaveInterfaceDeclaration",",,,") ) /// This type is not an interface type - /// (Originally from ..\FSComp.txt:737) + /// (Originally from ..\FSComp.txt:739) static member tcTypeIsNotInterfaceType0() = (908, GetStringFunc("tcTypeIsNotInterfaceType0",",,,") ) /// All implemented interfaces should be declared on the initial declaration of the type - /// (Originally from ..\FSComp.txt:738) + /// (Originally from ..\FSComp.txt:740) static member tcAllImplementedInterfacesShouldBeDeclared() = (909, GetStringFunc("tcAllImplementedInterfacesShouldBeDeclared",",,,") ) /// A default implementation of this interface has already been added because the explicit implementation of the interface was not specified at the definition of the type - /// (Originally from ..\FSComp.txt:739) + /// (Originally from ..\FSComp.txt:741) static member tcDefaultImplementationForInterfaceHasAlreadyBeenAdded() = (910, GetStringFunc("tcDefaultImplementationForInterfaceHasAlreadyBeenAdded",",,,") ) /// This member is not permitted in an interface implementation - /// (Originally from ..\FSComp.txt:740) + /// (Originally from ..\FSComp.txt:742) static member tcMemberNotPermittedInInterfaceImplementation() = (911, GetStringFunc("tcMemberNotPermittedInInterfaceImplementation",",,,") ) /// This declaration element is not permitted in an augmentation - /// (Originally from ..\FSComp.txt:741) + /// (Originally from ..\FSComp.txt:743) static member tcDeclarationElementNotPermittedInAugmentation() = (912, GetStringFunc("tcDeclarationElementNotPermittedInAugmentation",",,,") ) /// Types cannot contain nested type definitions - /// (Originally from ..\FSComp.txt:742) + /// (Originally from ..\FSComp.txt:744) static member tcTypesCannotContainNestedTypes() = (913, GetStringFunc("tcTypesCannotContainNestedTypes",",,,") ) /// type, exception or module - /// (Originally from ..\FSComp.txt:743) + /// (Originally from ..\FSComp.txt:745) static member tcTypeExceptionOrModule() = (GetStringFunc("tcTypeExceptionOrModule",",,,") ) /// type or module - /// (Originally from ..\FSComp.txt:744) + /// (Originally from ..\FSComp.txt:746) static member tcTypeOrModule() = (GetStringFunc("tcTypeOrModule",",,,") ) /// The struct, record or union type '%s' implements the interface 'System.IStructuralEquatable' explicitly. Apply the 'CustomEquality' attribute to the type. - /// (Originally from ..\FSComp.txt:745) + /// (Originally from ..\FSComp.txt:747) static member tcImplementsIStructuralEquatableExplicitly(a0 : System.String) = (914, GetStringFunc("tcImplementsIStructuralEquatableExplicitly",",,,%s,,,") a0) /// The struct, record or union type '%s' implements the interface 'System.IEquatable<_>' explicitly. Apply the 'CustomEquality' attribute to the type and provide a consistent implementation of the non-generic override 'System.Object.Equals(obj)'. - /// (Originally from ..\FSComp.txt:746) + /// (Originally from ..\FSComp.txt:748) static member tcImplementsIEquatableExplicitly(a0 : System.String) = (915, GetStringFunc("tcImplementsIEquatableExplicitly",",,,%s,,,") a0) /// Explicit type specifications cannot be used for exception constructors - /// (Originally from ..\FSComp.txt:747) + /// (Originally from ..\FSComp.txt:749) static member tcExplicitTypeSpecificationCannotBeUsedForExceptionConstructors() = (916, GetStringFunc("tcExplicitTypeSpecificationCannotBeUsedForExceptionConstructors",",,,") ) /// Exception abbreviations should not have argument lists - /// (Originally from ..\FSComp.txt:748) + /// (Originally from ..\FSComp.txt:750) static member tcExceptionAbbreviationsShouldNotHaveArgumentList() = (917, GetStringFunc("tcExceptionAbbreviationsShouldNotHaveArgumentList",",,,") ) /// Abbreviations for Common IL exceptions cannot take arguments - /// (Originally from ..\FSComp.txt:749) + /// (Originally from ..\FSComp.txt:751) static member tcAbbreviationsFordotNetExceptionsCannotTakeArguments() = (918, GetStringFunc("tcAbbreviationsFordotNetExceptionsCannotTakeArguments",",,,") ) /// Exception abbreviations must refer to existing exceptions or F# types deriving from System.Exception - /// (Originally from ..\FSComp.txt:750) + /// (Originally from ..\FSComp.txt:752) static member tcExceptionAbbreviationsMustReferToValidExceptions() = (919, GetStringFunc("tcExceptionAbbreviationsMustReferToValidExceptions",",,,") ) /// Abbreviations for Common IL exception types must have a matching object constructor - /// (Originally from ..\FSComp.txt:751) + /// (Originally from ..\FSComp.txt:753) static member tcAbbreviationsFordotNetExceptionsMustHaveMatchingObjectConstructor() = (920, GetStringFunc("tcAbbreviationsFordotNetExceptionsMustHaveMatchingObjectConstructor",",,,") ) /// Not an exception - /// (Originally from ..\FSComp.txt:752) + /// (Originally from ..\FSComp.txt:754) static member tcNotAnException() = (921, GetStringFunc("tcNotAnException",",,,") ) /// Invalid module name - /// (Originally from ..\FSComp.txt:754) + /// (Originally from ..\FSComp.txt:756) static member tcInvalidModuleName() = (924, GetStringFunc("tcInvalidModuleName",",,,") ) /// Invalid type extension - /// (Originally from ..\FSComp.txt:755) + /// (Originally from ..\FSComp.txt:757) static member tcInvalidTypeExtension() = (925, GetStringFunc("tcInvalidTypeExtension",",,,") ) /// The attributes of this type specify multiple kinds for the type - /// (Originally from ..\FSComp.txt:756) + /// (Originally from ..\FSComp.txt:758) static member tcAttributesOfTypeSpecifyMultipleKindsForType() = (926, GetStringFunc("tcAttributesOfTypeSpecifyMultipleKindsForType",",,,") ) /// The kind of the type specified by its attributes does not match the kind implied by its definition - /// (Originally from ..\FSComp.txt:757) + /// (Originally from ..\FSComp.txt:759) static member tcKindOfTypeSpecifiedDoesNotMatchDefinition() = (927, GetStringFunc("tcKindOfTypeSpecifiedDoesNotMatchDefinition",",,,") ) /// Measure definitions cannot have type parameters - /// (Originally from ..\FSComp.txt:758) + /// (Originally from ..\FSComp.txt:760) static member tcMeasureDefinitionsCannotHaveTypeParameters() = (928, GetStringFunc("tcMeasureDefinitionsCannotHaveTypeParameters",",,,") ) /// This type requires a definition - /// (Originally from ..\FSComp.txt:759) + /// (Originally from ..\FSComp.txt:761) static member tcTypeRequiresDefinition() = (929, GetStringFunc("tcTypeRequiresDefinition",",,,") ) /// This type abbreviation has one or more declared type parameters that do not appear in the type being abbreviated. Type abbreviations must use all declared type parameters in the type being abbreviated. Consider removing one or more type parameters, or use a concrete type definition that wraps an underlying type, such as 'type C<'a> = C of ...'. - /// (Originally from ..\FSComp.txt:760) + /// (Originally from ..\FSComp.txt:762) static member tcTypeAbbreviationHasTypeParametersMissingOnType() = (GetStringFunc("tcTypeAbbreviationHasTypeParametersMissingOnType",",,,") ) /// Structs, interfaces, enums and delegates cannot inherit from other types - /// (Originally from ..\FSComp.txt:761) + /// (Originally from ..\FSComp.txt:763) static member tcStructsInterfacesEnumsDelegatesMayNotInheritFromOtherTypes() = (931, GetStringFunc("tcStructsInterfacesEnumsDelegatesMayNotInheritFromOtherTypes",",,,") ) /// Types cannot inherit from multiple concrete types - /// (Originally from ..\FSComp.txt:762) + /// (Originally from ..\FSComp.txt:764) static member tcTypesCannotInheritFromMultipleConcreteTypes() = (932, GetStringFunc("tcTypesCannotInheritFromMultipleConcreteTypes",",,,") ) /// Records, union, abbreviations and struct types cannot have the 'AllowNullLiteral' attribute - /// (Originally from ..\FSComp.txt:763) + /// (Originally from ..\FSComp.txt:765) static member tcRecordsUnionsAbbreviationsStructsMayNotHaveAllowNullLiteralAttribute() = (934, GetStringFunc("tcRecordsUnionsAbbreviationsStructsMayNotHaveAllowNullLiteralAttribute",",,,") ) /// Types with the 'AllowNullLiteral' attribute may only inherit from or implement types which also allow the use of the null literal - /// (Originally from ..\FSComp.txt:764) + /// (Originally from ..\FSComp.txt:766) static member tcAllowNullTypesMayOnlyInheritFromAllowNullTypes() = (935, GetStringFunc("tcAllowNullTypesMayOnlyInheritFromAllowNullTypes",",,,") ) /// Generic types cannot be given the 'StructLayout' attribute - /// (Originally from ..\FSComp.txt:765) + /// (Originally from ..\FSComp.txt:767) static member tcGenericTypesCannotHaveStructLayout() = (936, GetStringFunc("tcGenericTypesCannotHaveStructLayout",",,,") ) /// Only structs and classes without primary constructors may be given the 'StructLayout' attribute - /// (Originally from ..\FSComp.txt:766) + /// (Originally from ..\FSComp.txt:768) static member tcOnlyStructsCanHaveStructLayout() = (937, GetStringFunc("tcOnlyStructsCanHaveStructLayout",",,,") ) /// The representation of this type is hidden by the signature. It must be given an attribute such as [], [] or [] to indicate the characteristics of the type. - /// (Originally from ..\FSComp.txt:767) + /// (Originally from ..\FSComp.txt:769) static member tcRepresentationOfTypeHiddenBySignature() = (938, GetStringFunc("tcRepresentationOfTypeHiddenBySignature",",,,") ) /// Only classes may be given the 'AbstractClass' attribute - /// (Originally from ..\FSComp.txt:768) + /// (Originally from ..\FSComp.txt:770) static member tcOnlyClassesCanHaveAbstract() = (939, GetStringFunc("tcOnlyClassesCanHaveAbstract",",,,") ) /// Only types representing units-of-measure may be given the 'Measure' attribute - /// (Originally from ..\FSComp.txt:769) + /// (Originally from ..\FSComp.txt:771) static member tcOnlyTypesRepresentingUnitsOfMeasureCanHaveMeasure() = (940, GetStringFunc("tcOnlyTypesRepresentingUnitsOfMeasureCanHaveMeasure",",,,") ) /// Accessibility modifiers are not permitted on overrides or interface implementations - /// (Originally from ..\FSComp.txt:770) + /// (Originally from ..\FSComp.txt:772) static member tcOverridesCannotHaveVisibilityDeclarations() = (941, GetStringFunc("tcOverridesCannotHaveVisibilityDeclarations",",,,") ) /// Discriminated union types are always sealed - /// (Originally from ..\FSComp.txt:771) + /// (Originally from ..\FSComp.txt:773) static member tcTypesAreAlwaysSealedDU() = (942, GetStringFunc("tcTypesAreAlwaysSealedDU",",,,") ) /// Record types are always sealed - /// (Originally from ..\FSComp.txt:772) + /// (Originally from ..\FSComp.txt:774) static member tcTypesAreAlwaysSealedRecord() = (942, GetStringFunc("tcTypesAreAlwaysSealedRecord",",,,") ) /// Assembly code types are always sealed - /// (Originally from ..\FSComp.txt:773) + /// (Originally from ..\FSComp.txt:775) static member tcTypesAreAlwaysSealedAssemblyCode() = (942, GetStringFunc("tcTypesAreAlwaysSealedAssemblyCode",",,,") ) /// Struct types are always sealed - /// (Originally from ..\FSComp.txt:774) + /// (Originally from ..\FSComp.txt:776) static member tcTypesAreAlwaysSealedStruct() = (942, GetStringFunc("tcTypesAreAlwaysSealedStruct",",,,") ) /// Delegate types are always sealed - /// (Originally from ..\FSComp.txt:775) + /// (Originally from ..\FSComp.txt:777) static member tcTypesAreAlwaysSealedDelegate() = (942, GetStringFunc("tcTypesAreAlwaysSealedDelegate",",,,") ) /// Enum types are always sealed - /// (Originally from ..\FSComp.txt:776) + /// (Originally from ..\FSComp.txt:778) static member tcTypesAreAlwaysSealedEnum() = (942, GetStringFunc("tcTypesAreAlwaysSealedEnum",",,,") ) /// Interface types and delegate types cannot contain fields - /// (Originally from ..\FSComp.txt:777) + /// (Originally from ..\FSComp.txt:779) static member tcInterfaceTypesAndDelegatesCannotContainFields() = (943, GetStringFunc("tcInterfaceTypesAndDelegatesCannotContainFields",",,,") ) /// Abbreviated types cannot be given the 'Sealed' attribute - /// (Originally from ..\FSComp.txt:778) + /// (Originally from ..\FSComp.txt:780) static member tcAbbreviatedTypesCannotBeSealed() = (944, GetStringFunc("tcAbbreviatedTypesCannotBeSealed",",,,") ) /// Cannot inherit a sealed type - /// (Originally from ..\FSComp.txt:779) + /// (Originally from ..\FSComp.txt:781) static member tcCannotInheritFromSealedType() = (945, GetStringFunc("tcCannotInheritFromSealedType",",,,") ) /// Cannot inherit from interface type. Use interface ... with instead. - /// (Originally from ..\FSComp.txt:780) + /// (Originally from ..\FSComp.txt:782) static member tcCannotInheritFromInterfaceType() = (946, GetStringFunc("tcCannotInheritFromInterfaceType",",,,") ) /// Struct types cannot contain abstract members - /// (Originally from ..\FSComp.txt:781) + /// (Originally from ..\FSComp.txt:783) static member tcStructTypesCannotContainAbstractMembers() = (947, GetStringFunc("tcStructTypesCannotContainAbstractMembers",",,,") ) /// Interface types cannot be sealed - /// (Originally from ..\FSComp.txt:782) + /// (Originally from ..\FSComp.txt:784) static member tcInterfaceTypesCannotBeSealed() = (948, GetStringFunc("tcInterfaceTypesCannotBeSealed",",,,") ) /// Delegate specifications must be of the form 'typ -> typ' - /// (Originally from ..\FSComp.txt:783) + /// (Originally from ..\FSComp.txt:785) static member tcInvalidDelegateSpecification() = (949, GetStringFunc("tcInvalidDelegateSpecification",",,,") ) /// Delegate specifications must not be curried types. Use 'typ * ... * typ -> typ' for multi-argument delegates, and 'typ -> (typ -> typ)' for delegates returning function values. - /// (Originally from ..\FSComp.txt:784) + /// (Originally from ..\FSComp.txt:786) static member tcDelegatesCannotBeCurried() = (950, GetStringFunc("tcDelegatesCannotBeCurried",",,,") ) /// Literal enumerations must have type int, uint, int16, uint16, int64, uint64, byte, sbyte or char - /// (Originally from ..\FSComp.txt:785) + /// (Originally from ..\FSComp.txt:787) static member tcInvalidTypeForLiteralEnumeration() = (951, GetStringFunc("tcInvalidTypeForLiteralEnumeration",",,,") ) /// This type definition involves an immediate cyclic reference through an abbreviation - /// (Originally from ..\FSComp.txt:787) + /// (Originally from ..\FSComp.txt:789) static member tcTypeDefinitionIsCyclic() = (953, GetStringFunc("tcTypeDefinitionIsCyclic",",,,") ) /// This type definition involves an immediate cyclic reference through a struct field or inheritance relation - /// (Originally from ..\FSComp.txt:788) + /// (Originally from ..\FSComp.txt:790) static member tcTypeDefinitionIsCyclicThroughInheritance() = (954, GetStringFunc("tcTypeDefinitionIsCyclicThroughInheritance",",,,") ) /// The syntax 'type X with ...' is reserved for augmentations. Types whose representations are hidden but which have members are now declared in signatures using 'type X = ...'. You may also need to add the '[] attribute to the type definition in the signature - /// (Originally from ..\FSComp.txt:789) + /// (Originally from ..\FSComp.txt:791) static member tcReservedSyntaxForAugmentation() = (GetStringFunc("tcReservedSyntaxForAugmentation",",,,") ) /// Members that extend interface, delegate or enum types must be placed in a module separate to the definition of the type. This module must either have the AutoOpen attribute or be opened explicitly by client code to bring the extension members into scope. - /// (Originally from ..\FSComp.txt:790) + /// (Originally from ..\FSComp.txt:792) static member tcMembersThatExtendInterfaceMustBePlacedInSeparateModule() = (956, GetStringFunc("tcMembersThatExtendInterfaceMustBePlacedInSeparateModule",",,,") ) /// One or more of the declared type parameters for this type extension have a missing or wrong type constraint not matching the original type constraints on '%s' - /// (Originally from ..\FSComp.txt:791) + /// (Originally from ..\FSComp.txt:793) static member tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(a0 : System.String) = (957, GetStringFunc("tcDeclaredTypeParametersForExtensionDoNotMatchOriginal",",,,%s,,,") a0) /// Type definitions may only have one 'inherit' specification and it must be the first declaration - /// (Originally from ..\FSComp.txt:792) + /// (Originally from ..\FSComp.txt:794) static member tcTypeDefinitionsWithImplicitConstructionMustHaveOneInherit() = (959, GetStringFunc("tcTypeDefinitionsWithImplicitConstructionMustHaveOneInherit",",,,") ) /// 'let' and 'do' bindings must come before member and interface definitions in type definitions - /// (Originally from ..\FSComp.txt:793) + /// (Originally from ..\FSComp.txt:795) static member tcTypeDefinitionsWithImplicitConstructionMustHaveLocalBindingsBeforeMembers() = (960, GetStringFunc("tcTypeDefinitionsWithImplicitConstructionMustHaveLocalBindingsBeforeMembers",",,,") ) /// This 'inherit' declaration specifies the inherited type but no arguments. Consider supplying arguments, e.g. 'inherit BaseType(args)'. - /// (Originally from ..\FSComp.txt:794) + /// (Originally from ..\FSComp.txt:796) static member tcInheritDeclarationMissingArguments() = (961, GetStringFunc("tcInheritDeclarationMissingArguments",",,,") ) /// This 'inherit' declaration has arguments, but is not in a type with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:795) + /// (Originally from ..\FSComp.txt:797) static member tcInheritConstructionCallNotPartOfImplicitSequence() = (962, GetStringFunc("tcInheritConstructionCallNotPartOfImplicitSequence",",,,") ) /// This definition may only be used in a type with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:796) + /// (Originally from ..\FSComp.txt:798) static member tcLetAndDoRequiresImplicitConstructionSequence() = (963, GetStringFunc("tcLetAndDoRequiresImplicitConstructionSequence",",,,") ) /// Type abbreviations cannot have augmentations - /// (Originally from ..\FSComp.txt:797) + /// (Originally from ..\FSComp.txt:799) static member tcTypeAbbreviationsCannotHaveAugmentations() = (964, GetStringFunc("tcTypeAbbreviationsCannotHaveAugmentations",",,,") ) /// The path '%s' is a namespace. A module abbreviation may not abbreviate a namespace. - /// (Originally from ..\FSComp.txt:798) + /// (Originally from ..\FSComp.txt:800) static member tcModuleAbbreviationForNamespace(a0 : System.String) = (965, GetStringFunc("tcModuleAbbreviationForNamespace",",,,%s,,,") a0) /// The type '%s' is used in an invalid way. A value prior to '%s' has an inferred type involving '%s', which is an invalid forward reference. - /// (Originally from ..\FSComp.txt:799) + /// (Originally from ..\FSComp.txt:801) static member tcTypeUsedInInvalidWay(a0 : System.String, a1 : System.String, a2 : System.String) = (966, GetStringFunc("tcTypeUsedInInvalidWay",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The member '%s' is used in an invalid way. A use of '%s' has been inferred prior to the definition of '%s', which is an invalid forward reference. - /// (Originally from ..\FSComp.txt:800) + /// (Originally from ..\FSComp.txt:802) static member tcMemberUsedInInvalidWay(a0 : System.String, a1 : System.String, a2 : System.String) = (967, GetStringFunc("tcMemberUsedInInvalidWay",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The attribute 'AutoOpen(\"%s\")' in the assembly '%s' did not refer to a valid module or namespace in that assembly and has been ignored - /// (Originally from ..\FSComp.txt:803) + /// (Originally from ..\FSComp.txt:805) static member tcAttributeAutoOpenWasIgnored(a0 : System.String, a1 : System.String) = (970, GetStringFunc("tcAttributeAutoOpenWasIgnored",",,,%s,,,%s,,,") a0 a1) /// Undefined value '%s' - /// (Originally from ..\FSComp.txt:804) + /// (Originally from ..\FSComp.txt:806) static member ilUndefinedValue(a0 : System.String) = (971, GetStringFunc("ilUndefinedValue",",,,%s,,,") a0) /// Label %s not found - /// (Originally from ..\FSComp.txt:805) + /// (Originally from ..\FSComp.txt:807) static member ilLabelNotFound(a0 : System.String) = (972, GetStringFunc("ilLabelNotFound",",,,%s,,,") a0) /// Incorrect number of type arguments to local call - /// (Originally from ..\FSComp.txt:806) + /// (Originally from ..\FSComp.txt:808) static member ilIncorrectNumberOfTypeArguments() = (973, GetStringFunc("ilIncorrectNumberOfTypeArguments",",,,") ) /// Dynamic invocation of %s is not supported - /// (Originally from ..\FSComp.txt:807) + /// (Originally from ..\FSComp.txt:809) static member ilDynamicInvocationNotSupported(a0 : System.String) = (GetStringFunc("ilDynamicInvocationNotSupported",",,,%s,,,") a0) /// Taking the address of a literal field is invalid - /// (Originally from ..\FSComp.txt:808) + /// (Originally from ..\FSComp.txt:810) static member ilAddressOfLiteralFieldIsInvalid() = (975, GetStringFunc("ilAddressOfLiteralFieldIsInvalid",",,,") ) /// This operation involves taking the address of a value '%s' represented using a local variable or other special representation. This is invalid. - /// (Originally from ..\FSComp.txt:809) + /// (Originally from ..\FSComp.txt:811) static member ilAddressOfValueHereIsInvalid(a0 : System.String) = (976, GetStringFunc("ilAddressOfValueHereIsInvalid",",,,%s,,,") a0) /// Custom marshallers cannot be specified in F# code. Consider using a C# helper function. - /// (Originally from ..\FSComp.txt:810) + /// (Originally from ..\FSComp.txt:812) static member ilCustomMarshallersCannotBeUsedInFSharp() = (980, GetStringFunc("ilCustomMarshallersCannotBeUsedInFSharp",",,,") ) /// The MarshalAs attribute could not be decoded - /// (Originally from ..\FSComp.txt:811) + /// (Originally from ..\FSComp.txt:813) static member ilMarshalAsAttributeCannotBeDecoded() = (981, GetStringFunc("ilMarshalAsAttributeCannotBeDecoded",",,,") ) /// The signature for this external function contains type parameters. Constrain the argument and return types to indicate the types of the corresponding C function. - /// (Originally from ..\FSComp.txt:812) + /// (Originally from ..\FSComp.txt:814) static member ilSignatureForExternalFunctionContainsTypeParameters() = (982, GetStringFunc("ilSignatureForExternalFunctionContainsTypeParameters",",,,") ) /// The DllImport attribute could not be decoded - /// (Originally from ..\FSComp.txt:813) + /// (Originally from ..\FSComp.txt:815) static member ilDllImportAttributeCouldNotBeDecoded() = (983, GetStringFunc("ilDllImportAttributeCouldNotBeDecoded",",,,") ) /// Literal fields cannot be set - /// (Originally from ..\FSComp.txt:814) + /// (Originally from ..\FSComp.txt:816) static member ilLiteralFieldsCannotBeSet() = (984, GetStringFunc("ilLiteralFieldsCannotBeSet",",,,") ) /// GenSetStorage: %s was represented as a static method but was not an appropriate lambda expression - /// (Originally from ..\FSComp.txt:815) + /// (Originally from ..\FSComp.txt:817) static member ilStaticMethodIsNotLambda(a0 : System.String) = (985, GetStringFunc("ilStaticMethodIsNotLambda",",,,%s,,,") a0) /// Mutable variables cannot escape their method - /// (Originally from ..\FSComp.txt:816) + /// (Originally from ..\FSComp.txt:818) static member ilMutableVariablesCannotEscapeMethod() = (986, GetStringFunc("ilMutableVariablesCannotEscapeMethod",",,,") ) /// Compiler error: unexpected unrealized value - /// (Originally from ..\FSComp.txt:817) + /// (Originally from ..\FSComp.txt:819) static member ilUnexpectedUnrealizedValue() = (987, GetStringFunc("ilUnexpectedUnrealizedValue",",,,") ) /// Main module of program is empty: nothing will happen when it is run - /// (Originally from ..\FSComp.txt:818) + /// (Originally from ..\FSComp.txt:820) static member ilMainModuleEmpty() = (988, GetStringFunc("ilMainModuleEmpty",",,,") ) /// This type cannot be used for a literal field - /// (Originally from ..\FSComp.txt:819) + /// (Originally from ..\FSComp.txt:821) static member ilTypeCannotBeUsedForLiteralField() = (989, GetStringFunc("ilTypeCannotBeUsedForLiteralField",",,,") ) /// Unexpected GetSet annotation on a property - /// (Originally from ..\FSComp.txt:820) + /// (Originally from ..\FSComp.txt:822) static member ilUnexpectedGetSetAnnotation() = (990, GetStringFunc("ilUnexpectedGetSetAnnotation",",,,") ) /// The FieldOffset attribute could not be decoded - /// (Originally from ..\FSComp.txt:821) + /// (Originally from ..\FSComp.txt:823) static member ilFieldOffsetAttributeCouldNotBeDecoded() = (991, GetStringFunc("ilFieldOffsetAttributeCouldNotBeDecoded",",,,") ) /// The StructLayout attribute could not be decoded - /// (Originally from ..\FSComp.txt:822) + /// (Originally from ..\FSComp.txt:824) static member ilStructLayoutAttributeCouldNotBeDecoded() = (992, GetStringFunc("ilStructLayoutAttributeCouldNotBeDecoded",",,,") ) /// The DefaultAugmentation attribute could not be decoded - /// (Originally from ..\FSComp.txt:823) + /// (Originally from ..\FSComp.txt:825) static member ilDefaultAugmentationAttributeCouldNotBeDecoded() = (993, GetStringFunc("ilDefaultAugmentationAttributeCouldNotBeDecoded",",,,") ) /// Reflected definitions cannot contain uses of the prefix splice operator '%%' - /// (Originally from ..\FSComp.txt:824) + /// (Originally from ..\FSComp.txt:826) static member ilReflectedDefinitionsCannotUseSliceOperator() = (994, GetStringFunc("ilReflectedDefinitionsCannotUseSliceOperator",",,,") ) /// Problem with codepage '%d': %s - /// (Originally from ..\FSComp.txt:825) + /// (Originally from ..\FSComp.txt:827) static member optsProblemWithCodepage(a0 : System.Int32, a1 : System.String) = (1000, GetStringFunc("optsProblemWithCodepage",",,,%d,,,%s,,,") a0 a1) /// Copyright (c) Microsoft Corporation. All Rights Reserved. - /// (Originally from ..\FSComp.txt:826) + /// (Originally from ..\FSComp.txt:828) static member optsCopyright() = (GetStringFunc("optsCopyright",",,,") ) /// Freely distributed under the MIT Open Source License. https://github.com/Microsoft/visualfsharp/blob/master/License.txt - /// (Originally from ..\FSComp.txt:827) + /// (Originally from ..\FSComp.txt:829) static member optsCopyrightCommunity() = (GetStringFunc("optsCopyrightCommunity",",,,") ) /// Name of the output file (Short form: -o) - /// (Originally from ..\FSComp.txt:828) + /// (Originally from ..\FSComp.txt:830) static member optsNameOfOutputFile() = (GetStringFunc("optsNameOfOutputFile",",,,") ) /// Build a console executable - /// (Originally from ..\FSComp.txt:829) + /// (Originally from ..\FSComp.txt:831) static member optsBuildConsole() = (GetStringFunc("optsBuildConsole",",,,") ) /// Build a Windows executable - /// (Originally from ..\FSComp.txt:830) + /// (Originally from ..\FSComp.txt:832) static member optsBuildWindows() = (GetStringFunc("optsBuildWindows",",,,") ) /// Build a library (Short form: -a) - /// (Originally from ..\FSComp.txt:831) + /// (Originally from ..\FSComp.txt:833) static member optsBuildLibrary() = (GetStringFunc("optsBuildLibrary",",,,") ) /// Build a module that can be added to another assembly - /// (Originally from ..\FSComp.txt:832) + /// (Originally from ..\FSComp.txt:834) static member optsBuildModule() = (GetStringFunc("optsBuildModule",",,,") ) /// Delay-sign the assembly using only the public portion of the strong name key - /// (Originally from ..\FSComp.txt:833) + /// (Originally from ..\FSComp.txt:835) static member optsDelaySign() = (GetStringFunc("optsDelaySign",",,,") ) /// Public-sign the assembly using only the public portion of the strong name key, and mark the assembly as signed - /// (Originally from ..\FSComp.txt:834) + /// (Originally from ..\FSComp.txt:836) static member optsPublicSign() = (GetStringFunc("optsPublicSign",",,,") ) /// Write the xmldoc of the assembly to the given file - /// (Originally from ..\FSComp.txt:835) + /// (Originally from ..\FSComp.txt:837) static member optsWriteXml() = (GetStringFunc("optsWriteXml",",,,") ) /// Specify a strong name key file - /// (Originally from ..\FSComp.txt:836) + /// (Originally from ..\FSComp.txt:838) static member optsStrongKeyFile() = (GetStringFunc("optsStrongKeyFile",",,,") ) /// Specify a strong name key container - /// (Originally from ..\FSComp.txt:837) + /// (Originally from ..\FSComp.txt:839) static member optsStrongKeyContainer() = (GetStringFunc("optsStrongKeyContainer",",,,") ) /// Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu. - /// (Originally from ..\FSComp.txt:838) + /// (Originally from ..\FSComp.txt:840) static member optsPlatform() = (GetStringFunc("optsPlatform",",,,") ) /// Only include optimization information essential for implementing inlined constructs. Inhibits cross-module inlining but improves binary compatibility. - /// (Originally from ..\FSComp.txt:839) + /// (Originally from ..\FSComp.txt:841) static member optsNoOpt() = (GetStringFunc("optsNoOpt",",,,") ) /// Don't add a resource to the generated assembly containing F#-specific metadata - /// (Originally from ..\FSComp.txt:840) + /// (Originally from ..\FSComp.txt:842) static member optsNoInterface() = (GetStringFunc("optsNoInterface",",,,") ) /// Print the inferred interface of the assembly to a file - /// (Originally from ..\FSComp.txt:841) + /// (Originally from ..\FSComp.txt:843) static member optsSig() = (GetStringFunc("optsSig",",,,") ) /// Reference an assembly (Short form: -r) - /// (Originally from ..\FSComp.txt:842) + /// (Originally from ..\FSComp.txt:844) static member optsReference() = (GetStringFunc("optsReference",",,,") ) /// Specify a Win32 resource file (.res) - /// (Originally from ..\FSComp.txt:843) + /// (Originally from ..\FSComp.txt:845) static member optsWin32res() = (GetStringFunc("optsWin32res",",,,") ) /// Specify a Win32 manifest file - /// (Originally from ..\FSComp.txt:844) + /// (Originally from ..\FSComp.txt:846) static member optsWin32manifest() = (GetStringFunc("optsWin32manifest",",,,") ) /// Do not include the default Win32 manifest - /// (Originally from ..\FSComp.txt:845) + /// (Originally from ..\FSComp.txt:847) static member optsNowin32manifest() = (GetStringFunc("optsNowin32manifest",",,,") ) /// Embed all source files in the portable PDB file - /// (Originally from ..\FSComp.txt:846) + /// (Originally from ..\FSComp.txt:848) static member optsEmbedAllSource() = (GetStringFunc("optsEmbedAllSource",",,,") ) /// Embed specific source files in the portable PDB file - /// (Originally from ..\FSComp.txt:847) + /// (Originally from ..\FSComp.txt:849) static member optsEmbedSource() = (GetStringFunc("optsEmbedSource",",,,") ) /// Source link information file to embed in the portable PDB file - /// (Originally from ..\FSComp.txt:848) + /// (Originally from ..\FSComp.txt:850) static member optsSourceLink() = (GetStringFunc("optsSourceLink",",,,") ) /// --embed switch only supported when emitting a Portable PDB (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:849) + /// (Originally from ..\FSComp.txt:851) static member optsEmbeddedSourceRequirePortablePDBs() = (1501, GetStringFunc("optsEmbeddedSourceRequirePortablePDBs",",,,") ) /// --sourcelink switch only supported when emitting a Portable PDB (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:850) + /// (Originally from ..\FSComp.txt:852) static member optsSourceLinkRequirePortablePDBs() = (1502, GetStringFunc("optsSourceLinkRequirePortablePDBs",",,,") ) /// Source file is too large to embed in a portable PDB - /// (Originally from ..\FSComp.txt:851) + /// (Originally from ..\FSComp.txt:853) static member srcFileTooLarge() = (GetStringFunc("srcFileTooLarge",",,,") ) /// Embed the specified managed resource - /// (Originally from ..\FSComp.txt:852) + /// (Originally from ..\FSComp.txt:854) static member optsResource() = (GetStringFunc("optsResource",",,,") ) /// Link the specified resource to this assembly where the resinfo format is [,[,public|private]] - /// (Originally from ..\FSComp.txt:853) + /// (Originally from ..\FSComp.txt:855) static member optsLinkresource() = (GetStringFunc("optsLinkresource",",,,") ) /// Emit debug information (Short form: -g) - /// (Originally from ..\FSComp.txt:854) + /// (Originally from ..\FSComp.txt:856) static member optsDebugPM() = (GetStringFunc("optsDebugPM",",,,") ) /// Specify debugging type: full, portable, embedded, pdbonly. ('%s' is the default if no debuggging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - /// (Originally from ..\FSComp.txt:855) + /// (Originally from ..\FSComp.txt:857) static member optsDebug(a0 : System.String) = (GetStringFunc("optsDebug",",,,%s,,,") a0) /// Enable optimizations (Short form: -O) - /// (Originally from ..\FSComp.txt:856) + /// (Originally from ..\FSComp.txt:858) static member optsOptimize() = (GetStringFunc("optsOptimize",",,,") ) /// Enable or disable tailcalls - /// (Originally from ..\FSComp.txt:857) + /// (Originally from ..\FSComp.txt:859) static member optsTailcalls() = (GetStringFunc("optsTailcalls",",,,") ) /// Produce a deterministic assembly (including module version GUID and timestamp) - /// (Originally from ..\FSComp.txt:858) + /// (Originally from ..\FSComp.txt:860) static member optsDeterministic() = (GetStringFunc("optsDeterministic",",,,") ) /// Enable or disable cross-module optimizations - /// (Originally from ..\FSComp.txt:859) + /// (Originally from ..\FSComp.txt:861) static member optsCrossoptimize() = (GetStringFunc("optsCrossoptimize",",,,") ) /// Report all warnings as errors - /// (Originally from ..\FSComp.txt:860) + /// (Originally from ..\FSComp.txt:862) static member optsWarnaserrorPM() = (GetStringFunc("optsWarnaserrorPM",",,,") ) /// Report specific warnings as errors - /// (Originally from ..\FSComp.txt:861) + /// (Originally from ..\FSComp.txt:863) static member optsWarnaserror() = (GetStringFunc("optsWarnaserror",",,,") ) /// Set a warning level (0-5) - /// (Originally from ..\FSComp.txt:862) + /// (Originally from ..\FSComp.txt:864) static member optsWarn() = (GetStringFunc("optsWarn",",,,") ) /// Disable specific warning messages - /// (Originally from ..\FSComp.txt:863) + /// (Originally from ..\FSComp.txt:865) static member optsNowarn() = (GetStringFunc("optsNowarn",",,,") ) /// Enable specific warnings that may be off by default - /// (Originally from ..\FSComp.txt:864) + /// (Originally from ..\FSComp.txt:866) static member optsWarnOn() = (GetStringFunc("optsWarnOn",",,,") ) /// Enable nullness declarations and checks - /// (Originally from ..\FSComp.txt:865) + /// (Originally from ..\FSComp.txt:867) static member optsCheckNulls() = (GetStringFunc("optsCheckNulls",",,,") ) /// Specify the language version - /// (Originally from ..\FSComp.txt:866) + /// (Originally from ..\FSComp.txt:868) static member optsLangVersion() = (GetStringFunc("optsLangVersion",",,,") ) /// Generate overflow checks - /// (Originally from ..\FSComp.txt:867) + /// (Originally from ..\FSComp.txt:869) static member optsChecked() = (GetStringFunc("optsChecked",",,,") ) /// Define conditional compilation symbols (Short form: -d) - /// (Originally from ..\FSComp.txt:868) + /// (Originally from ..\FSComp.txt:870) static member optsDefine() = (GetStringFunc("optsDefine",",,,") ) /// Ignore ML compatibility warnings - /// (Originally from ..\FSComp.txt:869) + /// (Originally from ..\FSComp.txt:871) static member optsMlcompatibility() = (GetStringFunc("optsMlcompatibility",",,,") ) /// Suppress compiler copyright message - /// (Originally from ..\FSComp.txt:870) + /// (Originally from ..\FSComp.txt:872) static member optsNologo() = (GetStringFunc("optsNologo",",,,") ) /// Display this usage message (Short form: -?) - /// (Originally from ..\FSComp.txt:871) + /// (Originally from ..\FSComp.txt:873) static member optsHelp() = (GetStringFunc("optsHelp",",,,") ) /// Read response file for more options - /// (Originally from ..\FSComp.txt:872) + /// (Originally from ..\FSComp.txt:874) static member optsResponseFile() = (GetStringFunc("optsResponseFile",",,,") ) /// Specify the codepage used to read source files - /// (Originally from ..\FSComp.txt:873) + /// (Originally from ..\FSComp.txt:875) static member optsCodepage() = (GetStringFunc("optsCodepage",",,,") ) /// Output messages in UTF-8 encoding - /// (Originally from ..\FSComp.txt:874) + /// (Originally from ..\FSComp.txt:876) static member optsUtf8output() = (GetStringFunc("optsUtf8output",",,,") ) /// Output messages with fully qualified paths - /// (Originally from ..\FSComp.txt:875) + /// (Originally from ..\FSComp.txt:877) static member optsFullpaths() = (GetStringFunc("optsFullpaths",",,,") ) /// Specify a directory for the include path which is used to resolve source files and assemblies (Short form: -I) - /// (Originally from ..\FSComp.txt:876) + /// (Originally from ..\FSComp.txt:878) static member optsLib() = (GetStringFunc("optsLib",",,,") ) /// Base address for the library to be built - /// (Originally from ..\FSComp.txt:877) + /// (Originally from ..\FSComp.txt:879) static member optsBaseaddress() = (GetStringFunc("optsBaseaddress",",,,") ) /// Do not reference the default CLI assemblies by default - /// (Originally from ..\FSComp.txt:878) + /// (Originally from ..\FSComp.txt:880) static member optsNoframework() = (GetStringFunc("optsNoframework",",,,") ) /// Statically link the F# library and all referenced DLLs that depend on it into the assembly being generated - /// (Originally from ..\FSComp.txt:879) + /// (Originally from ..\FSComp.txt:881) static member optsStandalone() = (GetStringFunc("optsStandalone",",,,") ) /// Statically link the given assembly and all referenced DLLs that depend on this assembly. Use an assembly name e.g. mylib, not a DLL name. - /// (Originally from ..\FSComp.txt:880) + /// (Originally from ..\FSComp.txt:882) static member optsStaticlink() = (GetStringFunc("optsStaticlink",",,,") ) /// Use a resident background compilation service to improve compiler startup times. - /// (Originally from ..\FSComp.txt:881) + /// (Originally from ..\FSComp.txt:883) static member optsResident() = (GetStringFunc("optsResident",",,,") ) /// Name the output debug file - /// (Originally from ..\FSComp.txt:882) + /// (Originally from ..\FSComp.txt:884) static member optsPdb() = (GetStringFunc("optsPdb",",,,") ) /// Resolve assembly references using directory-based rules rather than MSBuild resolution - /// (Originally from ..\FSComp.txt:883) + /// (Originally from ..\FSComp.txt:885) static member optsSimpleresolution() = (GetStringFunc("optsSimpleresolution",",,,") ) /// Unrecognized target '%s', expected 'exe', 'winexe', 'library' or 'module' - /// (Originally from ..\FSComp.txt:884) + /// (Originally from ..\FSComp.txt:886) static member optsUnrecognizedTarget(a0 : System.String) = (1048, GetStringFunc("optsUnrecognizedTarget",",,,%s,,,") a0) /// Unrecognized debug type '%s', expected 'pdbonly' or 'full' - /// (Originally from ..\FSComp.txt:885) + /// (Originally from ..\FSComp.txt:887) static member optsUnrecognizedDebugType(a0 : System.String) = (1049, GetStringFunc("optsUnrecognizedDebugType",",,,%s,,,") a0) /// Invalid warning level '%d' - /// (Originally from ..\FSComp.txt:886) + /// (Originally from ..\FSComp.txt:888) static member optsInvalidWarningLevel(a0 : System.Int32) = (1050, GetStringFunc("optsInvalidWarningLevel",",,,%d,,,") a0) /// Short form of '%s' - /// (Originally from ..\FSComp.txt:887) + /// (Originally from ..\FSComp.txt:889) static member optsShortFormOf(a0 : System.String) = (GetStringFunc("optsShortFormOf",",,,%s,,,") a0) /// The command-line option '--cliroot' has been deprecated. Use an explicit reference to a specific copy of mscorlib.dll instead. - /// (Originally from ..\FSComp.txt:888) + /// (Originally from ..\FSComp.txt:890) static member optsClirootDeprecatedMsg() = (GetStringFunc("optsClirootDeprecatedMsg",",,,") ) /// Use to override where the compiler looks for mscorlib.dll and framework components - /// (Originally from ..\FSComp.txt:889) + /// (Originally from ..\FSComp.txt:891) static member optsClirootDescription() = (GetStringFunc("optsClirootDescription",",,,") ) /// - OUTPUT FILES - - /// (Originally from ..\FSComp.txt:890) + /// (Originally from ..\FSComp.txt:892) static member optsHelpBannerOutputFiles() = (GetStringFunc("optsHelpBannerOutputFiles",",,,") ) /// - INPUT FILES - - /// (Originally from ..\FSComp.txt:891) + /// (Originally from ..\FSComp.txt:893) static member optsHelpBannerInputFiles() = (GetStringFunc("optsHelpBannerInputFiles",",,,") ) /// - RESOURCES - - /// (Originally from ..\FSComp.txt:892) + /// (Originally from ..\FSComp.txt:894) static member optsHelpBannerResources() = (GetStringFunc("optsHelpBannerResources",",,,") ) /// - CODE GENERATION - - /// (Originally from ..\FSComp.txt:893) + /// (Originally from ..\FSComp.txt:895) static member optsHelpBannerCodeGen() = (GetStringFunc("optsHelpBannerCodeGen",",,,") ) /// - ADVANCED - - /// (Originally from ..\FSComp.txt:894) + /// (Originally from ..\FSComp.txt:896) static member optsHelpBannerAdvanced() = (GetStringFunc("optsHelpBannerAdvanced",",,,") ) /// - MISCELLANEOUS - - /// (Originally from ..\FSComp.txt:895) + /// (Originally from ..\FSComp.txt:897) static member optsHelpBannerMisc() = (GetStringFunc("optsHelpBannerMisc",",,,") ) /// - LANGUAGE - - /// (Originally from ..\FSComp.txt:896) + /// (Originally from ..\FSComp.txt:898) static member optsHelpBannerLanguage() = (GetStringFunc("optsHelpBannerLanguage",",,,") ) /// - ERRORS AND WARNINGS - - /// (Originally from ..\FSComp.txt:897) + /// (Originally from ..\FSComp.txt:899) static member optsHelpBannerErrsAndWarns() = (GetStringFunc("optsHelpBannerErrsAndWarns",",,,") ) /// Unknown --test argument: '%s' - /// (Originally from ..\FSComp.txt:898) + /// (Originally from ..\FSComp.txt:900) static member optsUnknownArgumentToTheTestSwitch(a0 : System.String) = (1063, GetStringFunc("optsUnknownArgumentToTheTestSwitch",",,,%s,,,") a0) /// Unrecognized platform '%s', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu' - /// (Originally from ..\FSComp.txt:899) + /// (Originally from ..\FSComp.txt:901) static member optsUnknownPlatform(a0 : System.String) = (1064, GetStringFunc("optsUnknownPlatform",",,,%s,,,") a0) /// The command-line option '%s' is for test purposes only - /// (Originally from ..\FSComp.txt:900) + /// (Originally from ..\FSComp.txt:902) static member optsInternalNoDescription(a0 : System.String) = (GetStringFunc("optsInternalNoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated - /// (Originally from ..\FSComp.txt:901) + /// (Originally from ..\FSComp.txt:903) static member optsDCLONoDescription(a0 : System.String) = (GetStringFunc("optsDCLONoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated. Use '%s' instead. - /// (Originally from ..\FSComp.txt:902) + /// (Originally from ..\FSComp.txt:904) static member optsDCLODeprecatedSuggestAlternative(a0 : System.String, a1 : System.String) = (GetStringFunc("optsDCLODeprecatedSuggestAlternative",",,,%s,,,%s,,,") a0 a1) /// The command-line option '%s' has been deprecated. HTML document generation is now part of the F# Power Pack, via the tool FsHtmlDoc.exe. - /// (Originally from ..\FSComp.txt:903) + /// (Originally from ..\FSComp.txt:905) static member optsDCLOHtmlDoc(a0 : System.String) = (GetStringFunc("optsDCLOHtmlDoc",",,,%s,,,") a0) /// Output warning and error messages in color - /// (Originally from ..\FSComp.txt:904) + /// (Originally from ..\FSComp.txt:906) static member optsConsoleColors() = (GetStringFunc("optsConsoleColors",",,,") ) /// Enable high-entropy ASLR - /// (Originally from ..\FSComp.txt:905) + /// (Originally from ..\FSComp.txt:907) static member optsUseHighEntropyVA() = (GetStringFunc("optsUseHighEntropyVA",",,,") ) /// Specify subsystem version of this assembly - /// (Originally from ..\FSComp.txt:906) + /// (Originally from ..\FSComp.txt:908) static member optsSubSystemVersion() = (GetStringFunc("optsSubSystemVersion",",,,") ) /// Specify target framework profile of this assembly. Valid values are mscorlib, netcore or netstandard. Default - mscorlib - /// (Originally from ..\FSComp.txt:907) + /// (Originally from ..\FSComp.txt:909) static member optsTargetProfile() = (GetStringFunc("optsTargetProfile",",,,") ) /// Emit debug information in quotations - /// (Originally from ..\FSComp.txt:908) + /// (Originally from ..\FSComp.txt:910) static member optsEmitDebugInfoInQuotations() = (GetStringFunc("optsEmitDebugInfoInQuotations",",,,") ) /// Specify the preferred output language culture name (e.g. es-ES, ja-JP) - /// (Originally from ..\FSComp.txt:909) + /// (Originally from ..\FSComp.txt:911) static member optsPreferredUiLang() = (GetStringFunc("optsPreferredUiLang",",,,") ) /// Don't copy FSharp.Core.dll along the produced binaries - /// (Originally from ..\FSComp.txt:910) + /// (Originally from ..\FSComp.txt:912) static member optsNoCopyFsharpCore() = (GetStringFunc("optsNoCopyFsharpCore",",,,") ) /// Invalid version '%s' for '--subsystemversion'. The version must be 4.00 or greater. - /// (Originally from ..\FSComp.txt:911) + /// (Originally from ..\FSComp.txt:913) static member optsInvalidSubSystemVersion(a0 : System.String) = (1051, GetStringFunc("optsInvalidSubSystemVersion",",,,%s,,,") a0) /// Invalid value '%s' for '--targetprofile', valid values are 'mscorlib', 'netcore' or 'netstandard'. - /// (Originally from ..\FSComp.txt:912) + /// (Originally from ..\FSComp.txt:914) static member optsInvalidTargetProfile(a0 : System.String) = (1052, GetStringFunc("optsInvalidTargetProfile",",,,%s,,,") a0) /// Full name - /// (Originally from ..\FSComp.txt:913) + /// (Originally from ..\FSComp.txt:915) static member typeInfoFullName() = (GetStringFunc("typeInfoFullName",",,,") ) /// and %d other overloads - /// (Originally from ..\FSComp.txt:917) + /// (Originally from ..\FSComp.txt:919) static member typeInfoOtherOverloads(a0 : System.Int32) = (GetStringFunc("typeInfoOtherOverloads",",,,%d,,,") a0) /// union case - /// (Originally from ..\FSComp.txt:918) + /// (Originally from ..\FSComp.txt:920) static member typeInfoUnionCase() = (GetStringFunc("typeInfoUnionCase",",,,") ) /// active pattern result - /// (Originally from ..\FSComp.txt:919) + /// (Originally from ..\FSComp.txt:921) static member typeInfoActivePatternResult() = (GetStringFunc("typeInfoActivePatternResult",",,,") ) /// active recognizer - /// (Originally from ..\FSComp.txt:920) + /// (Originally from ..\FSComp.txt:922) static member typeInfoActiveRecognizer() = (GetStringFunc("typeInfoActiveRecognizer",",,,") ) /// field - /// (Originally from ..\FSComp.txt:921) + /// (Originally from ..\FSComp.txt:923) static member typeInfoField() = (GetStringFunc("typeInfoField",",,,") ) /// event - /// (Originally from ..\FSComp.txt:922) + /// (Originally from ..\FSComp.txt:924) static member typeInfoEvent() = (GetStringFunc("typeInfoEvent",",,,") ) /// property - /// (Originally from ..\FSComp.txt:923) + /// (Originally from ..\FSComp.txt:925) static member typeInfoProperty() = (GetStringFunc("typeInfoProperty",",,,") ) /// extension - /// (Originally from ..\FSComp.txt:924) + /// (Originally from ..\FSComp.txt:926) static member typeInfoExtension() = (GetStringFunc("typeInfoExtension",",,,") ) /// custom operation - /// (Originally from ..\FSComp.txt:925) + /// (Originally from ..\FSComp.txt:927) static member typeInfoCustomOperation() = (GetStringFunc("typeInfoCustomOperation",",,,") ) /// argument - /// (Originally from ..\FSComp.txt:926) + /// (Originally from ..\FSComp.txt:928) static member typeInfoArgument() = (GetStringFunc("typeInfoArgument",",,,") ) /// patvar - /// (Originally from ..\FSComp.txt:927) + /// (Originally from ..\FSComp.txt:929) static member typeInfoPatternVariable() = (GetStringFunc("typeInfoPatternVariable",",,,") ) /// namespace - /// (Originally from ..\FSComp.txt:928) + /// (Originally from ..\FSComp.txt:930) static member typeInfoNamespace() = (GetStringFunc("typeInfoNamespace",",,,") ) /// module - /// (Originally from ..\FSComp.txt:929) + /// (Originally from ..\FSComp.txt:931) static member typeInfoModule() = (GetStringFunc("typeInfoModule",",,,") ) /// namespace/module - /// (Originally from ..\FSComp.txt:930) + /// (Originally from ..\FSComp.txt:932) static member typeInfoNamespaceOrModule() = (GetStringFunc("typeInfoNamespaceOrModule",",,,") ) /// from %s - /// (Originally from ..\FSComp.txt:931) + /// (Originally from ..\FSComp.txt:933) static member typeInfoFromFirst(a0 : System.String) = (GetStringFunc("typeInfoFromFirst",",,,%s,,,") a0) /// also from %s - /// (Originally from ..\FSComp.txt:932) + /// (Originally from ..\FSComp.txt:934) static member typeInfoFromNext(a0 : System.String) = (GetStringFunc("typeInfoFromNext",",,,%s,,,") a0) /// generated property - /// (Originally from ..\FSComp.txt:933) + /// (Originally from ..\FSComp.txt:935) static member typeInfoGeneratedProperty() = (GetStringFunc("typeInfoGeneratedProperty",",,,") ) /// generated type - /// (Originally from ..\FSComp.txt:934) + /// (Originally from ..\FSComp.txt:936) static member typeInfoGeneratedType() = (GetStringFunc("typeInfoGeneratedType",",,,") ) /// Found by AssemblyFolders registry key - /// (Originally from ..\FSComp.txt:935) + /// (Originally from ..\FSComp.txt:937) static member assemblyResolutionFoundByAssemblyFoldersKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersKey",",,,") ) /// Found by AssemblyFoldersEx registry key - /// (Originally from ..\FSComp.txt:936) + /// (Originally from ..\FSComp.txt:938) static member assemblyResolutionFoundByAssemblyFoldersExKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersExKey",",,,") ) /// .NET Framework - /// (Originally from ..\FSComp.txt:937) + /// (Originally from ..\FSComp.txt:939) static member assemblyResolutionNetFramework() = (GetStringFunc("assemblyResolutionNetFramework",",,,") ) /// Global Assembly Cache - /// (Originally from ..\FSComp.txt:938) + /// (Originally from ..\FSComp.txt:940) static member assemblyResolutionGAC() = (GetStringFunc("assemblyResolutionGAC",",,,") ) /// Recursive class hierarchy in type '%s' - /// (Originally from ..\FSComp.txt:939) + /// (Originally from ..\FSComp.txt:941) static member recursiveClassHierarchy(a0 : System.String) = (1089, GetStringFunc("recursiveClassHierarchy",",,,%s,,,") a0) /// Invalid recursive reference to an abstract slot - /// (Originally from ..\FSComp.txt:940) + /// (Originally from ..\FSComp.txt:942) static member InvalidRecursiveReferenceToAbstractSlot() = (1090, GetStringFunc("InvalidRecursiveReferenceToAbstractSlot",",,,") ) /// The event '%s' has a non-standard type. If this event is declared in another CLI language, you may need to access this event using the explicit %s and %s methods for the event. If this event is declared in F#, make the type of the event an instantiation of either 'IDelegateEvent<_>' or 'IEvent<_,_>'. - /// (Originally from ..\FSComp.txt:941) + /// (Originally from ..\FSComp.txt:943) static member eventHasNonStandardType(a0 : System.String, a1 : System.String, a2 : System.String) = (1091, GetStringFunc("eventHasNonStandardType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:942) + /// (Originally from ..\FSComp.txt:944) static member typeIsNotAccessible(a0 : System.String) = (1092, GetStringFunc("typeIsNotAccessible",",,,%s,,,") a0) /// The union cases or fields of the type '%s' are not accessible from this code location - /// (Originally from ..\FSComp.txt:943) + /// (Originally from ..\FSComp.txt:945) static member unionCasesAreNotAccessible(a0 : System.String) = (1093, GetStringFunc("unionCasesAreNotAccessible",",,,%s,,,") a0) /// The value '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:944) + /// (Originally from ..\FSComp.txt:946) static member valueIsNotAccessible(a0 : System.String) = (1094, GetStringFunc("valueIsNotAccessible",",,,%s,,,") a0) /// The union case '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:945) + /// (Originally from ..\FSComp.txt:947) static member unionCaseIsNotAccessible(a0 : System.String) = (1095, GetStringFunc("unionCaseIsNotAccessible",",,,%s,,,") a0) /// The record, struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:946) + /// (Originally from ..\FSComp.txt:948) static member fieldIsNotAccessible(a0 : System.String) = (1096, GetStringFunc("fieldIsNotAccessible",",,,%s,,,") a0) /// The struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:947) + /// (Originally from ..\FSComp.txt:949) static member structOrClassFieldIsNotAccessible(a0 : System.String) = (1097, GetStringFunc("structOrClassFieldIsNotAccessible",",,,%s,,,") a0) /// This construct is experimental - /// (Originally from ..\FSComp.txt:948) + /// (Originally from ..\FSComp.txt:950) static member experimentalConstruct() = (GetStringFunc("experimentalConstruct",",,,") ) /// No Invoke methods found for delegate type - /// (Originally from ..\FSComp.txt:949) + /// (Originally from ..\FSComp.txt:951) static member noInvokeMethodsFound() = (1099, GetStringFunc("noInvokeMethodsFound",",,,") ) /// More than one Invoke method found for delegate type - /// (Originally from ..\FSComp.txt:950) + /// (Originally from ..\FSComp.txt:952) static member moreThanOneInvokeMethodFound() = (GetStringFunc("moreThanOneInvokeMethodFound",",,,") ) /// Delegates are not allowed to have curried signatures - /// (Originally from ..\FSComp.txt:951) + /// (Originally from ..\FSComp.txt:953) static member delegatesNotAllowedToHaveCurriedSignatures() = (1101, GetStringFunc("delegatesNotAllowedToHaveCurriedSignatures",",,,") ) /// Unexpected Expr.TyChoose - /// (Originally from ..\FSComp.txt:952) + /// (Originally from ..\FSComp.txt:954) static member tlrUnexpectedTExpr() = (1102, GetStringFunc("tlrUnexpectedTExpr",",,,") ) /// Note: Lambda-lifting optimizations have not been applied because of the use of this local constrained generic function as a first class value. Adding type constraints may resolve this condition. - /// (Originally from ..\FSComp.txt:953) + /// (Originally from ..\FSComp.txt:955) static member tlrLambdaLiftingOptimizationsNotApplied() = (1103, GetStringFunc("tlrLambdaLiftingOptimizationsNotApplied",",,,") ) /// Identifiers containing '@' are reserved for use in F# code generation - /// (Originally from ..\FSComp.txt:954) + /// (Originally from ..\FSComp.txt:956) static member lexhlpIdentifiersContainingAtSymbolReserved() = (1104, GetStringFunc("lexhlpIdentifiersContainingAtSymbolReserved",",,,") ) /// The identifier '%s' is reserved for future use by F# - /// (Originally from ..\FSComp.txt:955) + /// (Originally from ..\FSComp.txt:957) static member lexhlpIdentifierReserved(a0 : System.String) = (GetStringFunc("lexhlpIdentifierReserved",",,,%s,,,") a0) /// Missing variable '%s' - /// (Originally from ..\FSComp.txt:956) + /// (Originally from ..\FSComp.txt:958) static member patcMissingVariable(a0 : System.String) = (1106, GetStringFunc("patcMissingVariable",",,,%s,,,") a0) /// Partial active patterns may only generate one result - /// (Originally from ..\FSComp.txt:957) + /// (Originally from ..\FSComp.txt:959) static member patcPartialActivePatternsGenerateOneResult() = (1107, GetStringFunc("patcPartialActivePatternsGenerateOneResult",",,,") ) /// The type '%s' is required here and is unavailable. You must add a reference to assembly '%s'. - /// (Originally from ..\FSComp.txt:958) + /// (Originally from ..\FSComp.txt:960) static member impTypeRequiredUnavailable(a0 : System.String, a1 : System.String) = (1108, GetStringFunc("impTypeRequiredUnavailable",",,,%s,,,%s,,,") a0 a1) /// A reference to the type '%s' in assembly '%s' was found, but the type could not be found in that assembly - /// (Originally from ..\FSComp.txt:959) + /// (Originally from ..\FSComp.txt:961) static member impReferencedTypeCouldNotBeFoundInAssembly(a0 : System.String, a1 : System.String) = (1109, GetStringFunc("impReferencedTypeCouldNotBeFoundInAssembly",",,,%s,,,%s,,,") a0 a1) /// Internal error or badly formed metadata: not enough type parameters were in scope while importing - /// (Originally from ..\FSComp.txt:960) + /// (Originally from ..\FSComp.txt:962) static member impNotEnoughTypeParamsInScopeWhileImporting() = (1110, GetStringFunc("impNotEnoughTypeParamsInScopeWhileImporting",",,,") ) /// A reference to the DLL %s is required by assembly %s. The imported type %s is located in the first assembly and could not be resolved. - /// (Originally from ..\FSComp.txt:961) + /// (Originally from ..\FSComp.txt:963) static member impReferenceToDllRequiredByAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (1111, GetStringFunc("impReferenceToDllRequiredByAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// An imported assembly uses the type '%s' but that type is not public - /// (Originally from ..\FSComp.txt:962) + /// (Originally from ..\FSComp.txt:964) static member impImportedAssemblyUsesNotPublicType(a0 : System.String) = (1112, GetStringFunc("impImportedAssemblyUsesNotPublicType",",,,%s,,,") a0) /// The value '%s' was marked inline but its implementation makes use of an internal or private function which is not sufficiently accessible - /// (Originally from ..\FSComp.txt:963) + /// (Originally from ..\FSComp.txt:965) static member optValueMarkedInlineButIncomplete(a0 : System.String) = (1113, GetStringFunc("optValueMarkedInlineButIncomplete",",,,%s,,,") a0) /// The value '%s' was marked inline but was not bound in the optimization environment - /// (Originally from ..\FSComp.txt:964) + /// (Originally from ..\FSComp.txt:966) static member optValueMarkedInlineButWasNotBoundInTheOptEnv(a0 : System.String) = (1114, GetStringFunc("optValueMarkedInlineButWasNotBoundInTheOptEnv",",,,%s,,,") a0) /// Local value %s not found during optimization - /// (Originally from ..\FSComp.txt:965) + /// (Originally from ..\FSComp.txt:967) static member optLocalValueNotFoundDuringOptimization(a0 : System.String) = (1115, GetStringFunc("optLocalValueNotFoundDuringOptimization",",,,%s,,,") a0) /// A value marked as 'inline' has an unexpected value - /// (Originally from ..\FSComp.txt:966) + /// (Originally from ..\FSComp.txt:968) static member optValueMarkedInlineHasUnexpectedValue() = (1116, GetStringFunc("optValueMarkedInlineHasUnexpectedValue",",,,") ) /// A value marked as 'inline' could not be inlined - /// (Originally from ..\FSComp.txt:967) + /// (Originally from ..\FSComp.txt:969) static member optValueMarkedInlineCouldNotBeInlined() = (1117, GetStringFunc("optValueMarkedInlineCouldNotBeInlined",",,,") ) /// Failed to inline the value '%s' marked 'inline', perhaps because a recursive value was marked 'inline' - /// (Originally from ..\FSComp.txt:968) + /// (Originally from ..\FSComp.txt:970) static member optFailedToInlineValue(a0 : System.String) = (1118, GetStringFunc("optFailedToInlineValue",",,,%s,,,") a0) /// Recursive ValValue %s - /// (Originally from ..\FSComp.txt:969) + /// (Originally from ..\FSComp.txt:971) static member optRecursiveValValue(a0 : System.String) = (1119, GetStringFunc("optRecursiveValValue",",,,%s,,,") a0) /// The indentation of this 'in' token is incorrect with respect to the corresponding 'let' - /// (Originally from ..\FSComp.txt:970) + /// (Originally from ..\FSComp.txt:972) static member lexfltIncorrentIndentationOfIn() = (GetStringFunc("lexfltIncorrentIndentationOfIn",",,,") ) /// Possible incorrect indentation: this token is offside of context started at position %s. Try indenting this token further or using standard formatting conventions. - /// (Originally from ..\FSComp.txt:971) + /// (Originally from ..\FSComp.txt:973) static member lexfltTokenIsOffsideOfContextStartedEarlier(a0 : System.String) = (GetStringFunc("lexfltTokenIsOffsideOfContextStartedEarlier",",,,%s,,,") a0) /// The '|' tokens separating rules of this pattern match are misaligned by one column. Consider realigning your code or using further indentation. - /// (Originally from ..\FSComp.txt:972) + /// (Originally from ..\FSComp.txt:974) static member lexfltSeparatorTokensOfPatternMatchMisaligned() = (GetStringFunc("lexfltSeparatorTokensOfPatternMatchMisaligned",",,,") ) /// Invalid module/expression/type - /// (Originally from ..\FSComp.txt:973) + /// (Originally from ..\FSComp.txt:975) static member nrInvalidModuleExprType() = (1123, GetStringFunc("nrInvalidModuleExprType",",,,") ) /// Multiple types exist called '%s', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. '%s'. - /// (Originally from ..\FSComp.txt:974) + /// (Originally from ..\FSComp.txt:976) static member nrTypeInstantiationNeededToDisambiguateTypesWithSameName(a0 : System.String, a1 : System.String) = (1124, GetStringFunc("nrTypeInstantiationNeededToDisambiguateTypesWithSameName",",,,%s,,,%s,,,") a0 a1) /// The instantiation of the generic type '%s' is missing and can't be inferred from the arguments or return type of this member. Consider providing a type instantiation when accessing this type, e.g. '%s'. - /// (Originally from ..\FSComp.txt:975) + /// (Originally from ..\FSComp.txt:977) static member nrTypeInstantiationIsMissingAndCouldNotBeInferred(a0 : System.String, a1 : System.String) = (1125, GetStringFunc("nrTypeInstantiationIsMissingAndCouldNotBeInferred",",,,%s,,,%s,,,") a0 a1) /// 'global' may only be used as the first name in a qualified path - /// (Originally from ..\FSComp.txt:976) + /// (Originally from ..\FSComp.txt:978) static member nrGlobalUsedOnlyAsFirstName() = (1126, GetStringFunc("nrGlobalUsedOnlyAsFirstName",",,,") ) /// This is not a constructor or literal, or a constructor is being used incorrectly - /// (Originally from ..\FSComp.txt:977) + /// (Originally from ..\FSComp.txt:979) static member nrIsNotConstructorOrLiteral() = (1127, GetStringFunc("nrIsNotConstructorOrLiteral",",,,") ) /// Unexpected empty long identifier - /// (Originally from ..\FSComp.txt:978) + /// (Originally from ..\FSComp.txt:980) static member nrUnexpectedEmptyLongId() = (1128, GetStringFunc("nrUnexpectedEmptyLongId",",,,") ) /// The record type '%s' does not contain a label '%s'. - /// (Originally from ..\FSComp.txt:979) + /// (Originally from ..\FSComp.txt:981) static member nrRecordDoesNotContainSuchLabel(a0 : System.String, a1 : System.String) = (1129, GetStringFunc("nrRecordDoesNotContainSuchLabel",",,,%s,,,%s,,,") a0 a1) /// Invalid field label - /// (Originally from ..\FSComp.txt:980) + /// (Originally from ..\FSComp.txt:982) static member nrInvalidFieldLabel() = (1130, GetStringFunc("nrInvalidFieldLabel",",,,") ) /// Invalid expression '%s' - /// (Originally from ..\FSComp.txt:981) + /// (Originally from ..\FSComp.txt:983) static member nrInvalidExpression(a0 : System.String) = (1132, GetStringFunc("nrInvalidExpression",",,,%s,,,") a0) /// No constructors are available for the type '%s' - /// (Originally from ..\FSComp.txt:982) + /// (Originally from ..\FSComp.txt:984) static member nrNoConstructorsAvailableForType(a0 : System.String) = (1133, GetStringFunc("nrNoConstructorsAvailableForType",",,,%s,,,") a0) /// The union type for union case '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the union type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:983) + /// (Originally from ..\FSComp.txt:985) static member nrUnionTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1134, GetStringFunc("nrUnionTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// The record type for the record field '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the record type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:984) + /// (Originally from ..\FSComp.txt:986) static member nrRecordTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1135, GetStringFunc("nrRecordTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// Unexpected error creating debug information file '%s' - /// (Originally from ..\FSComp.txt:985) + /// (Originally from ..\FSComp.txt:987) static member ilwriteErrorCreatingPdb(a0 : System.String) = (1136, GetStringFunc("ilwriteErrorCreatingPdb",",,,%s,,,") a0) /// This number is outside the allowable range for this integer type - /// (Originally from ..\FSComp.txt:986) + /// (Originally from ..\FSComp.txt:988) static member lexOutsideIntegerRange() = (1138, GetStringFunc("lexOutsideIntegerRange",",,,") ) /// '%s' is not permitted as a character in operator names and is reserved for future use - /// (Originally from ..\FSComp.txt:990) + /// (Originally from ..\FSComp.txt:992) static member lexCharNotAllowedInOperatorNames(a0 : System.String) = (GetStringFunc("lexCharNotAllowedInOperatorNames",",,,%s,,,") a0) /// Unexpected character '%s' - /// (Originally from ..\FSComp.txt:991) + /// (Originally from ..\FSComp.txt:993) static member lexUnexpectedChar(a0 : System.String) = (GetStringFunc("lexUnexpectedChar",",,,%s,,,") a0) /// This byte array literal contains characters that do not encode as a single byte - /// (Originally from ..\FSComp.txt:992) + /// (Originally from ..\FSComp.txt:994) static member lexByteArrayCannotEncode() = (1140, GetStringFunc("lexByteArrayCannotEncode",",,,") ) /// Identifiers followed by '%s' are reserved for future use - /// (Originally from ..\FSComp.txt:993) + /// (Originally from ..\FSComp.txt:995) static member lexIdentEndInMarkReserved(a0 : System.String) = (1141, GetStringFunc("lexIdentEndInMarkReserved",",,,%s,,,") a0) /// This number is outside the allowable range for 8-bit signed integers - /// (Originally from ..\FSComp.txt:994) + /// (Originally from ..\FSComp.txt:996) static member lexOutsideEightBitSigned() = (1142, GetStringFunc("lexOutsideEightBitSigned",",,,") ) /// This number is outside the allowable range for hexadecimal 8-bit signed integers - /// (Originally from ..\FSComp.txt:995) + /// (Originally from ..\FSComp.txt:997) static member lexOutsideEightBitSignedHex() = (1143, GetStringFunc("lexOutsideEightBitSignedHex",",,,") ) /// This number is outside the allowable range for 8-bit unsigned integers - /// (Originally from ..\FSComp.txt:996) + /// (Originally from ..\FSComp.txt:998) static member lexOutsideEightBitUnsigned() = (1144, GetStringFunc("lexOutsideEightBitUnsigned",",,,") ) /// This number is outside the allowable range for 16-bit signed integers - /// (Originally from ..\FSComp.txt:997) + /// (Originally from ..\FSComp.txt:999) static member lexOutsideSixteenBitSigned() = (1145, GetStringFunc("lexOutsideSixteenBitSigned",",,,") ) /// This number is outside the allowable range for 16-bit unsigned integers - /// (Originally from ..\FSComp.txt:998) + /// (Originally from ..\FSComp.txt:1000) static member lexOutsideSixteenBitUnsigned() = (1146, GetStringFunc("lexOutsideSixteenBitUnsigned",",,,") ) /// This number is outside the allowable range for 32-bit signed integers - /// (Originally from ..\FSComp.txt:999) + /// (Originally from ..\FSComp.txt:1001) static member lexOutsideThirtyTwoBitSigned() = (1147, GetStringFunc("lexOutsideThirtyTwoBitSigned",",,,") ) /// This number is outside the allowable range for 32-bit unsigned integers - /// (Originally from ..\FSComp.txt:1000) + /// (Originally from ..\FSComp.txt:1002) static member lexOutsideThirtyTwoBitUnsigned() = (1148, GetStringFunc("lexOutsideThirtyTwoBitUnsigned",",,,") ) /// This number is outside the allowable range for 64-bit signed integers - /// (Originally from ..\FSComp.txt:1001) + /// (Originally from ..\FSComp.txt:1003) static member lexOutsideSixtyFourBitSigned() = (1149, GetStringFunc("lexOutsideSixtyFourBitSigned",",,,") ) /// This number is outside the allowable range for 64-bit unsigned integers - /// (Originally from ..\FSComp.txt:1002) + /// (Originally from ..\FSComp.txt:1004) static member lexOutsideSixtyFourBitUnsigned() = (1150, GetStringFunc("lexOutsideSixtyFourBitUnsigned",",,,") ) /// This number is outside the allowable range for signed native integers - /// (Originally from ..\FSComp.txt:1003) + /// (Originally from ..\FSComp.txt:1005) static member lexOutsideNativeSigned() = (1151, GetStringFunc("lexOutsideNativeSigned",",,,") ) /// This number is outside the allowable range for unsigned native integers - /// (Originally from ..\FSComp.txt:1004) + /// (Originally from ..\FSComp.txt:1006) static member lexOutsideNativeUnsigned() = (1152, GetStringFunc("lexOutsideNativeUnsigned",",,,") ) /// Invalid floating point number - /// (Originally from ..\FSComp.txt:1005) + /// (Originally from ..\FSComp.txt:1007) static member lexInvalidFloat() = (1153, GetStringFunc("lexInvalidFloat",",,,") ) /// This number is outside the allowable range for decimal literals - /// (Originally from ..\FSComp.txt:1006) + /// (Originally from ..\FSComp.txt:1008) static member lexOusideDecimal() = (1154, GetStringFunc("lexOusideDecimal",",,,") ) /// This number is outside the allowable range for 32-bit floats - /// (Originally from ..\FSComp.txt:1007) + /// (Originally from ..\FSComp.txt:1009) static member lexOusideThirtyTwoBitFloat() = (1155, GetStringFunc("lexOusideThirtyTwoBitFloat",",,,") ) /// This is not a valid numeric literal. Valid numeric literals include 1, 0x1, 0b0001 (int), 1u (uint32), 1L (int64), 1UL (uint64), 1s (int16), 1y (sbyte), 1uy (byte), 1.0 (float), 1.0f (float32), 1.0m (decimal), 1I (BigInteger). - /// (Originally from ..\FSComp.txt:1008) + /// (Originally from ..\FSComp.txt:1010) static member lexInvalidNumericLiteral() = (1156, GetStringFunc("lexInvalidNumericLiteral",",,,") ) /// This is not a valid byte literal - /// (Originally from ..\FSComp.txt:1009) + /// (Originally from ..\FSComp.txt:1011) static member lexInvalidByteLiteral() = (1157, GetStringFunc("lexInvalidByteLiteral",",,,") ) /// This is not a valid character literal - /// (Originally from ..\FSComp.txt:1010) + /// (Originally from ..\FSComp.txt:1012) static member lexInvalidCharLiteral() = (1158, GetStringFunc("lexInvalidCharLiteral",",,,") ) /// This Unicode encoding is only valid in string literals - /// (Originally from ..\FSComp.txt:1011) + /// (Originally from ..\FSComp.txt:1013) static member lexThisUnicodeOnlyInStringLiterals() = (1159, GetStringFunc("lexThisUnicodeOnlyInStringLiterals",",,,") ) /// This token is reserved for future use - /// (Originally from ..\FSComp.txt:1012) + /// (Originally from ..\FSComp.txt:1014) static member lexTokenReserved() = (1160, GetStringFunc("lexTokenReserved",",,,") ) /// TABs are not allowed in F# code unless the #indent \"off\" option is used - /// (Originally from ..\FSComp.txt:1013) + /// (Originally from ..\FSComp.txt:1015) static member lexTabsNotAllowed() = (1161, GetStringFunc("lexTabsNotAllowed",",,,") ) /// Invalid line number: '%s' - /// (Originally from ..\FSComp.txt:1014) + /// (Originally from ..\FSComp.txt:1016) static member lexInvalidLineNumber(a0 : System.String) = (1162, GetStringFunc("lexInvalidLineNumber",",,,%s,,,") a0) /// #if directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1015) + /// (Originally from ..\FSComp.txt:1017) static member lexHashIfMustBeFirst() = (1163, GetStringFunc("lexHashIfMustBeFirst",",,,") ) /// #else has no matching #if - /// (Originally from ..\FSComp.txt:1016) + /// (Originally from ..\FSComp.txt:1018) static member lexHashElseNoMatchingIf() = (GetStringFunc("lexHashElseNoMatchingIf",",,,") ) /// #endif required for #else - /// (Originally from ..\FSComp.txt:1017) + /// (Originally from ..\FSComp.txt:1019) static member lexHashEndifRequiredForElse() = (GetStringFunc("lexHashEndifRequiredForElse",",,,") ) /// #else directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1018) + /// (Originally from ..\FSComp.txt:1020) static member lexHashElseMustBeFirst() = (1166, GetStringFunc("lexHashElseMustBeFirst",",,,") ) /// #endif has no matching #if - /// (Originally from ..\FSComp.txt:1019) + /// (Originally from ..\FSComp.txt:1021) static member lexHashEndingNoMatchingIf() = (GetStringFunc("lexHashEndingNoMatchingIf",",,,") ) /// #endif directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1020) + /// (Originally from ..\FSComp.txt:1022) static member lexHashEndifMustBeFirst() = (1168, GetStringFunc("lexHashEndifMustBeFirst",",,,") ) /// #if directive should be immediately followed by an identifier - /// (Originally from ..\FSComp.txt:1021) + /// (Originally from ..\FSComp.txt:1023) static member lexHashIfMustHaveIdent() = (1169, GetStringFunc("lexHashIfMustHaveIdent",",,,") ) /// Syntax error. Wrong nested #endif, unexpected tokens before it. - /// (Originally from ..\FSComp.txt:1022) + /// (Originally from ..\FSComp.txt:1024) static member lexWrongNestedHashEndif() = (1170, GetStringFunc("lexWrongNestedHashEndif",",,,") ) /// #! may only appear as the first line at the start of a file. - /// (Originally from ..\FSComp.txt:1023) + /// (Originally from ..\FSComp.txt:1025) static member lexHashBangMustBeFirstInFile() = (GetStringFunc("lexHashBangMustBeFirstInFile",",,,") ) /// Expected single line comment or end of line - /// (Originally from ..\FSComp.txt:1024) + /// (Originally from ..\FSComp.txt:1026) static member pplexExpectedSingleLineComment() = (1171, GetStringFunc("pplexExpectedSingleLineComment",",,,") ) /// Infix operator member '%s' has no arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1025) + /// (Originally from ..\FSComp.txt:1027) static member memberOperatorDefinitionWithNoArguments(a0 : System.String) = (1172, GetStringFunc("memberOperatorDefinitionWithNoArguments",",,,%s,,,") a0) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1026) + /// (Originally from ..\FSComp.txt:1028) static member memberOperatorDefinitionWithNonPairArgument(a0 : System.String, a1 : System.Int32) = (1173, GetStringFunc("memberOperatorDefinitionWithNonPairArgument",",,,%s,,,%d,,,") a0 a1) /// Infix operator member '%s' has extra curried arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1027) + /// (Originally from ..\FSComp.txt:1029) static member memberOperatorDefinitionWithCurriedArguments(a0 : System.String) = (1174, GetStringFunc("memberOperatorDefinitionWithCurriedArguments",",,,%s,,,") a0) /// All record, union and struct types in FSharp.Core.dll must be explicitly labelled with 'StructuralComparison' or 'NoComparison' - /// (Originally from ..\FSComp.txt:1028) + /// (Originally from ..\FSComp.txt:1030) static member tcFSharpCoreRequiresExplicit() = (1175, GetStringFunc("tcFSharpCoreRequiresExplicit",",,,") ) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the type parameter '%s' does not satisfy the 'comparison' constraint. Consider adding the 'comparison' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1029) + /// (Originally from ..\FSComp.txt:1031) static member tcStructuralComparisonNotSatisfied1(a0 : System.String, a1 : System.String) = (1176, GetStringFunc("tcStructuralComparisonNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the component type '%s' does not satisfy the 'comparison' constraint - /// (Originally from ..\FSComp.txt:1030) + /// (Originally from ..\FSComp.txt:1032) static member tcStructuralComparisonNotSatisfied2(a0 : System.String, a1 : System.String) = (1177, GetStringFunc("tcStructuralComparisonNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' is not structurally comparable because the type parameter %s does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1031) + /// (Originally from ..\FSComp.txt:1033) static member tcNoComparisonNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' is not structurally comparable because the type '%s' does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1032) + /// (Originally from ..\FSComp.txt:1034) static member tcNoComparisonNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type parameter %s does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1033) + /// (Originally from ..\FSComp.txt:1035) static member tcNoEqualityNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type '%s' does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1034) + /// (Originally from ..\FSComp.txt:1036) static member tcNoEqualityNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the type parameter '%s' does not satisfy the 'equality' constraint. Consider adding the 'equality' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1035) + /// (Originally from ..\FSComp.txt:1037) static member tcStructuralEqualityNotSatisfied1(a0 : System.String, a1 : System.String) = (1179, GetStringFunc("tcStructuralEqualityNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the component type '%s' does not satisfy the 'equality' constraint - /// (Originally from ..\FSComp.txt:1036) + /// (Originally from ..\FSComp.txt:1038) static member tcStructuralEqualityNotSatisfied2(a0 : System.String, a1 : System.String) = (1180, GetStringFunc("tcStructuralEqualityNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// Each argument of the primary constructor for a struct must be given a type, for example 'type S(x1:int, x2: int) = ...'. These arguments determine the fields of the struct. - /// (Originally from ..\FSComp.txt:1037) + /// (Originally from ..\FSComp.txt:1039) static member tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly() = (1181, GetStringFunc("tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly",",,,") ) /// The value '%s' is unused - /// (Originally from ..\FSComp.txt:1038) + /// (Originally from ..\FSComp.txt:1040) static member chkUnusedValue(a0 : System.String) = (1182, GetStringFunc("chkUnusedValue",",,,%s,,,") a0) /// The recursive object reference '%s' is unused. The presence of a recursive object reference adds runtime initialization checks to members in this and derived types. Consider removing this recursive object reference. - /// (Originally from ..\FSComp.txt:1039) + /// (Originally from ..\FSComp.txt:1041) static member chkUnusedThisVariable(a0 : System.String) = (1183, GetStringFunc("chkUnusedThisVariable",",,,%s,,,") a0) /// A getter property may have at most one argument group - /// (Originally from ..\FSComp.txt:1040) + /// (Originally from ..\FSComp.txt:1042) static member parsGetterAtMostOneArgument() = (1184, GetStringFunc("parsGetterAtMostOneArgument",",,,") ) /// A setter property may have at most two argument groups - /// (Originally from ..\FSComp.txt:1041) + /// (Originally from ..\FSComp.txt:1043) static member parsSetterAtMostTwoArguments() = (1185, GetStringFunc("parsSetterAtMostTwoArguments",",,,") ) /// Invalid property getter or setter - /// (Originally from ..\FSComp.txt:1042) + /// (Originally from ..\FSComp.txt:1044) static member parsInvalidProperty() = (1186, GetStringFunc("parsInvalidProperty",",,,") ) /// An indexer property must be given at least one argument - /// (Originally from ..\FSComp.txt:1043) + /// (Originally from ..\FSComp.txt:1045) static member parsIndexerPropertyRequiresAtLeastOneArgument() = (1187, GetStringFunc("parsIndexerPropertyRequiresAtLeastOneArgument",",,,") ) /// This operation accesses a mutable top-level value defined in another assembly in an unsupported way. The value cannot be accessed through its address. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...', and if necessary assigning the value back after the completion of the operation - /// (Originally from ..\FSComp.txt:1044) + /// (Originally from ..\FSComp.txt:1046) static member tastInvalidAddressOfMutableAcrossAssemblyBoundary() = (1188, GetStringFunc("tastInvalidAddressOfMutableAcrossAssemblyBoundary",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"type C<'T>\", not type \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1045) + /// (Originally from ..\FSComp.txt:1047) static member parsNonAdjacentTypars() = (1189, GetStringFunc("parsNonAdjacentTypars",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"C<'T>\", not \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1046) + /// (Originally from ..\FSComp.txt:1048) static member parsNonAdjacentTyargs() = (1190, GetStringFunc("parsNonAdjacentTyargs",",,,") ) /// The use of the type syntax 'int C' and 'C ' is not permitted here. Consider adjusting this type to be written in the form 'C' - /// (Originally from ..\FSComp.txt:1047) + /// (Originally from ..\FSComp.txt:1049) static member parsNonAtomicType() = (GetStringFunc("parsNonAtomicType",",,,") ) /// The module/namespace '%s' from compilation unit '%s' did not contain the module/namespace '%s' - /// (Originally from ..\FSComp.txt:1050) + /// (Originally from ..\FSComp.txt:1052) static member tastUndefinedItemRefModuleNamespace(a0 : System.String, a1 : System.String, a2 : System.String) = (1193, GetStringFunc("tastUndefinedItemRefModuleNamespace",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the val '%s' - /// (Originally from ..\FSComp.txt:1051) + /// (Originally from ..\FSComp.txt:1053) static member tastUndefinedItemRefVal(a0 : System.String, a1 : System.String, a2 : System.String) = (1194, GetStringFunc("tastUndefinedItemRefVal",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the namespace, module or type '%s' - /// (Originally from ..\FSComp.txt:1052) + /// (Originally from ..\FSComp.txt:1054) static member tastUndefinedItemRefModuleNamespaceType(a0 : System.String, a1 : System.String, a2 : System.String) = (1195, GetStringFunc("tastUndefinedItemRefModuleNamespaceType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The 'UseNullAsTrueValue' attribute flag may only be used with union types that have one nullary case and at least one non-nullary case - /// (Originally from ..\FSComp.txt:1053) + /// (Originally from ..\FSComp.txt:1055) static member tcInvalidUseNullAsTrueValue() = (1196, GetStringFunc("tcInvalidUseNullAsTrueValue",",,,") ) /// The parameter '%s' was inferred to have byref type. Parameters of byref type must be given an explicit type annotation, e.g. 'x1: byref'. When used, a byref parameter is implicitly dereferenced. - /// (Originally from ..\FSComp.txt:1054) + /// (Originally from ..\FSComp.txt:1056) static member tcParameterInferredByref(a0 : System.String) = (1197, GetStringFunc("tcParameterInferredByref",",,,%s,,,") a0) /// The generic member '%s' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints. - /// (Originally from ..\FSComp.txt:1055) + /// (Originally from ..\FSComp.txt:1057) static member tcNonUniformMemberUse(a0 : System.String) = (1198, GetStringFunc("tcNonUniformMemberUse",",,,%s,,,") a0) /// The attribute '%s' appears in both the implementation and the signature, but the attribute arguments differ. Only the attribute from the signature will be included in the compiled code. - /// (Originally from ..\FSComp.txt:1056) + /// (Originally from ..\FSComp.txt:1058) static member tcAttribArgsDiffer(a0 : System.String) = (1200, GetStringFunc("tcAttribArgsDiffer",",,,%s,,,") a0) /// Cannot call an abstract base member: '%s' - /// (Originally from ..\FSComp.txt:1057) + /// (Originally from ..\FSComp.txt:1059) static member tcCannotCallAbstractBaseMember(a0 : System.String) = (1201, GetStringFunc("tcCannotCallAbstractBaseMember",",,,%s,,,") a0) /// Could not resolve the ambiguity in the use of a generic construct with an 'unmanaged' constraint at or near this position - /// (Originally from ..\FSComp.txt:1058) + /// (Originally from ..\FSComp.txt:1060) static member typrelCannotResolveAmbiguityInUnmanaged() = (1202, GetStringFunc("typrelCannotResolveAmbiguityInUnmanaged",",,,") ) /// This construct is for ML compatibility. %s. You can disable this warning by using '--mlcompatibility' or '--nowarn:62'. - /// (Originally from ..\FSComp.txt:1061) + /// (Originally from ..\FSComp.txt:1063) static member mlCompatMessage(a0 : System.String) = (GetStringFunc("mlCompatMessage",",,,%s,,,") a0) /// The type '%s' has been marked as having an Explicit layout, but the field '%s' has not been marked with the 'FieldOffset' attribute - /// (Originally from ..\FSComp.txt:1063) + /// (Originally from ..\FSComp.txt:1065) static member ilFieldDoesNotHaveValidOffsetForStructureLayout(a0 : System.String, a1 : System.String) = (1206, GetStringFunc("ilFieldDoesNotHaveValidOffsetForStructureLayout",",,,%s,,,%s,,,") a0 a1) /// Interfaces inherited by other interfaces should be declared using 'inherit ...' instead of 'interface ...' - /// (Originally from ..\FSComp.txt:1064) + /// (Originally from ..\FSComp.txt:1066) static member tcInterfacesShouldUseInheritNotInterface() = (1207, GetStringFunc("tcInterfacesShouldUseInheritNotInterface",",,,") ) /// Invalid prefix operator - /// (Originally from ..\FSComp.txt:1065) + /// (Originally from ..\FSComp.txt:1067) static member parsInvalidPrefixOperator() = (1208, GetStringFunc("parsInvalidPrefixOperator",",,,") ) /// Invalid operator definition. Prefix operator definitions must use a valid prefix operator name. - /// (Originally from ..\FSComp.txt:1066) + /// (Originally from ..\FSComp.txt:1068) static member parsInvalidPrefixOperatorDefinition() = (1208, GetStringFunc("parsInvalidPrefixOperatorDefinition",",,,") ) /// The file extensions '.ml' and '.mli' are for ML compatibility - /// (Originally from ..\FSComp.txt:1067) + /// (Originally from ..\FSComp.txt:1069) static member buildCompilingExtensionIsForML() = (GetStringFunc("buildCompilingExtensionIsForML",",,,") ) /// Consider using a file with extension '.ml' or '.mli' instead - /// (Originally from ..\FSComp.txt:1068) + /// (Originally from ..\FSComp.txt:1070) static member lexIndentOffForML() = (GetStringFunc("lexIndentOffForML",",,,") ) /// Active pattern '%s' is not a function - /// (Originally from ..\FSComp.txt:1069) + /// (Originally from ..\FSComp.txt:1071) static member activePatternIdentIsNotFunctionTyped(a0 : System.String) = (1209, GetStringFunc("activePatternIdentIsNotFunctionTyped",",,,%s,,,") a0) /// Active pattern '%s' has a result type containing type variables that are not determined by the input. The common cause is a when a result case is not mentioned, e.g. 'let (|A|B|) (x:int) = A x'. This can be fixed with a type constraint, e.g. 'let (|A|B|) (x:int) : Choice = A x' - /// (Originally from ..\FSComp.txt:1070) + /// (Originally from ..\FSComp.txt:1072) static member activePatternChoiceHasFreeTypars(a0 : System.String) = (1210, GetStringFunc("activePatternChoiceHasFreeTypars",",,,%s,,,") a0) /// The FieldOffset attribute can only be placed on members of types marked with the StructLayout(LayoutKind.Explicit) - /// (Originally from ..\FSComp.txt:1071) + /// (Originally from ..\FSComp.txt:1073) static member ilFieldHasOffsetForSequentialLayout() = (1211, GetStringFunc("ilFieldHasOffsetForSequentialLayout",",,,") ) /// Optional arguments must come at the end of the argument list, after any non-optional arguments - /// (Originally from ..\FSComp.txt:1072) + /// (Originally from ..\FSComp.txt:1074) static member tcOptionalArgsMustComeAfterNonOptionalArgs() = (1212, GetStringFunc("tcOptionalArgsMustComeAfterNonOptionalArgs",",,,") ) /// Attribute 'System.Diagnostics.ConditionalAttribute' is only valid on methods or attribute classes - /// (Originally from ..\FSComp.txt:1073) + /// (Originally from ..\FSComp.txt:1075) static member tcConditionalAttributeUsage() = (1213, GetStringFunc("tcConditionalAttributeUsage",",,,") ) /// Extension members cannot provide operator overloads. Consider defining the operator as part of the type definition instead. - /// (Originally from ..\FSComp.txt:1075) + /// (Originally from ..\FSComp.txt:1077) static member tcMemberOperatorDefinitionInExtrinsic() = (1215, GetStringFunc("tcMemberOperatorDefinitionInExtrinsic",",,,") ) /// The name of the MDB file must be .mdb. The --pdb option will be ignored. - /// (Originally from ..\FSComp.txt:1076) + /// (Originally from ..\FSComp.txt:1078) static member ilwriteMDBFileNameCannotBeChangedWarning() = (1216, GetStringFunc("ilwriteMDBFileNameCannotBeChangedWarning",",,,") ) /// MDB generation failed. Could not find compatible member %s - /// (Originally from ..\FSComp.txt:1077) + /// (Originally from ..\FSComp.txt:1079) static member ilwriteMDBMemberMissing(a0 : System.String) = (1217, GetStringFunc("ilwriteMDBMemberMissing",",,,%s,,,") a0) /// Cannot generate MDB debug information. Failed to load the 'MonoSymbolWriter' type from the 'Mono.CompilerServices.SymbolWriter.dll' assembly. - /// (Originally from ..\FSComp.txt:1078) + /// (Originally from ..\FSComp.txt:1080) static member ilwriteErrorCreatingMdb() = (1218, GetStringFunc("ilwriteErrorCreatingMdb",",,,") ) /// The union case named '%s' conflicts with the generated type '%s' - /// (Originally from ..\FSComp.txt:1079) + /// (Originally from ..\FSComp.txt:1081) static member tcUnionCaseNameConflictsWithGeneratedType(a0 : System.String, a1 : System.String) = (1219, GetStringFunc("tcUnionCaseNameConflictsWithGeneratedType",",,,%s,,,%s,,,") a0 a1) /// ReflectedDefinitionAttribute may not be applied to an instance member on a struct type, because the instance member takes an implicit 'this' byref parameter - /// (Originally from ..\FSComp.txt:1080) + /// (Originally from ..\FSComp.txt:1082) static member chkNoReflectedDefinitionOnStructMember() = (1220, GetStringFunc("chkNoReflectedDefinitionOnStructMember",",,,") ) /// DLLImport bindings must be static members in a class or function definitions in a module - /// (Originally from ..\FSComp.txt:1081) + /// (Originally from ..\FSComp.txt:1083) static member tcDllImportNotAllowed() = (1221, GetStringFunc("tcDllImportNotAllowed",",,,") ) /// When mscorlib.dll or FSharp.Core.dll is explicitly referenced the %s option must also be passed - /// (Originally from ..\FSComp.txt:1082) + /// (Originally from ..\FSComp.txt:1084) static member buildExplicitCoreLibRequiresNoFramework(a0 : System.String) = (1222, GetStringFunc("buildExplicitCoreLibRequiresNoFramework",",,,%s,,,") a0) /// FSharp.Core.sigdata not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1083) + /// (Originally from ..\FSComp.txt:1085) static member buildExpectedSigdataFile(a0 : System.String) = (1223, GetStringFunc("buildExpectedSigdataFile",",,,%s,,,") a0) /// File '%s' not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1084) + /// (Originally from ..\FSComp.txt:1086) static member buildExpectedFileAlongSideFSharpCore(a0 : System.String, a1 : System.String) = (1225, GetStringFunc("buildExpectedFileAlongSideFSharpCore",",,,%s,,,%s,,,") a0 a1) /// Filename '%s' contains invalid character '%s' - /// (Originally from ..\FSComp.txt:1085) + /// (Originally from ..\FSComp.txt:1087) static member buildUnexpectedFileNameCharacter(a0 : System.String, a1 : System.String) = (1227, GetStringFunc("buildUnexpectedFileNameCharacter",",,,%s,,,%s,,,") a0 a1) /// 'use!' bindings must be of the form 'use! = ' - /// (Originally from ..\FSComp.txt:1086) + /// (Originally from ..\FSComp.txt:1088) static member tcInvalidUseBangBinding() = (1228, GetStringFunc("tcInvalidUseBangBinding",",,,") ) /// Inner generic functions are not permitted in quoted expressions. Consider adding some type constraints until this function is no longer generic. - /// (Originally from ..\FSComp.txt:1087) + /// (Originally from ..\FSComp.txt:1089) static member crefNoInnerGenericsInQuotations() = (1230, GetStringFunc("crefNoInnerGenericsInQuotations",",,,") ) /// The type '%s' is not a valid enumerator type , i.e. does not have a 'MoveNext()' method returning a bool, and a 'Current' property - /// (Originally from ..\FSComp.txt:1088) + /// (Originally from ..\FSComp.txt:1090) static member tcEnumTypeCannotBeEnumerated(a0 : System.String) = (1231, GetStringFunc("tcEnumTypeCannotBeEnumerated",",,,%s,,,") a0) /// End of file in triple-quote string begun at or before here - /// (Originally from ..\FSComp.txt:1089) + /// (Originally from ..\FSComp.txt:1091) static member parsEofInTripleQuoteString() = (1232, GetStringFunc("parsEofInTripleQuoteString",",,,") ) /// End of file in triple-quote string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:1090) + /// (Originally from ..\FSComp.txt:1092) static member parsEofInTripleQuoteStringInComment() = (1233, GetStringFunc("parsEofInTripleQuoteStringInComment",",,,") ) /// This type test or downcast will ignore the unit-of-measure '%s' - /// (Originally from ..\FSComp.txt:1091) + /// (Originally from ..\FSComp.txt:1093) static member tcTypeTestLosesMeasures(a0 : System.String) = (1240, GetStringFunc("tcTypeTestLosesMeasures",",,,%s,,,") a0) /// Expected type argument or static argument - /// (Originally from ..\FSComp.txt:1092) + /// (Originally from ..\FSComp.txt:1094) static member parsMissingTypeArgs() = (1241, GetStringFunc("parsMissingTypeArgs",",,,") ) /// Unmatched '<'. Expected closing '>' - /// (Originally from ..\FSComp.txt:1093) + /// (Originally from ..\FSComp.txt:1095) static member parsMissingGreaterThan() = (1242, GetStringFunc("parsMissingGreaterThan",",,,") ) /// Unexpected quotation operator '<@' in type definition. If you intend to pass a verbatim string as a static argument to a type provider, put a space between the '<' and '@' characters. - /// (Originally from ..\FSComp.txt:1094) + /// (Originally from ..\FSComp.txt:1096) static member parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString() = (1243, GetStringFunc("parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString",",,,") ) /// Attempted to parse this as an operator name, but failed - /// (Originally from ..\FSComp.txt:1095) + /// (Originally from ..\FSComp.txt:1097) static member parsErrorParsingAsOperatorName() = (1244, GetStringFunc("parsErrorParsingAsOperatorName",",,,") ) /// \U%s is not a valid Unicode character escape sequence - /// (Originally from ..\FSComp.txt:1096) + /// (Originally from ..\FSComp.txt:1098) static member lexInvalidUnicodeLiteral(a0 : System.String) = (1245, GetStringFunc("lexInvalidUnicodeLiteral",",,,%s,,,") a0) /// '%s' must be applied to an argument of type '%s', but has been applied to an argument of type '%s' - /// (Originally from ..\FSComp.txt:1097) + /// (Originally from ..\FSComp.txt:1099) static member tcCallerInfoWrongType(a0 : System.String, a1 : System.String, a2 : System.String) = (1246, GetStringFunc("tcCallerInfoWrongType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// '%s' can only be applied to optional arguments - /// (Originally from ..\FSComp.txt:1098) + /// (Originally from ..\FSComp.txt:1100) static member tcCallerInfoNotOptional(a0 : System.String) = (1247, GetStringFunc("tcCallerInfoNotOptional",",,,%s,,,") a0) /// The specified .NET Framework version '%s' is not supported. Please specify a value from the enumeration Microsoft.Build.Utilities.TargetDotNetFrameworkVersion. - /// (Originally from ..\FSComp.txt:1100) + /// (Originally from ..\FSComp.txt:1102) static member toolLocationHelperUnsupportedFrameworkVersion(a0 : System.String) = (1300, GetStringFunc("toolLocationHelperUnsupportedFrameworkVersion",",,,%s,,,") a0) /// Invalid Magic value in CLR Header - /// (Originally from ..\FSComp.txt:1104) + /// (Originally from ..\FSComp.txt:1106) static member ilSignInvalidMagicValue() = (1301, GetStringFunc("ilSignInvalidMagicValue",",,,") ) /// Bad image format - /// (Originally from ..\FSComp.txt:1105) + /// (Originally from ..\FSComp.txt:1107) static member ilSignBadImageFormat() = (1302, GetStringFunc("ilSignBadImageFormat",",,,") ) /// Private key expected - /// (Originally from ..\FSComp.txt:1106) + /// (Originally from ..\FSComp.txt:1108) static member ilSignPrivateKeyExpected() = (1303, GetStringFunc("ilSignPrivateKeyExpected",",,,") ) /// RSA key expected - /// (Originally from ..\FSComp.txt:1107) + /// (Originally from ..\FSComp.txt:1109) static member ilSignRsaKeyExpected() = (1304, GetStringFunc("ilSignRsaKeyExpected",",,,") ) /// Invalid bit Length - /// (Originally from ..\FSComp.txt:1108) + /// (Originally from ..\FSComp.txt:1110) static member ilSignInvalidBitLen() = (1305, GetStringFunc("ilSignInvalidBitLen",",,,") ) /// Invalid RSAParameters structure - '{0}' expected - /// (Originally from ..\FSComp.txt:1109) + /// (Originally from ..\FSComp.txt:1111) static member ilSignInvalidRSAParams() = (1306, GetStringFunc("ilSignInvalidRSAParams",",,,") ) /// Invalid algId - 'Exponent' expected - /// (Originally from ..\FSComp.txt:1110) + /// (Originally from ..\FSComp.txt:1112) static member ilSignInvalidAlgId() = (1307, GetStringFunc("ilSignInvalidAlgId",",,,") ) /// Invalid signature size - /// (Originally from ..\FSComp.txt:1111) + /// (Originally from ..\FSComp.txt:1113) static member ilSignInvalidSignatureSize() = (1308, GetStringFunc("ilSignInvalidSignatureSize",",,,") ) /// No signature directory - /// (Originally from ..\FSComp.txt:1112) + /// (Originally from ..\FSComp.txt:1114) static member ilSignNoSignatureDirectory() = (1309, GetStringFunc("ilSignNoSignatureDirectory",",,,") ) /// Invalid Public Key blob - /// (Originally from ..\FSComp.txt:1113) + /// (Originally from ..\FSComp.txt:1115) static member ilSignInvalidPKBlob() = (1310, GetStringFunc("ilSignInvalidPKBlob",",,,") ) /// Exiting - too many errors - /// (Originally from ..\FSComp.txt:1115) + /// (Originally from ..\FSComp.txt:1117) static member fscTooManyErrors() = (GetStringFunc("fscTooManyErrors",",,,") ) /// The documentation file has no .xml suffix - /// (Originally from ..\FSComp.txt:1116) + /// (Originally from ..\FSComp.txt:1118) static member docfileNoXmlSuffix() = (2001, GetStringFunc("docfileNoXmlSuffix",",,,") ) /// No implementation files specified - /// (Originally from ..\FSComp.txt:1117) + /// (Originally from ..\FSComp.txt:1119) static member fscNoImplementationFiles() = (2002, GetStringFunc("fscNoImplementationFiles",",,,") ) /// The attribute %s specified version '%s', but this value is invalid and has been ignored - /// (Originally from ..\FSComp.txt:1118) + /// (Originally from ..\FSComp.txt:1120) static member fscBadAssemblyVersion(a0 : System.String, a1 : System.String) = (2003, GetStringFunc("fscBadAssemblyVersion",",,,%s,,,%s,,,") a0 a1) /// Conflicting options specified: 'win32manifest' and 'win32res'. Only one of these can be used. - /// (Originally from ..\FSComp.txt:1119) + /// (Originally from ..\FSComp.txt:1121) static member fscTwoResourceManifests() = (2004, GetStringFunc("fscTwoResourceManifests",",,,") ) /// The code in assembly '%s' makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1120) + /// (Originally from ..\FSComp.txt:1122) static member fscQuotationLiteralsStaticLinking(a0 : System.String) = (2005, GetStringFunc("fscQuotationLiteralsStaticLinking",",,,%s,,,") a0) /// Code in this assembly makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1121) + /// (Originally from ..\FSComp.txt:1123) static member fscQuotationLiteralsStaticLinking0() = (2006, GetStringFunc("fscQuotationLiteralsStaticLinking0",",,,") ) /// Static linking may not include a .EXE - /// (Originally from ..\FSComp.txt:1122) + /// (Originally from ..\FSComp.txt:1124) static member fscStaticLinkingNoEXE() = (2007, GetStringFunc("fscStaticLinkingNoEXE",",,,") ) /// Static linking may not include a mixed managed/unmanaged DLL - /// (Originally from ..\FSComp.txt:1123) + /// (Originally from ..\FSComp.txt:1125) static member fscStaticLinkingNoMixedDLL() = (2008, GetStringFunc("fscStaticLinkingNoMixedDLL",",,,") ) /// Ignoring mixed managed/unmanaged assembly '%s' during static linking - /// (Originally from ..\FSComp.txt:1124) + /// (Originally from ..\FSComp.txt:1126) static member fscIgnoringMixedWhenLinking(a0 : System.String) = (2009, GetStringFunc("fscIgnoringMixedWhenLinking",",,,%s,,,") a0) /// Assembly '%s' was referenced transitively and the assembly could not be resolved automatically. Static linking will assume this DLL has no dependencies on the F# library or other statically linked DLLs. Consider adding an explicit reference to this DLL. - /// (Originally from ..\FSComp.txt:1125) + /// (Originally from ..\FSComp.txt:1127) static member fscAssumeStaticLinkContainsNoDependencies(a0 : System.String) = (2011, GetStringFunc("fscAssumeStaticLinkContainsNoDependencies",",,,%s,,,") a0) /// Assembly '%s' not found in dependency set of target binary. Statically linked roots should be specified using an assembly name, without a DLL or EXE extension. If this assembly was referenced explicitly then it is possible the assembly was not actually required by the generated binary, in which case it should not be statically linked. - /// (Originally from ..\FSComp.txt:1126) + /// (Originally from ..\FSComp.txt:1128) static member fscAssemblyNotFoundInDependencySet(a0 : System.String) = (2012, GetStringFunc("fscAssemblyNotFoundInDependencySet",",,,%s,,,") a0) /// The key file '%s' could not be opened - /// (Originally from ..\FSComp.txt:1127) + /// (Originally from ..\FSComp.txt:1129) static member fscKeyFileCouldNotBeOpened(a0 : System.String) = (2013, GetStringFunc("fscKeyFileCouldNotBeOpened",",,,%s,,,") a0) /// A problem occurred writing the binary '%s': %s - /// (Originally from ..\FSComp.txt:1128) + /// (Originally from ..\FSComp.txt:1130) static member fscProblemWritingBinary(a0 : System.String, a1 : System.String) = (2014, GetStringFunc("fscProblemWritingBinary",",,,%s,,,%s,,,") a0 a1) /// The 'AssemblyVersionAttribute' has been ignored because a version was given using a command line option - /// (Originally from ..\FSComp.txt:1129) + /// (Originally from ..\FSComp.txt:1131) static member fscAssemblyVersionAttributeIgnored() = (2015, GetStringFunc("fscAssemblyVersionAttributeIgnored",",,,") ) /// Error emitting 'System.Reflection.AssemblyCultureAttribute' attribute -- 'Executables cannot be satellite assemblies, Culture should always be empty' - /// (Originally from ..\FSComp.txt:1130) + /// (Originally from ..\FSComp.txt:1132) static member fscAssemblyCultureAttributeError() = (2016, GetStringFunc("fscAssemblyCultureAttributeError",",,,") ) /// Option '--delaysign' overrides attribute 'System.Reflection.AssemblyDelaySignAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1131) + /// (Originally from ..\FSComp.txt:1133) static member fscDelaySignWarning() = (2017, GetStringFunc("fscDelaySignWarning",",,,") ) /// Option '--keyfile' overrides attribute 'System.Reflection.AssemblyKeyFileAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1132) + /// (Originally from ..\FSComp.txt:1134) static member fscKeyFileWarning() = (2018, GetStringFunc("fscKeyFileWarning",",,,") ) /// Option '--keycontainer' overrides attribute 'System.Reflection.AssemblyNameAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1133) + /// (Originally from ..\FSComp.txt:1135) static member fscKeyNameWarning() = (2019, GetStringFunc("fscKeyNameWarning",",,,") ) /// The assembly '%s' is listed on the command line. Assemblies should be referenced using a command line flag such as '-r'. - /// (Originally from ..\FSComp.txt:1134) + /// (Originally from ..\FSComp.txt:1136) static member fscReferenceOnCommandLine(a0 : System.String) = (2020, GetStringFunc("fscReferenceOnCommandLine",",,,%s,,,") a0) /// The resident compilation service was not used because a problem occured in communicating with the server. - /// (Originally from ..\FSComp.txt:1135) + /// (Originally from ..\FSComp.txt:1137) static member fscRemotingError() = (2021, GetStringFunc("fscRemotingError",",,,") ) /// Problem with filename '%s': Illegal characters in path. - /// (Originally from ..\FSComp.txt:1136) + /// (Originally from ..\FSComp.txt:1138) static member pathIsInvalid(a0 : System.String) = (2022, GetStringFunc("pathIsInvalid",",,,%s,,,") a0) /// Passing a .resx file (%s) as a source file to the compiler is deprecated. Use resgen.exe to transform the .resx file into a .resources file to pass as a --resource option. If you are using MSBuild, this can be done via an item in the .fsproj project file. - /// (Originally from ..\FSComp.txt:1137) + /// (Originally from ..\FSComp.txt:1139) static member fscResxSourceFileDeprecated(a0 : System.String) = (2023, GetStringFunc("fscResxSourceFileDeprecated",",,,%s,,,") a0) /// Static linking may not be used on an assembly referencing mscorlib (e.g. a .NET Framework assembly) when generating an assembly that references System.Runtime (e.g. a .NET Core or Portable assembly). - /// (Originally from ..\FSComp.txt:1138) + /// (Originally from ..\FSComp.txt:1140) static member fscStaticLinkingNoProfileMismatches() = (2024, GetStringFunc("fscStaticLinkingNoProfileMismatches",",,,") ) /// An %s specified version '%s', but this value is a wildcard, and you have requested a deterministic build, these are in conflict. - /// (Originally from ..\FSComp.txt:1139) + /// (Originally from ..\FSComp.txt:1141) static member fscAssemblyWildcardAndDeterminism(a0 : System.String, a1 : System.String) = (2025, GetStringFunc("fscAssemblyWildcardAndDeterminism",",,,%s,,,%s,,,") a0 a1) /// Determinstic builds only support portable PDBs (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:1140) + /// (Originally from ..\FSComp.txt:1142) static member fscDeterministicDebugRequiresPortablePdb() = (2026, GetStringFunc("fscDeterministicDebugRequiresPortablePdb",",,,") ) /// Character '%s' is not allowed in provided namespace name '%s' - /// (Originally from ..\FSComp.txt:1141) + /// (Originally from ..\FSComp.txt:1143) static member etIllegalCharactersInNamespaceName(a0 : System.String, a1 : System.String) = (3000, GetStringFunc("etIllegalCharactersInNamespaceName",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' returned a member with a null or empty member name - /// (Originally from ..\FSComp.txt:1142) + /// (Originally from ..\FSComp.txt:1144) static member etNullOrEmptyMemberName(a0 : System.String) = (3001, GetStringFunc("etNullOrEmptyMemberName",",,,%s,,,") a0) /// The provided type '%s' returned a null member - /// (Originally from ..\FSComp.txt:1143) + /// (Originally from ..\FSComp.txt:1145) static member etNullMember(a0 : System.String) = (3002, GetStringFunc("etNullMember",",,,%s,,,") a0) /// The provided type '%s' member info '%s' has null declaring type - /// (Originally from ..\FSComp.txt:1144) + /// (Originally from ..\FSComp.txt:1146) static member etNullMemberDeclaringType(a0 : System.String, a1 : System.String) = (3003, GetStringFunc("etNullMemberDeclaringType",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' has member '%s' which has declaring type '%s'. Expected declaring type to be the same as provided type. - /// (Originally from ..\FSComp.txt:1145) + /// (Originally from ..\FSComp.txt:1147) static member etNullMemberDeclaringTypeDifferentFromProvidedType(a0 : System.String, a1 : System.String, a2 : System.String) = (3004, GetStringFunc("etNullMemberDeclaringTypeDifferentFromProvidedType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Referenced assembly '%s' has assembly level attribute '%s' but no public type provider classes were found - /// (Originally from ..\FSComp.txt:1146) + /// (Originally from ..\FSComp.txt:1148) static member etHostingAssemblyFoundWithoutHosts(a0 : System.String, a1 : System.String) = (3005, GetStringFunc("etHostingAssemblyFoundWithoutHosts",",,,%s,,,%s,,,") a0 a1) /// Type '%s' from type provider '%s' has an empty namespace. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1147) + /// (Originally from ..\FSComp.txt:1149) static member etEmptyNamespaceOfTypeNotAllowed(a0 : System.String, a1 : System.String) = (3006, GetStringFunc("etEmptyNamespaceOfTypeNotAllowed",",,,%s,,,%s,,,") a0 a1) /// Empty namespace found from the type provider '%s'. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1148) + /// (Originally from ..\FSComp.txt:1150) static member etEmptyNamespaceNotAllowed(a0 : System.String) = (3007, GetStringFunc("etEmptyNamespaceNotAllowed",",,,%s,,,") a0) /// Provided type '%s' has 'IsGenericType' as true, but generic types are not supported. - /// (Originally from ..\FSComp.txt:1149) + /// (Originally from ..\FSComp.txt:1151) static member etMustNotBeGeneric(a0 : System.String) = (3011, GetStringFunc("etMustNotBeGeneric",",,,%s,,,") a0) /// Provided type '%s' has 'IsArray' as true, but array types are not supported. - /// (Originally from ..\FSComp.txt:1150) + /// (Originally from ..\FSComp.txt:1152) static member etMustNotBeAnArray(a0 : System.String) = (3013, GetStringFunc("etMustNotBeAnArray",",,,%s,,,") a0) /// Invalid member '%s' on provided type '%s'. Provided type members must be public, and not be generic, virtual, or abstract. - /// (Originally from ..\FSComp.txt:1151) + /// (Originally from ..\FSComp.txt:1153) static member etMethodHasRequirements(a0 : System.String, a1 : System.String) = (3014, GetStringFunc("etMethodHasRequirements",",,,%s,,,%s,,,") a0 a1) /// Invalid member '%s' on provided type '%s'. Only properties, methods and constructors are allowed - /// (Originally from ..\FSComp.txt:1152) + /// (Originally from ..\FSComp.txt:1154) static member etUnsupportedMemberKind(a0 : System.String, a1 : System.String) = (3015, GetStringFunc("etUnsupportedMemberKind",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=true but there was no value from GetGetMethod() - /// (Originally from ..\FSComp.txt:1153) + /// (Originally from ..\FSComp.txt:1155) static member etPropertyCanReadButHasNoGetter(a0 : System.String, a1 : System.String) = (3016, GetStringFunc("etPropertyCanReadButHasNoGetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=false but GetGetMethod() returned a method - /// (Originally from ..\FSComp.txt:1154) + /// (Originally from ..\FSComp.txt:1156) static member etPropertyHasGetterButNoCanRead(a0 : System.String, a1 : System.String) = (3017, GetStringFunc("etPropertyHasGetterButNoCanRead",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=true but there was no value from GetSetMethod() - /// (Originally from ..\FSComp.txt:1155) + /// (Originally from ..\FSComp.txt:1157) static member etPropertyCanWriteButHasNoSetter(a0 : System.String, a1 : System.String) = (3018, GetStringFunc("etPropertyCanWriteButHasNoSetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=false but GetSetMethod() returned a method - /// (Originally from ..\FSComp.txt:1156) + /// (Originally from ..\FSComp.txt:1158) static member etPropertyHasSetterButNoCanWrite(a0 : System.String, a1 : System.String) = (3019, GetStringFunc("etPropertyHasSetterButNoCanWrite",",,,%s,,,%s,,,") a0 a1) /// One or more errors seen during provided type setup - /// (Originally from ..\FSComp.txt:1157) + /// (Originally from ..\FSComp.txt:1159) static member etOneOrMoreErrorsSeenDuringExtensionTypeSetting() = (3020, GetStringFunc("etOneOrMoreErrorsSeenDuringExtensionTypeSetting",",,,") ) /// Unexpected exception from provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1158) + /// (Originally from ..\FSComp.txt:1160) static member etUnexpectedExceptionFromProvidedTypeMember(a0 : System.String, a1 : System.String, a2 : System.String) = (3021, GetStringFunc("etUnexpectedExceptionFromProvidedTypeMember",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Unsupported constant type '%s'. Quotations provided by type providers can only contain simple constants. The implementation of the type provider may need to be adjusted by moving a value declared outside a provided quotation literal to be a 'let' binding inside the quotation literal. - /// (Originally from ..\FSComp.txt:1159) + /// (Originally from ..\FSComp.txt:1161) static member etUnsupportedConstantType(a0 : System.String) = (3022, GetStringFunc("etUnsupportedConstantType",",,,%s,,,") a0) /// Unsupported expression '%s' from type provider. If you are the author of this type provider, consider adjusting it to provide a different provided expression. - /// (Originally from ..\FSComp.txt:1160) + /// (Originally from ..\FSComp.txt:1162) static member etUnsupportedProvidedExpression(a0 : System.String) = (3025, GetStringFunc("etUnsupportedProvidedExpression",",,,%s,,,") a0) /// Expected provided type named '%s' but provided type has 'Name' with value '%s' - /// (Originally from ..\FSComp.txt:1161) + /// (Originally from ..\FSComp.txt:1163) static member etProvidedTypeHasUnexpectedName(a0 : System.String, a1 : System.String) = (3028, GetStringFunc("etProvidedTypeHasUnexpectedName",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetAddMethod() - /// (Originally from ..\FSComp.txt:1162) + /// (Originally from ..\FSComp.txt:1164) static member etEventNoAdd(a0 : System.String, a1 : System.String) = (3029, GetStringFunc("etEventNoAdd",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetRemoveMethod() - /// (Originally from ..\FSComp.txt:1163) + /// (Originally from ..\FSComp.txt:1165) static member etEventNoRemove(a0 : System.String, a1 : System.String) = (3030, GetStringFunc("etEventNoRemove",",,,%s,,,%s,,,") a0 a1) /// Assembly attribute '%s' refers to a designer assembly '%s' which cannot be loaded or doesn't exist. %s - /// (Originally from ..\FSComp.txt:1164) + /// (Originally from ..\FSComp.txt:1166) static member etProviderHasWrongDesignerAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (3031, GetStringFunc("etProviderHasWrongDesignerAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider does not have a valid constructor. A constructor taking either no arguments or one argument of type 'TypeProviderConfig' was expected. - /// (Originally from ..\FSComp.txt:1165) + /// (Originally from ..\FSComp.txt:1167) static member etProviderDoesNotHaveValidConstructor() = (3032, GetStringFunc("etProviderDoesNotHaveValidConstructor",",,,") ) /// The type provider '%s' reported an error: %s - /// (Originally from ..\FSComp.txt:1166) + /// (Originally from ..\FSComp.txt:1168) static member etProviderError(a0 : System.String, a1 : System.String) = (3033, GetStringFunc("etProviderError",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' used an invalid parameter in the ParameterExpression: %s - /// (Originally from ..\FSComp.txt:1167) + /// (Originally from ..\FSComp.txt:1169) static member etIncorrectParameterExpression(a0 : System.String, a1 : System.String) = (3034, GetStringFunc("etIncorrectParameterExpression",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' provided a method with a name '%s' and metadata token '%d', which is not reported among its methods of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1168) + /// (Originally from ..\FSComp.txt:1170) static member etIncorrectProvidedMethod(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.String) = (3035, GetStringFunc("etIncorrectProvidedMethod",",,,%s,,,%s,,,%d,,,%s,,,") a0 a1 a2 a3) /// The type provider '%s' provided a constructor which is not reported among the constructors of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1169) + /// (Originally from ..\FSComp.txt:1171) static member etIncorrectProvidedConstructor(a0 : System.String, a1 : System.String) = (3036, GetStringFunc("etIncorrectProvidedConstructor",",,,%s,,,%s,,,") a0 a1) /// A direct reference to the generated type '%s' is not permitted. Instead, use a type definition, e.g. 'type TypeAlias = '. This indicates that a type provider adds generated types to your assembly. - /// (Originally from ..\FSComp.txt:1170) + /// (Originally from ..\FSComp.txt:1172) static member etDirectReferenceToGeneratedTypeNotAllowed(a0 : System.String) = (3039, GetStringFunc("etDirectReferenceToGeneratedTypeNotAllowed",",,,%s,,,") a0) /// Expected provided type with path '%s' but provided type has path '%s' - /// (Originally from ..\FSComp.txt:1171) + /// (Originally from ..\FSComp.txt:1173) static member etProvidedTypeHasUnexpectedPath(a0 : System.String, a1 : System.String) = (3041, GetStringFunc("etProvidedTypeHasUnexpectedPath",",,,%s,,,%s,,,") a0 a1) /// Unexpected 'null' return value from provided type '%s' member '%s' - /// (Originally from ..\FSComp.txt:1172) + /// (Originally from ..\FSComp.txt:1174) static member etUnexpectedNullFromProvidedTypeMember(a0 : System.String, a1 : System.String) = (3042, GetStringFunc("etUnexpectedNullFromProvidedTypeMember",",,,%s,,,%s,,,") a0 a1) /// Unexpected exception from member '%s' of provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1173) + /// (Originally from ..\FSComp.txt:1175) static member etUnexpectedExceptionFromProvidedMemberMember(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3043, GetStringFunc("etUnexpectedExceptionFromProvidedMemberMember",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// Nested provided types do not take static arguments or generic parameters - /// (Originally from ..\FSComp.txt:1174) + /// (Originally from ..\FSComp.txt:1176) static member etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters() = (3044, GetStringFunc("etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters",",,,") ) /// Invalid static argument to provided type. Expected an argument of kind '%s'. - /// (Originally from ..\FSComp.txt:1175) + /// (Originally from ..\FSComp.txt:1177) static member etInvalidStaticArgument(a0 : System.String) = (3045, GetStringFunc("etInvalidStaticArgument",",,,%s,,,") a0) /// An error occured applying the static arguments to a provided type - /// (Originally from ..\FSComp.txt:1176) + /// (Originally from ..\FSComp.txt:1178) static member etErrorApplyingStaticArgumentsToType() = (3046, GetStringFunc("etErrorApplyingStaticArgumentsToType",",,,") ) /// Unknown static argument kind '%s' when resolving a reference to a provided type or method '%s' - /// (Originally from ..\FSComp.txt:1177) + /// (Originally from ..\FSComp.txt:1179) static member etUnknownStaticArgumentKind(a0 : System.String, a1 : System.String) = (3047, GetStringFunc("etUnknownStaticArgumentKind",",,,%s,,,%s,,,") a0 a1) /// invalid namespace for provided type - /// (Originally from ..\FSComp.txt:1178) + /// (Originally from ..\FSComp.txt:1180) static member invalidNamespaceForProvidedType() = (GetStringFunc("invalidNamespaceForProvidedType",",,,") ) /// invalid full name for provided type - /// (Originally from ..\FSComp.txt:1179) + /// (Originally from ..\FSComp.txt:1181) static member invalidFullNameForProvidedType() = (GetStringFunc("invalidFullNameForProvidedType",",,,") ) /// The type provider returned 'null', which is not a valid return value from '%s' - /// (Originally from ..\FSComp.txt:1181) + /// (Originally from ..\FSComp.txt:1183) static member etProviderReturnedNull(a0 : System.String) = (3051, GetStringFunc("etProviderReturnedNull",",,,%s,,,") a0) /// The type provider constructor has thrown an exception: %s - /// (Originally from ..\FSComp.txt:1182) + /// (Originally from ..\FSComp.txt:1184) static member etTypeProviderConstructorException(a0 : System.String) = (3053, GetStringFunc("etTypeProviderConstructorException",",,,%s,,,") a0) /// Type provider '%s' returned null from GetInvokerExpression. - /// (Originally from ..\FSComp.txt:1183) + /// (Originally from ..\FSComp.txt:1185) static member etNullProvidedExpression(a0 : System.String) = (3056, GetStringFunc("etNullProvidedExpression",",,,%s,,,") a0) /// The type provider '%s' returned an invalid type from 'ApplyStaticArguments'. A type with name '%s' was expected, but a type with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1184) + /// (Originally from ..\FSComp.txt:1186) static member etProvidedAppliedTypeHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3057, GetStringFunc("etProvidedAppliedTypeHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider '%s' returned an invalid method from 'ApplyStaticArgumentsForMethod'. A method with name '%s' was expected, but a method with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1185) + /// (Originally from ..\FSComp.txt:1187) static member etProvidedAppliedMethodHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3058, GetStringFunc("etProvidedAppliedMethodHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// This type test or downcast will erase the provided type '%s' to the type '%s' - /// (Originally from ..\FSComp.txt:1186) + /// (Originally from ..\FSComp.txt:1188) static member tcTypeTestLossy(a0 : System.String, a1 : System.String) = (3060, GetStringFunc("tcTypeTestLossy",",,,%s,,,%s,,,") a0 a1) /// This downcast will erase the provided type '%s' to the type '%s'. - /// (Originally from ..\FSComp.txt:1187) + /// (Originally from ..\FSComp.txt:1189) static member tcTypeCastErased(a0 : System.String, a1 : System.String) = (3061, GetStringFunc("tcTypeCastErased",",,,%s,,,%s,,,") a0 a1) /// This type test with a provided type '%s' is not allowed because this provided type will be erased to '%s' at runtime. - /// (Originally from ..\FSComp.txt:1188) + /// (Originally from ..\FSComp.txt:1190) static member tcTypeTestErased(a0 : System.String, a1 : System.String) = (3062, GetStringFunc("tcTypeTestErased",",,,%s,,,%s,,,") a0 a1) /// Cannot inherit from erased provided type - /// (Originally from ..\FSComp.txt:1189) + /// (Originally from ..\FSComp.txt:1191) static member tcCannotInheritFromErasedType() = (3063, GetStringFunc("tcCannotInheritFromErasedType",",,,") ) /// Assembly '%s' hase TypeProviderAssembly attribute with invalid value '%s'. The value should be a valid assembly name - /// (Originally from ..\FSComp.txt:1190) + /// (Originally from ..\FSComp.txt:1192) static member etInvalidTypeProviderAssemblyName(a0 : System.String, a1 : System.String) = (3065, GetStringFunc("etInvalidTypeProviderAssemblyName",",,,%s,,,%s,,,") a0 a1) /// Invalid member name. Members may not have name '.ctor' or '.cctor' - /// (Originally from ..\FSComp.txt:1191) + /// (Originally from ..\FSComp.txt:1193) static member tcInvalidMemberNameCtor() = (3066, GetStringFunc("tcInvalidMemberNameCtor",",,,") ) /// The function or member '%s' is used in a way that requires further type annotations at its definition to ensure consistency of inferred types. The inferred signature is '%s'. - /// (Originally from ..\FSComp.txt:1192) + /// (Originally from ..\FSComp.txt:1194) static member tcInferredGenericTypeGivesRiseToInconsistency(a0 : System.String, a1 : System.String) = (3068, GetStringFunc("tcInferredGenericTypeGivesRiseToInconsistency",",,,%s,,,%s,,,") a0 a1) /// The number of type arguments did not match: '%d' given, '%d' expected. This may be related to a previously reported error. - /// (Originally from ..\FSComp.txt:1193) + /// (Originally from ..\FSComp.txt:1195) static member tcInvalidTypeArgumentCount(a0 : System.Int32, a1 : System.Int32) = (3069, GetStringFunc("tcInvalidTypeArgumentCount",",,,%d,,,%d,,,") a0 a1) /// Cannot override inherited member '%s' because it is sealed - /// (Originally from ..\FSComp.txt:1194) + /// (Originally from ..\FSComp.txt:1196) static member tcCannotOverrideSealedMethod(a0 : System.String) = (3070, GetStringFunc("tcCannotOverrideSealedMethod",",,,%s,,,") a0) /// The type provider '%s' reported an error in the context of provided type '%s', member '%s'. The error: %s - /// (Originally from ..\FSComp.txt:1195) + /// (Originally from ..\FSComp.txt:1197) static member etProviderErrorWithContext(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3071, GetStringFunc("etProviderErrorWithContext",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// An exception occurred when accessing the '%s' of a provided type: %s - /// (Originally from ..\FSComp.txt:1196) + /// (Originally from ..\FSComp.txt:1198) static member etProvidedTypeWithNameException(a0 : System.String, a1 : System.String) = (3072, GetStringFunc("etProvidedTypeWithNameException",",,,%s,,,%s,,,") a0 a1) /// The '%s' of a provided type was null or empty. - /// (Originally from ..\FSComp.txt:1197) + /// (Originally from ..\FSComp.txt:1199) static member etProvidedTypeWithNullOrEmptyName(a0 : System.String) = (3073, GetStringFunc("etProvidedTypeWithNullOrEmptyName",",,,%s,,,") a0) /// Character '%s' is not allowed in provided type name '%s' - /// (Originally from ..\FSComp.txt:1198) + /// (Originally from ..\FSComp.txt:1200) static member etIllegalCharactersInTypeName(a0 : System.String, a1 : System.String) = (3075, GetStringFunc("etIllegalCharactersInTypeName",",,,%s,,,%s,,,") a0 a1) /// In queries, '%s' must use a simple pattern - /// (Originally from ..\FSComp.txt:1199) + /// (Originally from ..\FSComp.txt:1201) static member tcJoinMustUseSimplePattern(a0 : System.String) = (3077, GetStringFunc("tcJoinMustUseSimplePattern",",,,%s,,,") a0) /// A custom query operation for '%s' is required but not specified - /// (Originally from ..\FSComp.txt:1200) + /// (Originally from ..\FSComp.txt:1202) static member tcMissingCustomOperation(a0 : System.String) = (3078, GetStringFunc("tcMissingCustomOperation",",,,%s,,,") a0) /// Named static arguments must come after all unnamed static arguments - /// (Originally from ..\FSComp.txt:1201) + /// (Originally from ..\FSComp.txt:1203) static member etBadUnnamedStaticArgs() = (3080, GetStringFunc("etBadUnnamedStaticArgs",",,,") ) /// The static parameter '%s' of the provided type or method '%s' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. '%s<%s=...>'. - /// (Originally from ..\FSComp.txt:1202) + /// (Originally from ..\FSComp.txt:1204) static member etStaticParameterRequiresAValue(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3081, GetStringFunc("etStaticParameterRequiresAValue",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// No static parameter exists with name '%s' - /// (Originally from ..\FSComp.txt:1203) + /// (Originally from ..\FSComp.txt:1205) static member etNoStaticParameterWithName(a0 : System.String) = (3082, GetStringFunc("etNoStaticParameterWithName",",,,%s,,,") a0) /// The static parameter '%s' has already been given a value - /// (Originally from ..\FSComp.txt:1204) + /// (Originally from ..\FSComp.txt:1206) static member etStaticParameterAlreadyHasValue(a0 : System.String) = (3083, GetStringFunc("etStaticParameterAlreadyHasValue",",,,%s,,,") a0) /// Multiple static parameters exist with name '%s' - /// (Originally from ..\FSComp.txt:1205) + /// (Originally from ..\FSComp.txt:1207) static member etMultipleStaticParameterWithName(a0 : System.String) = (3084, GetStringFunc("etMultipleStaticParameterWithName",",,,%s,,,") a0) /// A custom operation may not be used in conjunction with a non-value or recursive 'let' binding in another part of this computation expression - /// (Originally from ..\FSComp.txt:1206) + /// (Originally from ..\FSComp.txt:1208) static member tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings() = (3085, GetStringFunc("tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings",",,,") ) /// A custom operation may not be used in conjunction with 'use', 'try/with', 'try/finally', 'if/then/else' or 'match' operators within this computation expression - /// (Originally from ..\FSComp.txt:1207) + /// (Originally from ..\FSComp.txt:1209) static member tcCustomOperationMayNotBeUsedHere() = (3086, GetStringFunc("tcCustomOperationMayNotBeUsedHere",",,,") ) /// The custom operation '%s' refers to a method which is overloaded. The implementations of custom operations may not be overloaded. - /// (Originally from ..\FSComp.txt:1208) + /// (Originally from ..\FSComp.txt:1210) static member tcCustomOperationMayNotBeOverloaded(a0 : System.String) = (3087, GetStringFunc("tcCustomOperationMayNotBeOverloaded",",,,%s,,,") a0) /// An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead. - /// (Originally from ..\FSComp.txt:1209) + /// (Originally from ..\FSComp.txt:1211) static member tcIfThenElseMayNotBeUsedWithinQueries() = (3090, GetStringFunc("tcIfThenElseMayNotBeUsedWithinQueries",",,,") ) /// Invalid argument to 'methodhandleof' during codegen - /// (Originally from ..\FSComp.txt:1210) + /// (Originally from ..\FSComp.txt:1212) static member ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen() = (3091, GetStringFunc("ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen",",,,") ) /// A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1211) + /// (Originally from ..\FSComp.txt:1213) static member etProvidedTypeReferenceMissingArgument(a0 : System.String) = (3092, GetStringFunc("etProvidedTypeReferenceMissingArgument",",,,%s,,,") a0) /// A reference to a provided type had an invalid value '%s' for a static parameter. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1212) + /// (Originally from ..\FSComp.txt:1214) static member etProvidedTypeReferenceInvalidText(a0 : System.String) = (3093, GetStringFunc("etProvidedTypeReferenceInvalidText",",,,%s,,,") a0) /// '%s' is not used correctly. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1213) + /// (Originally from ..\FSComp.txt:1215) static member tcCustomOperationNotUsedCorrectly(a0 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly",",,,%s,,,") a0) /// '%s' is not used correctly. Usage: %s. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1214) + /// (Originally from ..\FSComp.txt:1216) static member tcCustomOperationNotUsedCorrectly2(a0 : System.String, a1 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly2",",,,%s,,,%s,,,") a0 a1) /// %s var in collection %s (outerKey = innerKey). Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1215) + /// (Originally from ..\FSComp.txt:1217) static member customOperationTextLikeJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection %s (outerKey = innerKey) into group. Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1216) + /// (Originally from ..\FSComp.txt:1218) static member customOperationTextLikeGroupJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeGroupJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection - /// (Originally from ..\FSComp.txt:1217) + /// (Originally from ..\FSComp.txt:1219) static member customOperationTextLikeZip(a0 : System.String) = (GetStringFunc("customOperationTextLikeZip",",,,%s,,,") a0) /// '%s' must be followed by a variable name. Usage: %s. - /// (Originally from ..\FSComp.txt:1218) + /// (Originally from ..\FSComp.txt:1220) static member tcBinaryOperatorRequiresVariable(a0 : System.String, a1 : System.String) = (3096, GetStringFunc("tcBinaryOperatorRequiresVariable",",,,%s,,,%s,,,") a0 a1) /// Incorrect syntax for '%s'. Usage: %s. - /// (Originally from ..\FSComp.txt:1219) + /// (Originally from ..\FSComp.txt:1221) static member tcOperatorIncorrectSyntax(a0 : System.String, a1 : System.String) = (3097, GetStringFunc("tcOperatorIncorrectSyntax",",,,%s,,,%s,,,") a0 a1) /// '%s' must come after a 'for' selection clause and be followed by the rest of the query. Syntax: ... %s ... - /// (Originally from ..\FSComp.txt:1220) + /// (Originally from ..\FSComp.txt:1222) static member tcBinaryOperatorRequiresBody(a0 : System.String, a1 : System.String) = (3098, GetStringFunc("tcBinaryOperatorRequiresBody",",,,%s,,,%s,,,") a0 a1) /// '%s' is used with an incorrect number of arguments. This is a custom operation in this query or computation expression. Expected %d argument(s), but given %d. - /// (Originally from ..\FSComp.txt:1221) + /// (Originally from ..\FSComp.txt:1223) static member tcCustomOperationHasIncorrectArgCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3099, GetStringFunc("tcCustomOperationHasIncorrectArgCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Expected an expression after this point - /// (Originally from ..\FSComp.txt:1222) + /// (Originally from ..\FSComp.txt:1224) static member parsExpectedExpressionAfterToken() = (3100, GetStringFunc("parsExpectedExpressionAfterToken",",,,") ) /// Expected a type after this point - /// (Originally from ..\FSComp.txt:1223) + /// (Originally from ..\FSComp.txt:1225) static member parsExpectedTypeAfterToken() = (3101, GetStringFunc("parsExpectedTypeAfterToken",",,,") ) /// Unmatched '[<'. Expected closing '>]' - /// (Originally from ..\FSComp.txt:1224) + /// (Originally from ..\FSComp.txt:1226) static member parsUnmatchedLBrackLess() = (3102, GetStringFunc("parsUnmatchedLBrackLess",",,,") ) /// Unexpected end of input in 'match' expression. Expected 'match with | -> | -> ...'. - /// (Originally from ..\FSComp.txt:1225) + /// (Originally from ..\FSComp.txt:1227) static member parsUnexpectedEndOfFileMatch() = (3103, GetStringFunc("parsUnexpectedEndOfFileMatch",",,,") ) /// Unexpected end of input in 'try' expression. Expected 'try with ' or 'try finally '. - /// (Originally from ..\FSComp.txt:1226) + /// (Originally from ..\FSComp.txt:1228) static member parsUnexpectedEndOfFileTry() = (3104, GetStringFunc("parsUnexpectedEndOfFileTry",",,,") ) /// Unexpected end of input in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1227) + /// (Originally from ..\FSComp.txt:1229) static member parsUnexpectedEndOfFileWhile() = (3105, GetStringFunc("parsUnexpectedEndOfFileWhile",",,,") ) /// Unexpected end of input in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1228) + /// (Originally from ..\FSComp.txt:1230) static member parsUnexpectedEndOfFileFor() = (3106, GetStringFunc("parsUnexpectedEndOfFileFor",",,,") ) /// Unexpected end of input in 'match' or 'try' expression - /// (Originally from ..\FSComp.txt:1229) + /// (Originally from ..\FSComp.txt:1231) static member parsUnexpectedEndOfFileWith() = (3107, GetStringFunc("parsUnexpectedEndOfFileWith",",,,") ) /// Unexpected end of input in 'then' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1230) + /// (Originally from ..\FSComp.txt:1232) static member parsUnexpectedEndOfFileThen() = (3108, GetStringFunc("parsUnexpectedEndOfFileThen",",,,") ) /// Unexpected end of input in 'else' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1231) + /// (Originally from ..\FSComp.txt:1233) static member parsUnexpectedEndOfFileElse() = (3109, GetStringFunc("parsUnexpectedEndOfFileElse",",,,") ) /// Unexpected end of input in body of lambda expression. Expected 'fun ... -> '. - /// (Originally from ..\FSComp.txt:1232) + /// (Originally from ..\FSComp.txt:1234) static member parsUnexpectedEndOfFileFunBody() = (3110, GetStringFunc("parsUnexpectedEndOfFileFunBody",",,,") ) /// Unexpected end of input in type arguments - /// (Originally from ..\FSComp.txt:1233) + /// (Originally from ..\FSComp.txt:1235) static member parsUnexpectedEndOfFileTypeArgs() = (3111, GetStringFunc("parsUnexpectedEndOfFileTypeArgs",",,,") ) /// Unexpected end of input in type signature - /// (Originally from ..\FSComp.txt:1234) + /// (Originally from ..\FSComp.txt:1236) static member parsUnexpectedEndOfFileTypeSignature() = (3112, GetStringFunc("parsUnexpectedEndOfFileTypeSignature",",,,") ) /// Unexpected end of input in type definition - /// (Originally from ..\FSComp.txt:1235) + /// (Originally from ..\FSComp.txt:1237) static member parsUnexpectedEndOfFileTypeDefinition() = (3113, GetStringFunc("parsUnexpectedEndOfFileTypeDefinition",",,,") ) /// Unexpected end of input in object members - /// (Originally from ..\FSComp.txt:1236) + /// (Originally from ..\FSComp.txt:1238) static member parsUnexpectedEndOfFileObjectMembers() = (3114, GetStringFunc("parsUnexpectedEndOfFileObjectMembers",",,,") ) /// Unexpected end of input in value, function or member definition - /// (Originally from ..\FSComp.txt:1237) + /// (Originally from ..\FSComp.txt:1239) static member parsUnexpectedEndOfFileDefinition() = (3115, GetStringFunc("parsUnexpectedEndOfFileDefinition",",,,") ) /// Unexpected end of input in expression - /// (Originally from ..\FSComp.txt:1238) + /// (Originally from ..\FSComp.txt:1240) static member parsUnexpectedEndOfFileExpression() = (3116, GetStringFunc("parsUnexpectedEndOfFileExpression",",,,") ) /// Unexpected end of type. Expected a name after this point. - /// (Originally from ..\FSComp.txt:1239) + /// (Originally from ..\FSComp.txt:1241) static member parsExpectedNameAfterToken() = (3117, GetStringFunc("parsExpectedNameAfterToken",",,,") ) /// Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword. - /// (Originally from ..\FSComp.txt:1240) + /// (Originally from ..\FSComp.txt:1242) static member parsUnmatchedLet() = (3118, GetStringFunc("parsUnmatchedLet",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let!' keyword. - /// (Originally from ..\FSComp.txt:1241) + /// (Originally from ..\FSComp.txt:1243) static member parsUnmatchedLetBang() = (3119, GetStringFunc("parsUnmatchedLetBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use!' keyword. - /// (Originally from ..\FSComp.txt:1242) + /// (Originally from ..\FSComp.txt:1244) static member parsUnmatchedUseBang() = (3120, GetStringFunc("parsUnmatchedUseBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use' keyword. - /// (Originally from ..\FSComp.txt:1243) + /// (Originally from ..\FSComp.txt:1245) static member parsUnmatchedUse() = (3121, GetStringFunc("parsUnmatchedUse",",,,") ) /// Missing 'do' in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1244) + /// (Originally from ..\FSComp.txt:1246) static member parsWhileDoExpected() = (3122, GetStringFunc("parsWhileDoExpected",",,,") ) /// Missing 'do' in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1245) + /// (Originally from ..\FSComp.txt:1247) static member parsForDoExpected() = (3123, GetStringFunc("parsForDoExpected",",,,") ) /// Invalid join relation in '%s'. Expected 'expr expr', where is =, =?, ?= or ?=?. - /// (Originally from ..\FSComp.txt:1246) + /// (Originally from ..\FSComp.txt:1248) static member tcInvalidRelationInJoin(a0 : System.String) = (3125, GetStringFunc("tcInvalidRelationInJoin",",,,%s,,,") a0) /// Calls - /// (Originally from ..\FSComp.txt:1247) + /// (Originally from ..\FSComp.txt:1249) static member typeInfoCallsWord() = (GetStringFunc("typeInfoCallsWord",",,,") ) /// Invalid number of generic arguments to type '%s' in provided type. Expected '%d' arguments, given '%d'. - /// (Originally from ..\FSComp.txt:1248) + /// (Originally from ..\FSComp.txt:1250) static member impInvalidNumberOfGenericArguments(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3126, GetStringFunc("impInvalidNumberOfGenericArguments",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Invalid value '%s' for unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1249) + /// (Originally from ..\FSComp.txt:1251) static member impInvalidMeasureArgument1(a0 : System.String, a1 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument1",",,,%s,,,%s,,,") a0 a1) /// Invalid value unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1250) + /// (Originally from ..\FSComp.txt:1252) static member impInvalidMeasureArgument2(a0 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument2",",,,%s,,,") a0) /// Property '%s' on provided type '%s' is neither readable nor writable as it has CanRead=false and CanWrite=false - /// (Originally from ..\FSComp.txt:1251) + /// (Originally from ..\FSComp.txt:1253) static member etPropertyNeedsCanWriteOrCanRead(a0 : System.String, a1 : System.String) = (3128, GetStringFunc("etPropertyNeedsCanWriteOrCanRead",",,,%s,,,%s,,,") a0 a1) /// A use of 'into' must be followed by the remainder of the computation - /// (Originally from ..\FSComp.txt:1252) + /// (Originally from ..\FSComp.txt:1254) static member tcIntoNeedsRestOfQuery() = (3129, GetStringFunc("tcIntoNeedsRestOfQuery",",,,") ) /// The operator '%s' does not accept the use of 'into' - /// (Originally from ..\FSComp.txt:1253) + /// (Originally from ..\FSComp.txt:1255) static member tcOperatorDoesntAcceptInto(a0 : System.String) = (3130, GetStringFunc("tcOperatorDoesntAcceptInto",",,,%s,,,") a0) /// The definition of the custom operator '%s' does not use a valid combination of attribute flags - /// (Originally from ..\FSComp.txt:1254) + /// (Originally from ..\FSComp.txt:1256) static member tcCustomOperationInvalid(a0 : System.String) = (3131, GetStringFunc("tcCustomOperationInvalid",",,,%s,,,") a0) /// This type definition may not have the 'CLIMutable' attribute. Only record types may have this attribute. - /// (Originally from ..\FSComp.txt:1255) + /// (Originally from ..\FSComp.txt:1257) static member tcThisTypeMayNotHaveACLIMutableAttribute() = (3132, GetStringFunc("tcThisTypeMayNotHaveACLIMutableAttribute",",,,") ) /// 'member val' definitions are only permitted in types with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:1256) + /// (Originally from ..\FSComp.txt:1258) static member tcAutoPropertyRequiresImplicitConstructionSequence() = (3133, GetStringFunc("tcAutoPropertyRequiresImplicitConstructionSequence",",,,") ) /// Property definitions may not be declared mutable. To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1257) + /// (Originally from ..\FSComp.txt:1259) static member parsMutableOnAutoPropertyShouldBeGetSet() = (3134, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSet",",,,") ) /// To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1258) + /// (Originally from ..\FSComp.txt:1260) static member parsMutableOnAutoPropertyShouldBeGetSetNotJustSet() = (3135, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSetNotJustSet",",,,") ) /// Type '%s' is illegal because in byref, T cannot contain byref types. - /// (Originally from ..\FSComp.txt:1259) + /// (Originally from ..\FSComp.txt:1261) static member chkNoByrefsOfByrefs(a0 : System.String) = (3136, GetStringFunc("chkNoByrefsOfByrefs",",,,%s,,,") a0) /// F# supports array ranks between 1 and 32. The value %d is not allowed. - /// (Originally from ..\FSComp.txt:1260) + /// (Originally from ..\FSComp.txt:1262) static member tastopsMaxArrayThirtyTwo(a0 : System.Int32) = (3138, GetStringFunc("tastopsMaxArrayThirtyTwo",",,,%d,,,") a0) /// In queries, use the form 'for x in n .. m do ...' for ranging over integers - /// (Originally from ..\FSComp.txt:1261) + /// (Originally from ..\FSComp.txt:1263) static member tcNoIntegerForLoopInQuery() = (3139, GetStringFunc("tcNoIntegerForLoopInQuery",",,,") ) /// 'while' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1262) + /// (Originally from ..\FSComp.txt:1264) static member tcNoWhileInQuery() = (3140, GetStringFunc("tcNoWhileInQuery",",,,") ) /// 'try/finally' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1263) + /// (Originally from ..\FSComp.txt:1265) static member tcNoTryFinallyInQuery() = (3141, GetStringFunc("tcNoTryFinallyInQuery",",,,") ) /// 'use' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1264) + /// (Originally from ..\FSComp.txt:1266) static member tcUseMayNotBeUsedInQueries() = (3142, GetStringFunc("tcUseMayNotBeUsedInQueries",",,,") ) /// 'let!', 'use!' and 'do!' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1265) + /// (Originally from ..\FSComp.txt:1267) static member tcBindMayNotBeUsedInQueries() = (3143, GetStringFunc("tcBindMayNotBeUsedInQueries",",,,") ) /// 'return' and 'return!' may not be used in queries - /// (Originally from ..\FSComp.txt:1266) + /// (Originally from ..\FSComp.txt:1268) static member tcReturnMayNotBeUsedInQueries() = (3144, GetStringFunc("tcReturnMayNotBeUsedInQueries",",,,") ) /// This is not a known query operator. Query operators are identifiers such as 'select', 'where', 'sortBy', 'thenBy', 'groupBy', 'groupValBy', 'join', 'groupJoin', 'sumBy' and 'averageBy', defined using corresponding methods on the 'QueryBuilder' type. - /// (Originally from ..\FSComp.txt:1267) + /// (Originally from ..\FSComp.txt:1269) static member tcUnrecognizedQueryOperator() = (3145, GetStringFunc("tcUnrecognizedQueryOperator",",,,") ) /// 'try/with' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1268) + /// (Originally from ..\FSComp.txt:1270) static member tcTryWithMayNotBeUsedInQueries() = (3146, GetStringFunc("tcTryWithMayNotBeUsedInQueries",",,,") ) /// This 'let' definition may not be used in a query. Only simple value definitions may be used in queries. - /// (Originally from ..\FSComp.txt:1269) + /// (Originally from ..\FSComp.txt:1271) static member tcNonSimpleLetBindingInQuery() = (3147, GetStringFunc("tcNonSimpleLetBindingInQuery",",,,") ) /// Too many static parameters. Expected at most %d parameters, but got %d unnamed and %d named parameters. - /// (Originally from ..\FSComp.txt:1270) + /// (Originally from ..\FSComp.txt:1272) static member etTooManyStaticParameters(a0 : System.Int32, a1 : System.Int32, a2 : System.Int32) = (3148, GetStringFunc("etTooManyStaticParameters",",,,%d,,,%d,,,%d,,,") a0 a1 a2) /// Invalid provided literal value '%s' - /// (Originally from ..\FSComp.txt:1271) + /// (Originally from ..\FSComp.txt:1273) static member infosInvalidProvidedLiteralValue(a0 : System.String) = (3149, GetStringFunc("infosInvalidProvidedLiteralValue",",,,%s,,,") a0) /// The 'anycpu32bitpreferred' platform can only be used with EXE targets. You must use 'anycpu' instead. - /// (Originally from ..\FSComp.txt:1272) + /// (Originally from ..\FSComp.txt:1274) static member invalidPlatformTarget() = (3150, GetStringFunc("invalidPlatformTarget",",,,") ) /// This member, function or value declaration may not be declared 'inline' - /// (Originally from ..\FSComp.txt:1273) + /// (Originally from ..\FSComp.txt:1275) static member tcThisValueMayNotBeInlined() = (3151, GetStringFunc("tcThisValueMayNotBeInlined",",,,") ) /// The provider '%s' returned a non-generated type '%s' in the context of a set of generated types. Consider adjusting the type provider to only return generated types. - /// (Originally from ..\FSComp.txt:1274) + /// (Originally from ..\FSComp.txt:1276) static member etErasedTypeUsedInGeneration(a0 : System.String, a1 : System.String) = (3152, GetStringFunc("etErasedTypeUsedInGeneration",",,,%s,,,%s,,,") a0 a1) /// Arguments to query operators may require parentheses, e.g. 'where (x > y)' or 'groupBy (x.Length / 10)' - /// (Originally from ..\FSComp.txt:1275) + /// (Originally from ..\FSComp.txt:1277) static member tcUnrecognizedQueryBinaryOperator() = (3153, GetStringFunc("tcUnrecognizedQueryBinaryOperator",",,,") ) /// A quotation may not involve an assignment to or taking the address of a captured local variable - /// (Originally from ..\FSComp.txt:1276) + /// (Originally from ..\FSComp.txt:1278) static member crefNoSetOfHole() = (3155, GetStringFunc("crefNoSetOfHole",",,,") ) /// + 1 overload - /// (Originally from ..\FSComp.txt:1277) + /// (Originally from ..\FSComp.txt:1279) static member nicePrintOtherOverloads1() = (GetStringFunc("nicePrintOtherOverloads1",",,,") ) /// + %d overloads - /// (Originally from ..\FSComp.txt:1278) + /// (Originally from ..\FSComp.txt:1280) static member nicePrintOtherOverloadsN(a0 : System.Int32) = (GetStringFunc("nicePrintOtherOverloadsN",",,,%d,,,") a0) /// Erased to - /// (Originally from ..\FSComp.txt:1279) + /// (Originally from ..\FSComp.txt:1281) static member erasedTo() = (GetStringFunc("erasedTo",",,,") ) /// Unexpected token '%s' or incomplete expression - /// (Originally from ..\FSComp.txt:1280) + /// (Originally from ..\FSComp.txt:1282) static member parsUnfinishedExpression(a0 : System.String) = (3156, GetStringFunc("parsUnfinishedExpression",",,,%s,,,") a0) /// Cannot find code target for this attribute, possibly because the code after the attribute is incomplete. - /// (Originally from ..\FSComp.txt:1281) + /// (Originally from ..\FSComp.txt:1283) static member parsAttributeOnIncompleteCode() = (3158, GetStringFunc("parsAttributeOnIncompleteCode",",,,") ) /// Type name cannot be empty. - /// (Originally from ..\FSComp.txt:1282) + /// (Originally from ..\FSComp.txt:1284) static member parsTypeNameCannotBeEmpty() = (3159, GetStringFunc("parsTypeNameCannotBeEmpty",",,,") ) /// Problem reading assembly '%s': %s - /// (Originally from ..\FSComp.txt:1283) + /// (Originally from ..\FSComp.txt:1285) static member buildProblemReadingAssembly(a0 : System.String, a1 : System.String) = (3160, GetStringFunc("buildProblemReadingAssembly",",,,%s,,,%s,,,") a0 a1) /// Invalid provided field. Provided fields of erased provided types must be literals. - /// (Originally from ..\FSComp.txt:1284) + /// (Originally from ..\FSComp.txt:1286) static member tcTPFieldMustBeLiteral() = (3161, GetStringFunc("tcTPFieldMustBeLiteral",",,,") ) /// (loading description...) - /// (Originally from ..\FSComp.txt:1285) + /// (Originally from ..\FSComp.txt:1287) static member loadingDescription() = (GetStringFunc("loadingDescription",",,,") ) /// (description unavailable...) - /// (Originally from ..\FSComp.txt:1286) + /// (Originally from ..\FSComp.txt:1288) static member descriptionUnavailable() = (GetStringFunc("descriptionUnavailable",",,,") ) /// A type variable has been constrained by multiple different class types. A type variable may only have one class constraint. - /// (Originally from ..\FSComp.txt:1287) + /// (Originally from ..\FSComp.txt:1289) static member chkTyparMultipleClassConstraints() = (3162, GetStringFunc("chkTyparMultipleClassConstraints",",,,") ) /// 'match' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1288) + /// (Originally from ..\FSComp.txt:1290) static member tcMatchMayNotBeUsedWithQuery() = (3163, GetStringFunc("tcMatchMayNotBeUsedWithQuery",",,,") ) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 3 arguments - /// (Originally from ..\FSComp.txt:1289) + /// (Originally from ..\FSComp.txt:1291) static member memberOperatorDefinitionWithNonTripleArgument(a0 : System.String, a1 : System.Int32) = (3164, GetStringFunc("memberOperatorDefinitionWithNonTripleArgument",",,,%s,,,%d,,,") a0 a1) /// The operator '%s' cannot be resolved. Consider opening the module 'Microsoft.FSharp.Linq.NullableOperators'. - /// (Originally from ..\FSComp.txt:1290) + /// (Originally from ..\FSComp.txt:1292) static member cannotResolveNullableOperators(a0 : System.String) = (3165, GetStringFunc("cannotResolveNullableOperators",",,,%s,,,") a0) /// '%s' must be followed by 'in'. Usage: %s. - /// (Originally from ..\FSComp.txt:1291) + /// (Originally from ..\FSComp.txt:1293) static member tcOperatorRequiresIn(a0 : System.String, a1 : System.String) = (3167, GetStringFunc("tcOperatorRequiresIn",",,,%s,,,%s,,,") a0 a1) /// Neither 'member val' nor 'override val' definitions are permitted in object expressions. - /// (Originally from ..\FSComp.txt:1292) + /// (Originally from ..\FSComp.txt:1294) static member parsIllegalMemberVarInObjectImplementation() = (3168, GetStringFunc("parsIllegalMemberVarInObjectImplementation",",,,") ) /// Copy-and-update record expressions must include at least one field. - /// (Originally from ..\FSComp.txt:1293) + /// (Originally from ..\FSComp.txt:1295) static member tcEmptyCopyAndUpdateRecordInvalid() = (3169, GetStringFunc("tcEmptyCopyAndUpdateRecordInvalid",",,,") ) /// '_' cannot be used as field name - /// (Originally from ..\FSComp.txt:1294) + /// (Originally from ..\FSComp.txt:1296) static member parsUnderscoreInvalidFieldName() = (3170, GetStringFunc("parsUnderscoreInvalidFieldName",",,,") ) /// The provided types generated by this use of a type provider may not be used from other F# assemblies and should be marked internal or private. Consider using 'type internal TypeName = ...' or 'type private TypeName = ...'. - /// (Originally from ..\FSComp.txt:1295) + /// (Originally from ..\FSComp.txt:1297) static member tcGeneratedTypesShouldBeInternalOrPrivate() = (3171, GetStringFunc("tcGeneratedTypesShouldBeInternalOrPrivate",",,,") ) /// A property's getter and setter must have the same type. Property '%s' has getter of type '%s' but setter of type '%s'. - /// (Originally from ..\FSComp.txt:1296) + /// (Originally from ..\FSComp.txt:1298) static member chkGetterAndSetterHaveSamePropertyType(a0 : System.String, a1 : System.String, a2 : System.String) = (3172, GetStringFunc("chkGetterAndSetterHaveSamePropertyType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Array method '%s' is supplied by the runtime and cannot be directly used in code. For operations with array elements consider using family of GetArray/SetArray functions from LanguagePrimitives.IntrinsicFunctions module. - /// (Originally from ..\FSComp.txt:1297) + /// (Originally from ..\FSComp.txt:1299) static member tcRuntimeSuppliedMethodCannotBeUsedInUserCode(a0 : System.String) = (3173, GetStringFunc("tcRuntimeSuppliedMethodCannotBeUsedInUserCode",",,,%s,,,") a0) /// The union case '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1298) + /// (Originally from ..\FSComp.txt:1300) static member tcUnionCaseConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcUnionCaseConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// The exception '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1299) + /// (Originally from ..\FSComp.txt:1301) static member tcExceptionConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcExceptionConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// Active patterns do not have fields. This syntax is invalid. - /// (Originally from ..\FSComp.txt:1300) + /// (Originally from ..\FSComp.txt:1302) static member tcActivePatternsDoNotHaveFields() = (3174, GetStringFunc("tcActivePatternsDoNotHaveFields",",,,") ) /// The constructor does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1301) + /// (Originally from ..\FSComp.txt:1303) static member tcConstructorDoesNotHaveFieldWithGivenName(a0 : System.String) = (3174, GetStringFunc("tcConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,") a0) /// Union case/exception field '%s' cannot be used more than once. - /// (Originally from ..\FSComp.txt:1302) + /// (Originally from ..\FSComp.txt:1304) static member tcUnionCaseFieldCannotBeUsedMoreThanOnce(a0 : System.String) = (3175, GetStringFunc("tcUnionCaseFieldCannotBeUsedMoreThanOnce",",,,%s,,,") a0) /// Named field '%s' is used more than once. - /// (Originally from ..\FSComp.txt:1303) + /// (Originally from ..\FSComp.txt:1305) static member tcFieldNameIsUsedModeThanOnce(a0 : System.String) = (3176, GetStringFunc("tcFieldNameIsUsedModeThanOnce",",,,%s,,,") a0) /// Named field '%s' conflicts with autogenerated name for anonymous field. - /// (Originally from ..\FSComp.txt:1304) + /// (Originally from ..\FSComp.txt:1306) static member tcFieldNameConflictsWithGeneratedNameForAnonymousField(a0 : System.String) = (3176, GetStringFunc("tcFieldNameConflictsWithGeneratedNameForAnonymousField",",,,%s,,,") a0) /// This literal expression or attribute argument results in an arithmetic overflow. - /// (Originally from ..\FSComp.txt:1305) + /// (Originally from ..\FSComp.txt:1307) static member tastConstantExpressionOverflow() = (3177, GetStringFunc("tastConstantExpressionOverflow",",,,") ) /// This is not valid literal expression. The [] attribute will be ignored. - /// (Originally from ..\FSComp.txt:1306) + /// (Originally from ..\FSComp.txt:1308) static member tcIllegalStructTypeForConstantExpression() = (3178, GetStringFunc("tcIllegalStructTypeForConstantExpression",",,,") ) /// System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes. - /// (Originally from ..\FSComp.txt:1307) + /// (Originally from ..\FSComp.txt:1309) static member fscSystemRuntimeInteropServicesIsRequired() = (3179, GetStringFunc("fscSystemRuntimeInteropServicesIsRequired",",,,") ) /// The mutable local '%s' is implicitly allocated as a reference cell because it has been captured by a closure. This warning is for informational purposes only to indicate where implicit allocations are performed. - /// (Originally from ..\FSComp.txt:1308) + /// (Originally from ..\FSComp.txt:1310) static member abImplicitHeapAllocation(a0 : System.String) = (3180, GetStringFunc("abImplicitHeapAllocation",",,,%s,,,") a0) /// A type provider implemented GetStaticParametersForMethod, but ApplyStaticArgumentsForMethod was not implemented or invalid - /// (Originally from ..\FSComp.txt:1309) + /// (Originally from ..\FSComp.txt:1311) static member estApplyStaticArgumentsForMethodNotImplemented() = (GetStringFunc("estApplyStaticArgumentsForMethodNotImplemented",",,,") ) /// An error occured applying the static arguments to a provided method - /// (Originally from ..\FSComp.txt:1310) + /// (Originally from ..\FSComp.txt:1312) static member etErrorApplyingStaticArgumentsToMethod() = (3181, GetStringFunc("etErrorApplyingStaticArgumentsToMethod",",,,") ) /// Unexpected character '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1311) + /// (Originally from ..\FSComp.txt:1313) static member pplexUnexpectedChar(a0 : System.String) = (3182, GetStringFunc("pplexUnexpectedChar",",,,%s,,,") a0) /// Unexpected token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1312) + /// (Originally from ..\FSComp.txt:1314) static member ppparsUnexpectedToken(a0 : System.String) = (3183, GetStringFunc("ppparsUnexpectedToken",",,,%s,,,") a0) /// Incomplete preprocessor expression - /// (Originally from ..\FSComp.txt:1313) + /// (Originally from ..\FSComp.txt:1315) static member ppparsIncompleteExpression() = (3184, GetStringFunc("ppparsIncompleteExpression",",,,") ) /// Missing token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1314) + /// (Originally from ..\FSComp.txt:1316) static member ppparsMissingToken(a0 : System.String) = (3185, GetStringFunc("ppparsMissingToken",",,,%s,,,") a0) /// An error occurred while reading the F# metadata node at position %d in table '%s' of assembly '%s'. The node had no matching declaration. Please report this warning. You may need to recompile the F# assembly you are using. - /// (Originally from ..\FSComp.txt:1315) + /// (Originally from ..\FSComp.txt:1317) static member pickleMissingDefinition(a0 : System.Int32, a1 : System.String, a2 : System.String) = (3186, GetStringFunc("pickleMissingDefinition",",,,%d,,,%s,,,%s,,,") a0 a1 a2) /// Type inference caused the type variable %s to escape its scope. Consider adding an explicit type parameter declaration or adjusting your code to be less generic. - /// (Originally from ..\FSComp.txt:1316) + /// (Originally from ..\FSComp.txt:1318) static member checkNotSufficientlyGenericBecauseOfScope(a0 : System.String) = (3187, GetStringFunc("checkNotSufficientlyGenericBecauseOfScope",",,,%s,,,") a0) /// Type inference caused an inference type variable to escape its scope. Consider adding type annotations to make your code less generic. - /// (Originally from ..\FSComp.txt:1317) + /// (Originally from ..\FSComp.txt:1319) static member checkNotSufficientlyGenericBecauseOfScopeAnon() = (3188, GetStringFunc("checkNotSufficientlyGenericBecauseOfScopeAnon",",,,") ) /// Redundant arguments are being ignored in function '%s'. Expected %d but got %d arguments. - /// (Originally from ..\FSComp.txt:1318) + /// (Originally from ..\FSComp.txt:1320) static member checkRaiseFamilyFunctionArgumentCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3189, GetStringFunc("checkRaiseFamilyFunctionArgumentCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Lowercase literal '%s' is being shadowed by a new pattern with the same name. Only uppercase and module-prefixed literals can be used as named patterns. - /// (Originally from ..\FSComp.txt:1319) + /// (Originally from ..\FSComp.txt:1321) static member checkLowercaseLiteralBindingInPattern(a0 : System.String) = (3190, GetStringFunc("checkLowercaseLiteralBindingInPattern",",,,%s,,,") a0) /// This literal pattern does not take arguments - /// (Originally from ..\FSComp.txt:1320) + /// (Originally from ..\FSComp.txt:1322) static member tcLiteralDoesNotTakeArguments() = (3191, GetStringFunc("tcLiteralDoesNotTakeArguments",",,,") ) /// Constructors are not permitted as extension members - they must be defined as part of the original definition of the type - /// (Originally from ..\FSComp.txt:1321) + /// (Originally from ..\FSComp.txt:1323) static member tcConstructorsIllegalInAugmentation() = (3192, GetStringFunc("tcConstructorsIllegalInAugmentation",",,,") ) /// Invalid response file '%s' ( '%s' ) - /// (Originally from ..\FSComp.txt:1322) + /// (Originally from ..\FSComp.txt:1324) static member optsInvalidResponseFile(a0 : System.String, a1 : System.String) = (3193, GetStringFunc("optsInvalidResponseFile",",,,%s,,,%s,,,") a0 a1) /// Response file '%s' not found in '%s' - /// (Originally from ..\FSComp.txt:1323) + /// (Originally from ..\FSComp.txt:1325) static member optsResponseFileNotFound(a0 : System.String, a1 : System.String) = (3194, GetStringFunc("optsResponseFileNotFound",",,,%s,,,%s,,,") a0 a1) /// Response file name '%s' is empty, contains invalid characters, has a drive specification without an absolute path, or is too long - /// (Originally from ..\FSComp.txt:1324) + /// (Originally from ..\FSComp.txt:1326) static member optsResponseFileNameInvalid(a0 : System.String) = (3195, GetStringFunc("optsResponseFileNameInvalid",",,,%s,,,") a0) /// Cannot find FSharp.Core.dll in compiler's directory - /// (Originally from ..\FSComp.txt:1325) + /// (Originally from ..\FSComp.txt:1327) static member fsharpCoreNotFoundToBeCopied() = (3196, GetStringFunc("fsharpCoreNotFoundToBeCopied",",,,") ) /// One tuple type is a struct tuple, the other is a reference tuple - /// (Originally from ..\FSComp.txt:1326) + /// (Originally from ..\FSComp.txt:1328) static member tcTupleStructMismatch() = (GetStringFunc("tcTupleStructMismatch",",,,") ) /// This provided method requires static parameters - /// (Originally from ..\FSComp.txt:1327) + /// (Originally from ..\FSComp.txt:1329) static member etMissingStaticArgumentsToMethod() = (3197, GetStringFunc("etMissingStaticArgumentsToMethod",",,,") ) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using 'upcast' instead of 'downcast'. - /// (Originally from ..\FSComp.txt:1328) + /// (Originally from ..\FSComp.txt:1330) static member considerUpcast(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcast",",,,%s,,,%s,,,") a0 a1) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using the :> (upcast) operator instead of the :?> (downcast) operator. - /// (Originally from ..\FSComp.txt:1329) + /// (Originally from ..\FSComp.txt:1331) static member considerUpcastOperator(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcastOperator",",,,%s,,,%s,,,") a0 a1) /// The 'rec' on this module is implied by an outer 'rec' declaration and is being ignored - /// (Originally from ..\FSComp.txt:1330) + /// (Originally from ..\FSComp.txt:1332) static member tcRecImplied() = (3199, GetStringFunc("tcRecImplied",",,,") ) /// In a recursive declaration group, 'open' declarations must come first in each module - /// (Originally from ..\FSComp.txt:1331) + /// (Originally from ..\FSComp.txt:1333) static member tcOpenFirstInMutRec() = (3200, GetStringFunc("tcOpenFirstInMutRec",",,,") ) /// In a recursive declaration group, module abbreviations must come after all 'open' declarations and before other declarations - /// (Originally from ..\FSComp.txt:1332) + /// (Originally from ..\FSComp.txt:1334) static member tcModuleAbbrevFirstInMutRec() = (3201, GetStringFunc("tcModuleAbbrevFirstInMutRec",",,,") ) /// This declaration is not supported in recursive declaration groups - /// (Originally from ..\FSComp.txt:1333) + /// (Originally from ..\FSComp.txt:1335) static member tcUnsupportedMutRecDecl() = (3202, GetStringFunc("tcUnsupportedMutRecDecl",",,,") ) /// Invalid use of 'rec' keyword - /// (Originally from ..\FSComp.txt:1334) + /// (Originally from ..\FSComp.txt:1336) static member parsInvalidUseOfRec() = (3203, GetStringFunc("parsInvalidUseOfRec",",,,") ) /// If a union type has more than one case and is a struct, then all fields within the union type must be given unique names. - /// (Originally from ..\FSComp.txt:1335) + /// (Originally from ..\FSComp.txt:1337) static member tcStructUnionMultiCaseDistinctFields() = (3204, GetStringFunc("tcStructUnionMultiCaseDistinctFields",",,,") ) /// The CallerMemberNameAttribute applied to parameter '%s' will have no effect. It is overridden by the CallerFilePathAttribute. - /// (Originally from ..\FSComp.txt:1336) + /// (Originally from ..\FSComp.txt:1338) static member CallerMemberNameIsOverriden(a0 : System.String) = (3206, GetStringFunc("CallerMemberNameIsOverriden",",,,%s,,,") a0) /// Invalid use of 'fixed'. 'fixed' may only be used in a declaration of the form 'use x = fixed expr' where the expression is an array, the address of a field, the address of an array element or a string' - /// (Originally from ..\FSComp.txt:1337) + /// (Originally from ..\FSComp.txt:1339) static member tcFixedNotAllowed() = (3207, GetStringFunc("tcFixedNotAllowed",",,,") ) /// Could not find method System.Runtime.CompilerServices.OffsetToStringData in references when building 'fixed' expression. - /// (Originally from ..\FSComp.txt:1338) + /// (Originally from ..\FSComp.txt:1340) static member tcCouldNotFindOffsetToStringData() = (3208, GetStringFunc("tcCouldNotFindOffsetToStringData",",,,") ) /// The address of the variable '%s' or a related expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1339) + /// (Originally from ..\FSComp.txt:1341) static member chkNoByrefAddressOfLocal(a0 : System.String) = (3209, GetStringFunc("chkNoByrefAddressOfLocal",",,,%s,,,") a0) /// %s is an active pattern and cannot be treated as a discriminated union case with named fields. - /// (Originally from ..\FSComp.txt:1340) + /// (Originally from ..\FSComp.txt:1342) static member tcNamedActivePattern(a0 : System.String) = (3210, GetStringFunc("tcNamedActivePattern",",,,%s,,,") a0) /// The default value does not have the same type as the argument. The DefaultParameterValue attribute and any Optional attribute will be ignored. Note: 'null' needs to be annotated with the correct type, e.g. 'DefaultParameterValue(null:obj)'. - /// (Originally from ..\FSComp.txt:1341) + /// (Originally from ..\FSComp.txt:1343) static member DefaultParameterValueNotAppropriateForArgument() = (3211, GetStringFunc("DefaultParameterValueNotAppropriateForArgument",",,,") ) /// The system type '%s' was required but no referenced system DLL contained this type - /// (Originally from ..\FSComp.txt:1342) + /// (Originally from ..\FSComp.txt:1344) static member tcGlobalsSystemTypeNotFound(a0 : System.String) = (GetStringFunc("tcGlobalsSystemTypeNotFound",",,,%s,,,") a0) /// The member '%s' matches multiple overloads of the same method.\nPlease restrict it to one of the following:%s. - /// (Originally from ..\FSComp.txt:1343) + /// (Originally from ..\FSComp.txt:1345) static member typrelMemberHasMultiplePossibleDispatchSlots(a0 : System.String, a1 : System.String) = (3213, GetStringFunc("typrelMemberHasMultiplePossibleDispatchSlots",",,,%s,,,%s,,,") a0 a1) /// Method or object constructor '%s' is not static - /// (Originally from ..\FSComp.txt:1344) + /// (Originally from ..\FSComp.txt:1346) static member methodIsNotStatic(a0 : System.String) = (3214, GetStringFunc("methodIsNotStatic",",,,%s,,,") a0) /// Unexpected symbol '=' in expression. Did you intend to use 'for x in y .. z do' instead? - /// (Originally from ..\FSComp.txt:1345) + /// (Originally from ..\FSComp.txt:1347) static member parsUnexpectedSymbolEqualsInsteadOfIn() = (3215, GetStringFunc("parsUnexpectedSymbolEqualsInsteadOfIn",",,,") ) /// Indicates a method that either has no implementation in the type in which it is declared or that is virtual and has a default implementation. - /// (Originally from ..\FSComp.txt:1346) + /// (Originally from ..\FSComp.txt:1348) static member keywordDescriptionAbstract() = (GetStringFunc("keywordDescriptionAbstract",",,,") ) /// Used in mutually recursive bindings, in property declarations, and with multiple constraints on generic parameters. - /// (Originally from ..\FSComp.txt:1347) + /// (Originally from ..\FSComp.txt:1349) static member keyworkDescriptionAnd() = (GetStringFunc("keyworkDescriptionAnd",",,,") ) /// Used to give the current class object an object name. Also used to give a name to a whole pattern within a pattern match. - /// (Originally from ..\FSComp.txt:1348) + /// (Originally from ..\FSComp.txt:1350) static member keywordDescriptionAs() = (GetStringFunc("keywordDescriptionAs",",,,") ) /// Used to verify code during debugging. - /// (Originally from ..\FSComp.txt:1349) + /// (Originally from ..\FSComp.txt:1351) static member keywordDescriptionAssert() = (GetStringFunc("keywordDescriptionAssert",",,,") ) /// Used as the name of the base class object. - /// (Originally from ..\FSComp.txt:1350) + /// (Originally from ..\FSComp.txt:1352) static member keywordDescriptionBase() = (GetStringFunc("keywordDescriptionBase",",,,") ) /// In verbose syntax, indicates the start of a code block. - /// (Originally from ..\FSComp.txt:1351) + /// (Originally from ..\FSComp.txt:1353) static member keywordDescriptionBegin() = (GetStringFunc("keywordDescriptionBegin",",,,") ) /// In verbose syntax, indicates the start of a class definition. - /// (Originally from ..\FSComp.txt:1352) + /// (Originally from ..\FSComp.txt:1354) static member keywordDescriptionClass() = (GetStringFunc("keywordDescriptionClass",",,,") ) /// Indicates an implementation of an abstract method; used together with an abstract method declaration to create a virtual method. - /// (Originally from ..\FSComp.txt:1353) + /// (Originally from ..\FSComp.txt:1355) static member keywordDescriptionDefault() = (GetStringFunc("keywordDescriptionDefault",",,,") ) /// Used to declare a delegate. - /// (Originally from ..\FSComp.txt:1354) + /// (Originally from ..\FSComp.txt:1356) static member keywordDescriptionDelegate() = (GetStringFunc("keywordDescriptionDelegate",",,,") ) /// Used in looping constructs or to execute imperative code. - /// (Originally from ..\FSComp.txt:1355) + /// (Originally from ..\FSComp.txt:1357) static member keywordDescriptionDo() = (GetStringFunc("keywordDescriptionDo",",,,") ) /// In verbose syntax, indicates the end of a block of code in a looping expression. - /// (Originally from ..\FSComp.txt:1356) + /// (Originally from ..\FSComp.txt:1358) static member keywordDescriptionDone() = (GetStringFunc("keywordDescriptionDone",",,,") ) /// Used to convert to a type that is lower in the inheritance chain. - /// (Originally from ..\FSComp.txt:1357) + /// (Originally from ..\FSComp.txt:1359) static member keywordDescriptionDowncast() = (GetStringFunc("keywordDescriptionDowncast",",,,") ) /// In a for expression, used when counting in reverse. - /// (Originally from ..\FSComp.txt:1358) + /// (Originally from ..\FSComp.txt:1360) static member keywordDescriptionDownto() = (GetStringFunc("keywordDescriptionDownto",",,,") ) /// Used in conditional branching. A short form of else if. - /// (Originally from ..\FSComp.txt:1359) + /// (Originally from ..\FSComp.txt:1361) static member keywordDescriptionElif() = (GetStringFunc("keywordDescriptionElif",",,,") ) /// Used in conditional branching. - /// (Originally from ..\FSComp.txt:1360) + /// (Originally from ..\FSComp.txt:1362) static member keywordDescriptionElse() = (GetStringFunc("keywordDescriptionElse",",,,") ) /// In type definitions and type extensions, indicates the end of a section of member definitions. In verbose syntax, used to specify the end of a code block that starts with the begin keyword. - /// (Originally from ..\FSComp.txt:1361) + /// (Originally from ..\FSComp.txt:1363) static member keywordDescriptionEnd() = (GetStringFunc("keywordDescriptionEnd",",,,") ) /// Used to declare an exception type. - /// (Originally from ..\FSComp.txt:1362) + /// (Originally from ..\FSComp.txt:1364) static member keywordDescriptionException() = (GetStringFunc("keywordDescriptionException",",,,") ) /// Indicates that a declared program element is defined in another binary or assembly. - /// (Originally from ..\FSComp.txt:1363) + /// (Originally from ..\FSComp.txt:1365) static member keywordDescriptionExtern() = (GetStringFunc("keywordDescriptionExtern",",,,") ) /// Used as a Boolean literal. - /// (Originally from ..\FSComp.txt:1364) + /// (Originally from ..\FSComp.txt:1366) static member keywordDescriptionTrueFalse() = (GetStringFunc("keywordDescriptionTrueFalse",",,,") ) /// Used together with try to introduce a block of code that executes regardless of whether an exception occurs. - /// (Originally from ..\FSComp.txt:1365) + /// (Originally from ..\FSComp.txt:1367) static member keywordDescriptionFinally() = (GetStringFunc("keywordDescriptionFinally",",,,") ) /// Used in looping constructs. - /// (Originally from ..\FSComp.txt:1366) + /// (Originally from ..\FSComp.txt:1368) static member keywordDescriptionFor() = (GetStringFunc("keywordDescriptionFor",",,,") ) /// Used in lambda expressions, also known as anonymous functions. - /// (Originally from ..\FSComp.txt:1367) + /// (Originally from ..\FSComp.txt:1369) static member keywordDescriptionFun() = (GetStringFunc("keywordDescriptionFun",",,,") ) /// Used as a shorter alternative to the fun keyword and a match expression in a lambda expression that has pattern matching on a single argument. - /// (Originally from ..\FSComp.txt:1368) + /// (Originally from ..\FSComp.txt:1370) static member keywordDescriptionFunction() = (GetStringFunc("keywordDescriptionFunction",",,,") ) /// Used to reference the top-level .NET namespace. - /// (Originally from ..\FSComp.txt:1369) + /// (Originally from ..\FSComp.txt:1371) static member keywordDescriptionGlobal() = (GetStringFunc("keywordDescriptionGlobal",",,,") ) /// Used in conditional branching constructs. - /// (Originally from ..\FSComp.txt:1370) + /// (Originally from ..\FSComp.txt:1372) static member keywordDescriptionIf() = (GetStringFunc("keywordDescriptionIf",",,,") ) /// Used for sequence expressions and, in verbose syntax, to separate expressions from bindings. - /// (Originally from ..\FSComp.txt:1371) + /// (Originally from ..\FSComp.txt:1373) static member keywordDescriptionIn() = (GetStringFunc("keywordDescriptionIn",",,,") ) /// Used to specify a base class or base interface. - /// (Originally from ..\FSComp.txt:1372) + /// (Originally from ..\FSComp.txt:1374) static member keywordDescriptionInherit() = (GetStringFunc("keywordDescriptionInherit",",,,") ) /// Used to indicate a function that should be integrated directly into the caller's code. - /// (Originally from ..\FSComp.txt:1373) + /// (Originally from ..\FSComp.txt:1375) static member keywordDescriptionInline() = (GetStringFunc("keywordDescriptionInline",",,,") ) /// Used to declare and implement interfaces. - /// (Originally from ..\FSComp.txt:1374) + /// (Originally from ..\FSComp.txt:1376) static member keywordDescriptionInterface() = (GetStringFunc("keywordDescriptionInterface",",,,") ) /// Used to specify that a member is visible inside an assembly but not outside it. - /// (Originally from ..\FSComp.txt:1375) + /// (Originally from ..\FSComp.txt:1377) static member keywordDescriptionInternal() = (GetStringFunc("keywordDescriptionInternal",",,,") ) /// Used to specify a computation that is to be performed only when a result is needed. - /// (Originally from ..\FSComp.txt:1376) + /// (Originally from ..\FSComp.txt:1378) static member keywordDescriptionLazy() = (GetStringFunc("keywordDescriptionLazy",",,,") ) /// Used to associate, or bind, a name to a value or function. - /// (Originally from ..\FSComp.txt:1377) + /// (Originally from ..\FSComp.txt:1379) static member keywordDescriptionLet() = (GetStringFunc("keywordDescriptionLet",",,,") ) /// Used in computation expressions to bind a name to the result of another computation expression. - /// (Originally from ..\FSComp.txt:1378) + /// (Originally from ..\FSComp.txt:1380) static member keywordDescriptionLetBang() = (GetStringFunc("keywordDescriptionLetBang",",,,") ) /// Used to branch by comparing a value to a pattern. - /// (Originally from ..\FSComp.txt:1379) + /// (Originally from ..\FSComp.txt:1381) static member keywordDescriptionMatch() = (GetStringFunc("keywordDescriptionMatch",",,,") ) /// Used in computation expressions to pattern match directly over the result of another computation expression. - /// (Originally from ..\FSComp.txt:1380) + /// (Originally from ..\FSComp.txt:1382) static member keywordDescriptionMatchBang() = (GetStringFunc("keywordDescriptionMatchBang",",,,") ) /// Used to declare a property or method in an object type. - /// (Originally from ..\FSComp.txt:1381) + /// (Originally from ..\FSComp.txt:1383) static member keywordDescriptionMember() = (GetStringFunc("keywordDescriptionMember",",,,") ) /// Used to associate a name with a group of related types, values, and functions, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1382) + /// (Originally from ..\FSComp.txt:1384) static member keywordDescriptionModule() = (GetStringFunc("keywordDescriptionModule",",,,") ) /// Used to declare a variable, that is, a value that can be changed. - /// (Originally from ..\FSComp.txt:1383) + /// (Originally from ..\FSComp.txt:1385) static member keywordDescriptionMutable() = (GetStringFunc("keywordDescriptionMutable",",,,") ) /// Used to associate a name with a group of related types and modules, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1384) + /// (Originally from ..\FSComp.txt:1386) static member keywordDescriptionNamespace() = (GetStringFunc("keywordDescriptionNamespace",",,,") ) /// Used to declare, define, or invoke a constructor that creates or that can create an object. Also used in generic parameter constraints to indicate that a type must have a certain constructor. - /// (Originally from ..\FSComp.txt:1385) + /// (Originally from ..\FSComp.txt:1387) static member keywordDescriptionNew() = (GetStringFunc("keywordDescriptionNew",",,,") ) /// Not actually a keyword. However, not struct in combination is used as a generic parameter constraint. - /// (Originally from ..\FSComp.txt:1386) + /// (Originally from ..\FSComp.txt:1388) static member keywordDescriptionNot() = (GetStringFunc("keywordDescriptionNot",",,,") ) /// Indicates the absence of an object. Also used in generic parameter constraints. - /// (Originally from ..\FSComp.txt:1387) + /// (Originally from ..\FSComp.txt:1389) static member keywordDescriptionNull() = (GetStringFunc("keywordDescriptionNull",",,,") ) /// Used in discriminated unions to indicate the type of categories of values, and in delegate and exception declarations. - /// (Originally from ..\FSComp.txt:1388) + /// (Originally from ..\FSComp.txt:1390) static member keywordDescriptionOf() = (GetStringFunc("keywordDescriptionOf",",,,") ) /// Used to make the contents of a namespace or module available without qualification. - /// (Originally from ..\FSComp.txt:1389) + /// (Originally from ..\FSComp.txt:1391) static member keywordDescriptionOpen() = (GetStringFunc("keywordDescriptionOpen",",,,") ) /// Used with Boolean conditions as a Boolean or operator. Equivalent to ||. Also used in member constraints. - /// (Originally from ..\FSComp.txt:1390) + /// (Originally from ..\FSComp.txt:1392) static member keywordDescriptionOr() = (GetStringFunc("keywordDescriptionOr",",,,") ) /// Used to implement a version of an abstract or virtual method that differs from the base version. - /// (Originally from ..\FSComp.txt:1391) + /// (Originally from ..\FSComp.txt:1393) static member keywordDescriptionOverride() = (GetStringFunc("keywordDescriptionOverride",",,,") ) /// Restricts access to a member to code in the same type or module. - /// (Originally from ..\FSComp.txt:1392) + /// (Originally from ..\FSComp.txt:1394) static member keywordDescriptionPrivate() = (GetStringFunc("keywordDescriptionPrivate",",,,") ) /// Allows access to a member from outside the type. - /// (Originally from ..\FSComp.txt:1393) + /// (Originally from ..\FSComp.txt:1395) static member keywordDescriptionPublic() = (GetStringFunc("keywordDescriptionPublic",",,,") ) /// Used to indicate that a function is recursive. - /// (Originally from ..\FSComp.txt:1394) + /// (Originally from ..\FSComp.txt:1396) static member keywordDescriptionRec() = (GetStringFunc("keywordDescriptionRec",",,,") ) /// Used to provide a value for the result of the containing computation expression. - /// (Originally from ..\FSComp.txt:1395) + /// (Originally from ..\FSComp.txt:1397) static member keywordDescriptionReturn() = (GetStringFunc("keywordDescriptionReturn",",,,") ) /// Used to provide a value for the result of the containing computation expression, where that value itself comes from the result another computation expression. - /// (Originally from ..\FSComp.txt:1396) + /// (Originally from ..\FSComp.txt:1398) static member keywordDescriptionReturnBang() = (GetStringFunc("keywordDescriptionReturnBang",",,,") ) /// Used in query expressions to specify what fields or columns to extract. Note that this is a contextual keyword, which means that it is not actually a reserved word and it only acts like a keyword in appropriate context. - /// (Originally from ..\FSComp.txt:1397) + /// (Originally from ..\FSComp.txt:1399) static member keywordDescriptionSelect() = (GetStringFunc("keywordDescriptionSelect",",,,") ) /// Used to indicate a method or property that can be called without an instance of a type, or a value member that is shared among all instances of a type. - /// (Originally from ..\FSComp.txt:1398) + /// (Originally from ..\FSComp.txt:1400) static member keywordDescriptionStatic() = (GetStringFunc("keywordDescriptionStatic",",,,") ) /// Used to declare a structure type. Also used in generic parameter constraints. Used for OCaml compatibility in module definitions. - /// (Originally from ..\FSComp.txt:1399) + /// (Originally from ..\FSComp.txt:1401) static member keywordDescriptionStruct() = (GetStringFunc("keywordDescriptionStruct",",,,") ) /// Used in conditional expressions. Also used to perform side effects after object construction. - /// (Originally from ..\FSComp.txt:1400) + /// (Originally from ..\FSComp.txt:1402) static member keywordDescriptionThen() = (GetStringFunc("keywordDescriptionThen",",,,") ) /// Used in for loops to indicate a range. - /// (Originally from ..\FSComp.txt:1401) + /// (Originally from ..\FSComp.txt:1403) static member keywordDescriptionTo() = (GetStringFunc("keywordDescriptionTo",",,,") ) /// Used to introduce a block of code that might generate an exception. Used together with with or finally. - /// (Originally from ..\FSComp.txt:1402) + /// (Originally from ..\FSComp.txt:1404) static member keywordDescriptionTry() = (GetStringFunc("keywordDescriptionTry",",,,") ) /// Used to declare a class, record, structure, discriminated union, enumeration type, unit of measure, or type abbreviation. - /// (Originally from ..\FSComp.txt:1403) + /// (Originally from ..\FSComp.txt:1405) static member keywordDescriptionType() = (GetStringFunc("keywordDescriptionType",",,,") ) /// Used to convert to a type that is higher in the inheritance chain. - /// (Originally from ..\FSComp.txt:1404) + /// (Originally from ..\FSComp.txt:1406) static member keywordDescriptionUpcast() = (GetStringFunc("keywordDescriptionUpcast",",,,") ) /// Used instead of let for values that implement IDisposable" - /// (Originally from ..\FSComp.txt:1405) + /// (Originally from ..\FSComp.txt:1407) static member keywordDescriptionUse() = (GetStringFunc("keywordDescriptionUse",",,,") ) /// Used instead of let! in computation expressions for computation expression results that implement IDisposable. - /// (Originally from ..\FSComp.txt:1406) + /// (Originally from ..\FSComp.txt:1408) static member keywordDescriptionUseBang() = (GetStringFunc("keywordDescriptionUseBang",",,,") ) /// Used in a signature to indicate a value, or in a type to declare a member, in limited situations. - /// (Originally from ..\FSComp.txt:1407) + /// (Originally from ..\FSComp.txt:1409) static member keywordDescriptionVal() = (GetStringFunc("keywordDescriptionVal",",,,") ) /// Indicates the .NET void type. Used when interoperating with other .NET languages. - /// (Originally from ..\FSComp.txt:1408) + /// (Originally from ..\FSComp.txt:1410) static member keywordDescriptionVoid() = (GetStringFunc("keywordDescriptionVoid",",,,") ) /// Used for Boolean conditions (when guards) on pattern matches and to introduce a constraint clause for a generic type parameter. - /// (Originally from ..\FSComp.txt:1409) + /// (Originally from ..\FSComp.txt:1411) static member keywordDescriptionWhen() = (GetStringFunc("keywordDescriptionWhen",",,,") ) /// Introduces a looping construct. - /// (Originally from ..\FSComp.txt:1410) + /// (Originally from ..\FSComp.txt:1412) static member keywordDescriptionWhile() = (GetStringFunc("keywordDescriptionWhile",",,,") ) /// Used together with the match keyword in pattern matching expressions. Also used in object expressions, record copying expressions, and type extensions to introduce member definitions, and to introduce exception handlers. - /// (Originally from ..\FSComp.txt:1411) + /// (Originally from ..\FSComp.txt:1413) static member keywordDescriptionWith() = (GetStringFunc("keywordDescriptionWith",",,,") ) /// Used in a sequence expression to produce a value for a sequence. - /// (Originally from ..\FSComp.txt:1412) + /// (Originally from ..\FSComp.txt:1414) static member keywordDescriptionYield() = (GetStringFunc("keywordDescriptionYield",",,,") ) /// Used in a computation expression to append the result of a given computation expression to a collection of results for the containing computation expression. - /// (Originally from ..\FSComp.txt:1413) + /// (Originally from ..\FSComp.txt:1415) static member keywordDescriptionYieldBang() = (GetStringFunc("keywordDescriptionYieldBang",",,,") ) /// In function types, delimits arguments and return values. Yields an expression (in sequence expressions); equivalent to the yield keyword. Used in match expressions - /// (Originally from ..\FSComp.txt:1414) + /// (Originally from ..\FSComp.txt:1416) static member keywordDescriptionRightArrow() = (GetStringFunc("keywordDescriptionRightArrow",",,,") ) /// Assigns a value to a variable. - /// (Originally from ..\FSComp.txt:1415) + /// (Originally from ..\FSComp.txt:1417) static member keywordDescriptionLeftArrow() = (GetStringFunc("keywordDescriptionLeftArrow",",,,") ) /// Converts a type to type that is higher in the hierarchy. - /// (Originally from ..\FSComp.txt:1416) + /// (Originally from ..\FSComp.txt:1418) static member keywordDescriptionCast() = (GetStringFunc("keywordDescriptionCast",",,,") ) /// Converts a type to a type that is lower in the hierarchy. - /// (Originally from ..\FSComp.txt:1417) + /// (Originally from ..\FSComp.txt:1419) static member keywordDescriptionDynamicCast() = (GetStringFunc("keywordDescriptionDynamicCast",",,,") ) /// Delimits a typed code quotation. - /// (Originally from ..\FSComp.txt:1418) + /// (Originally from ..\FSComp.txt:1420) static member keywordDescriptionTypedQuotation() = (GetStringFunc("keywordDescriptionTypedQuotation",",,,") ) /// Delimits a untyped code quotation. - /// (Originally from ..\FSComp.txt:1419) + /// (Originally from ..\FSComp.txt:1421) static member keywordDescriptionUntypedQuotation() = (GetStringFunc("keywordDescriptionUntypedQuotation",",,,") ) /// %s '%s' not found in assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1420) + /// (Originally from ..\FSComp.txt:1422) static member itemNotFoundDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String) = (3216, GetStringFunc("itemNotFoundDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s '%s' not found in type '%s' from assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1421) + /// (Originally from ..\FSComp.txt:1423) static member itemNotFoundInTypeDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3216, GetStringFunc("itemNotFoundInTypeDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// is - /// (Originally from ..\FSComp.txt:1422) + /// (Originally from ..\FSComp.txt:1424) static member descriptionWordIs() = (GetStringFunc("descriptionWordIs",",,,") ) /// This value is not a function and cannot be applied. - /// (Originally from ..\FSComp.txt:1423) + /// (Originally from ..\FSComp.txt:1425) static member notAFunction() = (GetStringFunc("notAFunction",",,,") ) /// This value is not a function and cannot be applied. Did you intend to access the indexer via %s.[index] instead? - /// (Originally from ..\FSComp.txt:1424) + /// (Originally from ..\FSComp.txt:1426) static member notAFunctionButMaybeIndexerWithName(a0 : System.String) = (GetStringFunc("notAFunctionButMaybeIndexerWithName",",,,%s,,,") a0) /// This expression is not a function and cannot be applied. Did you intend to access the indexer via expr.[index] instead? - /// (Originally from ..\FSComp.txt:1425) + /// (Originally from ..\FSComp.txt:1427) static member notAFunctionButMaybeIndexer() = (GetStringFunc("notAFunctionButMaybeIndexer",",,,") ) /// - /// (Originally from ..\FSComp.txt:1426) + /// (Originally from ..\FSComp.txt:1428) static member notAFunctionButMaybeIndexerErrorCode() = (3217, GetStringFunc("notAFunctionButMaybeIndexerErrorCode",",,,") ) /// This value is not a function and cannot be applied. Did you forget to terminate a declaration? - /// (Originally from ..\FSComp.txt:1427) + /// (Originally from ..\FSComp.txt:1429) static member notAFunctionButMaybeDeclaration() = (GetStringFunc("notAFunctionButMaybeDeclaration",",,,") ) /// The argument names in the signature '%s' and implementation '%s' do not match. The argument name from the signature file will be used. This may cause problems when debugging or profiling. - /// (Originally from ..\FSComp.txt:1428) + /// (Originally from ..\FSComp.txt:1430) static member ArgumentsInSigAndImplMismatch(a0 : System.String, a1 : System.String) = (3218, GetStringFunc("ArgumentsInSigAndImplMismatch",",,,%s,,,%s,,,") a0 a1) /// An error occurred while reading the F# metadata of assembly '%s'. A reserved construct was utilized. You may need to upgrade your F# compiler or use an earlier version of the assembly that doesn't make use of a specific construct. - /// (Originally from ..\FSComp.txt:1429) + /// (Originally from ..\FSComp.txt:1431) static member pickleUnexpectedNonZero(a0 : System.String) = (3219, GetStringFunc("pickleUnexpectedNonZero",",,,%s,,,") a0) /// This method or property is not normally used from F# code, use an explicit tuple pattern for deconstruction instead. - /// (Originally from ..\FSComp.txt:1430) + /// (Originally from ..\FSComp.txt:1432) static member tcTupleMemberNotNormallyUsed() = (3220, GetStringFunc("tcTupleMemberNotNormallyUsed",",,,") ) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield'. - /// (Originally from ..\FSComp.txt:1431) + /// (Originally from ..\FSComp.txt:1433) static member implicitlyDiscardedInSequenceExpression(a0 : System.String) = (3221, GetStringFunc("implicitlyDiscardedInSequenceExpression",",,,%s,,,") a0) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield!'. - /// (Originally from ..\FSComp.txt:1432) + /// (Originally from ..\FSComp.txt:1434) static member implicitlyDiscardedSequenceInSequenceExpression(a0 : System.String) = (3222, GetStringFunc("implicitlyDiscardedSequenceInSequenceExpression",",,,%s,,,") a0) /// The file '%s' changed on disk unexpectedly, please reload. - /// (Originally from ..\FSComp.txt:1433) + /// (Originally from ..\FSComp.txt:1435) static member ilreadFileChanged(a0 : System.String) = (3223, GetStringFunc("ilreadFileChanged",",,,%s,,,") a0) /// The byref pointer is readonly, so this write is not permitted. - /// (Originally from ..\FSComp.txt:1434) + /// (Originally from ..\FSComp.txt:1436) static member writeToReadOnlyByref() = (3224, GetStringFunc("writeToReadOnlyByref",",,,") ) /// A ReadOnly attribute has been applied to a struct type with a mutable field. - /// (Originally from ..\FSComp.txt:1435) + /// (Originally from ..\FSComp.txt:1437) static member readOnlyAttributeOnStructWithMutableField() = (3225, GetStringFunc("readOnlyAttributeOnStructWithMutableField",",,,") ) /// A byref pointer returned by a function or method is implicitly dereferenced as of F# 4.5. To acquire the return value as a pointer, use the address-of operator, e.g. '&f(x)' or '&obj.Method(arg1, arg2)'. - /// (Originally from ..\FSComp.txt:1436) + /// (Originally from ..\FSComp.txt:1438) static member tcByrefReturnImplicitlyDereferenced() = (3226, GetStringFunc("tcByrefReturnImplicitlyDereferenced",",,,") ) /// A type annotated with IsByRefLike must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1437) + /// (Originally from ..\FSComp.txt:1439) static member tcByRefLikeNotStruct() = (3227, GetStringFunc("tcByRefLikeNotStruct",",,,") ) /// The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1438) + /// (Originally from ..\FSComp.txt:1440) static member chkNoByrefAddressOfValueFromExpression() = (3228, GetStringFunc("chkNoByrefAddressOfValueFromExpression",",,,") ) /// The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope. - /// (Originally from ..\FSComp.txt:1439) + /// (Originally from ..\FSComp.txt:1441) static member chkNoReturnOfLimitedSpan() = (3229, GetStringFunc("chkNoReturnOfLimitedSpan",",,,") ) /// This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope. - /// (Originally from ..\FSComp.txt:1440) + /// (Originally from ..\FSComp.txt:1442) static member chkNoWriteToLimitedSpan(a0 : System.String) = (3230, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0) /// A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...' - /// (Originally from ..\FSComp.txt:1441) + /// (Originally from ..\FSComp.txt:1443) static member tastValueMustBeLocal() = (3231, GetStringFunc("tastValueMustBeLocal",",,,") ) /// A type annotated with IsReadOnly must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1442) + /// (Originally from ..\FSComp.txt:1444) static member tcIsReadOnlyNotStruct() = (3232, GetStringFunc("tcIsReadOnlyNotStruct",",,,") ) /// Struct members cannot return the address of fields of the struct by reference - /// (Originally from ..\FSComp.txt:1443) + /// (Originally from ..\FSComp.txt:1445) static member chkStructsMayNotReturnAddressesOfContents() = (3233, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,") ) /// The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1444) + /// (Originally from ..\FSComp.txt:1446) static member chkNoByrefLikeFunctionCall() = (3234, GetStringFunc("chkNoByrefLikeFunctionCall",",,,") ) /// The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1445) + /// (Originally from ..\FSComp.txt:1447) static member chkNoSpanLikeVariable(a0 : System.String) = (3235, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0) /// A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1446) + /// (Originally from ..\FSComp.txt:1448) static member chkNoSpanLikeValueFromExpression() = (3236, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,") ) /// Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address. - /// (Originally from ..\FSComp.txt:1447) + /// (Originally from ..\FSComp.txt:1449) static member tastCantTakeAddressOfExpression() = (3237, GetStringFunc("tastCantTakeAddressOfExpression",",,,") ) /// This type does not inherit Attribute, it will not work correctly with other .NET languages. - /// (Originally from ..\FSComp.txt:1448) + /// (Originally from ..\FSComp.txt:1450) static member tcTypeDoesNotInheritAttribute() = (3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,") ) /// The type '%s' does not support a nullness qualitification. - /// (Originally from ..\FSComp.txt:1449) + /// (Originally from ..\FSComp.txt:1451) static member tcTypeDoesNotHaveAnyNull(a0 : System.String) = (3243, GetStringFunc("tcTypeDoesNotHaveAnyNull",",,,%s,,,") a0) /// The /checknulls language feature is not enabled - /// (Originally from ..\FSComp.txt:1452) - static member tcNullnessCheckingNotEnabled() = (3246, GetStringFunc("tcNullnessCheckingNotEnabled",",,,") ) + /// (Originally from ..\FSComp.txt:1455) + static member tcNullnessCheckingNotEnabled() = (3247, GetStringFunc("tcNullnessCheckingNotEnabled",",,,") ) /// Call this method once to validate that all known resources are valid; throws if not static member RunStartupValidation() = @@ -4689,6 +4695,8 @@ type internal SR private() = ignore(GetString("csMethodFoundButIsNotStatic")) ignore(GetString("csStructConstraintInconsistent")) ignore(GetString("csTypeDoesNotHaveNull")) + ignore(GetString("csTypeHasNullAsTrueValue")) + ignore(GetString("csTypeHasNullAsExtraValue")) ignore(GetString("csNullableTypeDoesNotHaveNull")) ignore(GetString("csTypeDoesNotSupportComparison1")) ignore(GetString("csTypeDoesNotSupportComparison2")) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index 11e6631c6e1..5d4427d66b2 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -1041,6 +1041,12 @@ The type '{0}' does not have 'null' as a proper value + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' does not have 'null' as a proper value. To create a null value for a Nullable type use 'System.Nullable()'. diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index e146ab290f5..57ba4268b15 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -197,6 +197,7 @@ let GetRangeOfDiagnostic(err:PhasedDiagnostic) = | ConstraintSolverNullnessWarningEquivWithTypes(_, _, _, _, _, m, _) | ConstraintSolverNullnessWarningWithTypes(_, _, _, _, _, m, _) | ConstraintSolverNullnessWarningWithType(_, _, _, m, _) + | ConstraintSolverNonNullnessWarningWithType(_, _, _, m, _) | ConstraintSolverTypesNotInEqualityRelation(_, _, _, m, _, _) | ConstraintSolverError(_, m, _) | ConstraintSolverTypesNotInSubsumptionRelation(_, _, _, m, _) @@ -377,6 +378,7 @@ let GetDiagnosticNumber(err:PhasedDiagnostic) = | ConstraintSolverNullnessWarningEquivWithTypes _ -> 3244 | ConstraintSolverNullnessWarningWithTypes _ -> 3244 | ConstraintSolverNullnessWarningWithType _ -> 3245 + | ConstraintSolverNonNullnessWarningWithType _ -> 3246 | _ -> 193 GetFromException err.Exception @@ -451,6 +453,7 @@ let ConstraintSolverTypesNotInEqualityRelation1E() = DeclareResourceString("Cons let ConstraintSolverNullnessWarningEquivWithTypesE() = DeclareResourceString("ConstraintSolverNullnessWarningEquivWithTypes", "%s%s%s%s") let ConstraintSolverNullnessWarningWithTypesE() = DeclareResourceString("ConstraintSolverNullnessWarningWithTypes", "%s%s%s%s") let ConstraintSolverNullnessWarningWithTypeE() = DeclareResourceString("ConstraintSolverNullnessWarningWithType", "%s") +let ConstraintSolverNonNullnessWarningWithTypeE() = DeclareResourceString("ConstraintSolverNonNullnessWarningWithType", "%s") let ConstraintSolverTypesNotInEqualityRelation2E() = DeclareResourceString("ConstraintSolverTypesNotInEqualityRelation2", "%s%s") let ConstraintSolverTypesNotInSubsumptionRelationE() = DeclareResourceString("ConstraintSolverTypesNotInSubsumptionRelation", "%s%s%s") let ErrorFromAddingTypeEquation1E() = DeclareResourceString("ErrorFromAddingTypeEquation1", "%s%s%s") @@ -666,6 +669,14 @@ let OutputPhasedErrorR (os:StringBuilder) (err:PhasedDiagnostic) = if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore + | ConstraintSolverNonNullnessWarningWithType(denv, ty, _nullness, m, m2) -> + + let t = NicePrint.minimalStringOfType denv ty + os.Append(ConstraintSolverNonNullnessWarningWithTypeE().Format (t)) |> ignore + + if m.StartLine <> m2.StartLine then + os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore + | ConstraintSolverTypesNotInEqualityRelation(denv, (TType_measure _ as t1), (TType_measure _ as t2), m, m2, _) -> // REVIEW: consider if we need to show _cxs (the type parameter constraints) let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv t1 t2 diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 3fe6b5937bb..8f3066f8eed 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -171,6 +171,7 @@ exception ConstraintSolverMissingConstraint of DisplayEnv * Tast.Typar * Tast.Ty exception ConstraintSolverNullnessWarningEquivWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverNullnessWarningWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverNullnessWarningWithType of DisplayEnv * TType * NullnessInfo * range * range +exception ConstraintSolverNonNullnessWarningWithType of DisplayEnv * TType * NullnessInfo * range * range exception ConstraintSolverError of string * range * range exception ConstraintSolverRelatedInformation of string option * range * exn @@ -777,7 +778,8 @@ and solveTypMeetsTyparConstraints (csenv:ConstraintSolverEnv) ndeep m2 trace ty | ValueSome destTypar -> AddConstraint csenv ndeep m2 trace destTypar (TyparConstraint.DefaultsTo(priority, dty, m)) - | TyparConstraint.SupportsNull m2 -> SolveTypeSupportsNull csenv ndeep m2 trace ty + | TyparConstraint.NotSupportsNull m2 -> SolveTypeDefnNotSupportsNull csenv ndeep m2 trace ty + | TyparConstraint.SupportsNull m2 -> SolveTypeDefnSupportsNull csenv ndeep m2 trace ty | TyparConstraint.IsEnum(underlying, m2) -> SolveTypeIsEnum csenv ndeep m2 trace ty underlying | TyparConstraint.SupportsComparison(m2) -> SolveTypeSupportsComparison csenv ndeep m2 trace ty | TyparConstraint.SupportsEquality(m2) -> SolveTypeSupportsEquality csenv ndeep m2 trace ty @@ -1840,7 +1842,7 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio if nv.IsSolved then SolveNullnessSupportsNull csenv ndeep m2 trace ty nv.Solution else - trace.Exec (fun () -> printfn "NV %d --> KnownWithNull" (nv.GetHashCode()); nv.Set KnownWithNull) (fun () -> nv.Unset()) + trace.Exec (fun () -> nv.Set KnownWithNull) (fun () -> nv.Unset()) CompleteD | Nullness.Known n1 -> match n1 with @@ -1852,25 +1854,100 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio else CompleteD -and SolveTypeSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = +and SolveNullnessNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) ty nullness = + let m = csenv.m + let denv = csenv.DisplayEnv + match nullness with + | Nullness.Variable nv -> + if nv.IsSolved then + SolveNullnessNotSupportsNull csenv ndeep m2 trace ty nv.Solution + else + trace.Exec (fun () -> nv.Set KnownWithoutNull) (fun () -> nv.Unset()) + CompleteD + | Nullness.Known n1 -> + match n1 with + | NullnessInfo.ObliviousToNull -> CompleteD + | NullnessInfo.WithoutNull -> CompleteD + | NullnessInfo.WithNull -> + if csenv.g.checkNullness then + WarnD(ConstraintSolverNonNullnessWarningWithType(denv, ty, n1, m, m2)) + else + CompleteD + +and SolveTypeSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let g = csenv.g let m = csenv.m let denv = csenv.DisplayEnv + if TypeNullIsExtraValueNew g m ty then CompleteD else + let sty = stripTyparEqns ty + match sty with + | TType_fun (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness + | TType_app (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness + | _ -> + if TypeNullIsExtraValueOld g m ty then CompleteD else + match sty with + | NullableTy g _ -> + ErrorD (ConstraintSolverError(FSComp.SR.csNullableTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) + | _ -> + ErrorD (ConstraintSolverError(FSComp.SR.csTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) + +and SolveTypeNotSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = + let g = csenv.g + let m = csenv.m + let denv = csenv.DisplayEnv + if TypeNullIsTrueValue g ty then + ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsTrueValue(NicePrint.minimalStringOfType denv ty), m, m2)) + elif TypeNullIsExtraValueNew g m ty then + ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) + else + let sty = stripTyparEqns ty + match sty with + | TType_fun (_, _, nullness) + | TType_app (_, _, nullness) -> SolveNullnessNotSupportsNull csenv ndeep m2 trace ty nullness + | _ -> + CompleteD + +// This version prefers to constrain a type parameter definiton +and SolveTypeDefnSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = + let g = csenv.g + let m = csenv.m + match stripTyparEqns ty with + // If you set a type variable constrained with a T: null to U? then you don't induce an inference constraint + // of U: null. + // TODO: what about Obsolete? + | TType_var(_, nullness) when nullness.Evaluate() = NullnessInfo.WithNull -> CompleteD + | _ -> match tryDestTyparTy g ty with - | ValueSome destTypar -> - AddConstraint csenv ndeep m2 trace destTypar (TyparConstraint.SupportsNull m) + | ValueSome tp -> + AddConstraint csenv ndeep m2 trace tp (TyparConstraint.SupportsNull m) | ValueNone -> - if TypeNullIsExtraValueNew g m ty then CompleteD else - match stripTyparEqns ty with - | TType_fun (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness - | TType_app (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness - | _ -> - if TypeNullIsExtraValueOld g m ty then CompleteD else - match stripTyparEqns ty with - | NullableTy g _ -> - ErrorD (ConstraintSolverError(FSComp.SR.csNullableTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) - | _ -> - ErrorD (ConstraintSolverError(FSComp.SR.csTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) + SolveTypeSupportsNullCore csenv ndeep m2 trace ty + +// This version prefers to constrain the nullness annotation +and SolveTypeUseSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = + let m = csenv.m + match stripTyparEqns ty with + | TType_var(tp, nullness) -> + AddConstraint csenv ndeep m2 trace tp (TyparConstraint.IsReferenceType m) ++ (fun () -> + SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness) + | _ -> + SolveTypeSupportsNullCore csenv ndeep m2 trace ty + +// This version prefers to constrain a type parameter definiton +and SolveTypeDefnNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = + let g = csenv.g + let m = csenv.m + //match stripTyparEqns ty with + //// If you set a type variable constrained with a T: not null to U then you don't induce an inference constraint + //// of U: not null. + //// TODO: what about Obsolete? + //| TType_var(_, nullness) when nullness.TryEvaluate() = Some NullnessInfo.WithoutNull || nullness.TryEvaluate() = Some NullnessInfo.ObliviousToNull -> CompleteD + //| _ -> + match tryDestTyparTy g ty with + | ValueSome tp -> + AddConstraint csenv ndeep m2 trace tp (TyparConstraint.NotSupportsNull m) + | ValueNone -> + SolveTypeNotSupportsNullCore csenv ndeep m2 trace ty and SolveTypeSupportsComparison (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let g = csenv.g @@ -2776,8 +2853,18 @@ let AddCxMethodConstraint denv css m trace traitInfo = (fun res -> ErrorD (ErrorFromAddingConstraint(denv, res, m))) |> RaiseOperationResult -let AddCxTypeMustSupportNull denv css m trace ty = - TryD (fun () -> SolveTypeSupportsNull (MakeConstraintSolverEnv ContextInfo.NoContext css m denv) 0 m trace ty) +let AddCxTypeDefnSupportsNull denv css m trace ty = + TryD (fun () -> SolveTypeDefnSupportsNull (MakeConstraintSolverEnv ContextInfo.NoContext css m denv) 0 m trace ty) + (fun res -> ErrorD (ErrorFromAddingConstraint(denv, res, m))) + |> RaiseOperationResult + +let AddCxTypeDefnNotSupportsNull denv css m trace ty = + TryD (fun () -> SolveTypeDefnNotSupportsNull (MakeConstraintSolverEnv ContextInfo.NoContext css m denv) 0 m trace ty) + (fun res -> ErrorD (ErrorFromAddingConstraint(denv, res, m))) + |> RaiseOperationResult + +let AddCxTypeUseSupportsNull denv css m trace ty = + TryD (fun () -> SolveTypeUseSupportsNull (MakeConstraintSolverEnv ContextInfo.NoContext css m denv) 0 m trace ty) (fun res -> ErrorD (ErrorFromAddingConstraint(denv, res, m))) |> RaiseOperationResult diff --git a/src/fsharp/ConstraintSolver.fsi b/src/fsharp/ConstraintSolver.fsi index f47a45e30c0..cfecce2cb77 100644 --- a/src/fsharp/ConstraintSolver.fsi +++ b/src/fsharp/ConstraintSolver.fsi @@ -85,6 +85,7 @@ exception ConstraintSolverMissingConstraint of DisplayEnv * Typar * exception ConstraintSolverNullnessWarningEquivWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverNullnessWarningWithTypes of DisplayEnv * TType * TType * NullnessInfo * NullnessInfo * range * range exception ConstraintSolverNullnessWarningWithType of DisplayEnv * TType * NullnessInfo * range * range +exception ConstraintSolverNonNullnessWarningWithType of DisplayEnv * TType * NullnessInfo * range * range exception ConstraintSolverError of string * range * range exception ConstraintSolverRelatedInformation of string option * range * exn exception ErrorFromApplyingDefault of TcGlobals * DisplayEnv * Typar * TType * exn * range @@ -134,7 +135,9 @@ val AddCxTypeMustSubsumeType : ContextInfo -> DisplayEnv -> Con val AddCxTypeMustSubsumeTypeUndoIfFailed : DisplayEnv -> ConstraintSolverState -> range -> TType -> TType -> bool val AddCxTypeMustSubsumeTypeMatchingOnlyUndoIfFailed : DisplayEnv -> ConstraintSolverState -> range -> TType -> TType -> bool val AddCxMethodConstraint : DisplayEnv -> ConstraintSolverState -> range -> OptionalTrace -> TraitConstraintInfo -> unit -val AddCxTypeMustSupportNull : DisplayEnv -> ConstraintSolverState -> range -> OptionalTrace -> TType -> unit +val AddCxTypeDefnNotSupportsNull : DisplayEnv -> ConstraintSolverState -> range -> OptionalTrace -> TType -> unit +val AddCxTypeDefnSupportsNull : DisplayEnv -> ConstraintSolverState -> range -> OptionalTrace -> TType -> unit +val AddCxTypeUseSupportsNull : DisplayEnv -> ConstraintSolverState -> range -> OptionalTrace -> TType -> unit val AddCxTypeMustSupportComparison : DisplayEnv -> ConstraintSolverState -> range -> OptionalTrace -> TType -> unit val AddCxTypeMustSupportEquality : DisplayEnv -> ConstraintSolverState -> range -> OptionalTrace -> TType -> unit val AddCxTypeMustSupportDefaultCtor : DisplayEnv -> ConstraintSolverState -> range -> OptionalTrace -> TType -> unit diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index 8b6b1318803..b95a0000636 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -310,6 +310,8 @@ csMethodFoundButIsStatic,"The type '%s' has a method '%s' (full name '%s'), but csMethodFoundButIsNotStatic,"The type '%s' has a method '%s' (full name '%s'), but the method is not static" 472,csStructConstraintInconsistent,"The constraints 'struct' and 'not struct' are inconsistent" csTypeDoesNotHaveNull,"The type '%s' does not have 'null' as a proper value" +csTypeHasNullAsTrueValue,"The type '%s' has 'null' as a true representation value but a constraint does not permit this" +csTypeHasNullAsExtraValue,"The type '%s' has 'null' as an extra value but a constraint does not permit this" csNullableTypeDoesNotHaveNull,"The type '%s' does not have 'null' as a proper value. To create a null value for a Nullable type use 'System.Nullable()'." csTypeDoesNotSupportComparison1,"The type '%s' does not support the 'comparison' constraint because it has the 'NoComparison' attribute" csTypeDoesNotSupportComparison2,"The type '%s' does not support the 'comparison' constraint. For example, it does not support the 'System.IComparable' interface" @@ -1449,4 +1451,5 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl 3243,tcTypeDoesNotHaveAnyNull,"The type '%s' does not support a nullness qualitification." #3244 reserved for ConstraintSolverNullnessWarningWithTypes #3245 reserved for ConstraintSolverNullnessWarningWithType -3246,tcNullnessCheckingNotEnabled,"The /checknulls language feature is not enabled" +#3246 reserved for ConstraintSolverNonNullnessWarningWithType +3247,tcNullnessCheckingNotEnabled,"The /checknulls language feature is not enabled" diff --git a/src/fsharp/FSStrings.resx b/src/fsharp/FSStrings.resx index 35dfaf07dba..ce1dc876b76 100644 --- a/src/fsharp/FSStrings.resx +++ b/src/fsharp/FSStrings.resx @@ -138,6 +138,9 @@ Nullness warning: The type '{0}' does not support nullness. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + The unit of measure '{0}' does not match the unit of measure '{1}' diff --git a/src/fsharp/FSharp.Core/async.fs b/src/fsharp/FSharp.Core/async.fs index 4fe2d48d6fc..72fdb735058 100644 --- a/src/fsharp/FSharp.Core/async.fs +++ b/src/fsharp/FSharp.Core/async.fs @@ -1759,7 +1759,7 @@ namespace Microsoft.FSharp.Control event.RemoveHandler handle if args.Cancelled then ccont (new OperationCanceledException()) - elif isNotNull args.Error then + elif isNonNull args.Error then econt args.Error else cont (result args) diff --git a/src/fsharp/FSharp.Core/mailbox.fs b/src/fsharp/FSharp.Core/mailbox.fs index f58a94b6f12..7eeedecc188 100644 --- a/src/fsharp/FSharp.Core/mailbox.fs +++ b/src/fsharp/FSharp.Core/mailbox.fs @@ -353,7 +353,7 @@ namespace Microsoft.FSharp.Control interface System.IDisposable with member __.Dispose() = - if isNotNull pulse then (pulse :> IDisposable).Dispose() + if isNonNull pulse then (pulse :> IDisposable).Dispose() #if DEBUG member x.UnsafeContents = diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index 2ee1d07d5cf..e224139e51c 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3336,27 +3336,27 @@ namespace Microsoft.FSharp.Core [] let inline isNullV (value : Nullable<'T>) = not value.HasValue - [] - let inline internal isNotNull (value : 'T) = + [] + let inline internal isNonNull (value : 'T) = match value with | null -> false | _ -> true - [] - let inline notNull (value : 'T when 'T : not struct and 'T : null) = - match value with + [] + let inline nonNull (value : 'T when 'T : not struct) = + match box value with | null -> raise (System.NullReferenceException()) | _ -> value - [] - let inline notNullV (value : Nullable<'T>) = + [] + let inline nonNullV (value : Nullable<'T>) = if value.HasValue then value.Value else raise (System.NullReferenceException()) [] - let inline withNull (value : 'T when 'T : not struct and 'T : null) = value + let inline withNull (value : 'T when 'T : not struct) = value [] let inline withNullV (value : 'T) : Nullable<'T> = Nullable<'T>(value) diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index 1a2db379696..a8a3502ee82 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -2256,8 +2256,8 @@ namespace Microsoft.FSharp.Core /// Determines whether the given value is not null. /// The value to check. /// True when value is not null, false otherwise. - [] - val inline internal isNotNull : value:'T -> bool when 'T : null + [] + val inline internal isNonNull : value:'T -> bool when 'T : null #if !BUILDING_WITH_LKG /// Get the null value for a value type. @@ -2268,20 +2268,20 @@ namespace Microsoft.FSharp.Core /// Asserts that the value is non-null. /// The value to check. /// True when value is null, false otherwise. - [] - val inline notNull : value: (('T)?) -> 'T when 'T : not struct + [] + val inline nonNull : value: (('T)?) -> 'T when 'T : not struct /// Asserts that the value is non-null. /// The value to check. /// True when value is null, false otherwise. - [] - val inline notNullV : value:Nullable<'T> -> 'T + [] + val inline nonNullV : value:Nullable<'T> -> 'T /// Asserts that the value is non-null. /// The value to check. /// True when value is null, false otherwise. [] - val inline withNull : value:'T -> (('T)?) when 'T : not struct and 'T : null + val inline withNull : value:'T -> (('T)?) when 'T : not struct /// Asserts that the value is non-null. /// The value to check. diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs index ac1e4cc99a1..46674b9cdd9 100755 --- a/src/fsharp/NicePrint.fs +++ b/src/fsharp/NicePrint.fs @@ -830,6 +830,8 @@ module private PrintTypes = [layoutTypeAppWithInfoAndPrec denv env (WordL.keywordDelegate) 2 true [aty;bty] |> longConstraintPrefix] | TyparConstraint.SupportsNull _ -> [wordL (tagKeyword "null") |> longConstraintPrefix] + | TyparConstraint.NotSupportsNull _ -> + [(wordL (tagKeyword "not") ^^ wordL(tagKeyword "null")) |> longConstraintPrefix] | TyparConstraint.IsNonNullableStruct _ -> if denv.shortConstraints then [wordL (tagText "value type")] diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index 8d12797991b..2425f3cdcda 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -363,6 +363,7 @@ and CheckTypeConstraintDeep f g env x = | TyparConstraint.SupportsComparison _ | TyparConstraint.SupportsEquality _ | TyparConstraint.SupportsNull _ + | TyparConstraint.NotSupportsNull _ | TyparConstraint.IsNonNullableStruct _ | TyparConstraint.IsUnmanaged _ | TyparConstraint.IsReferenceType _ diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index e4753cd8e75..bde865ac4d7 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -160,38 +160,6 @@ let mkTyparInst (typars: Typars) tyargs = let generalizeTypar tp = mkTyparTy tp let generalizeTypars tps = List.map generalizeTypar tps -let combineNullness (nullnessOrig: Nullness) (nullnessNew: Nullness) = - match nullnessOrig.Evaluate() with - | NullnessInfo.WithoutNull -> nullnessNew - | NullnessInfo.ObliviousToNull -> nullnessOrig - | NullnessInfo.WithNull -> - match nullnessNew.Evaluate() with - | NullnessInfo.WithoutNull -> nullnessOrig // TODO - ? - | NullnessInfo.ObliviousToNull -> nullnessNew - | NullnessInfo.WithNull -> nullnessNew - -let tryAddNullnessToTy nullnessNew (ty:TType) = - let ty = stripTyparEqns ty - match ty with - | TType_var (tp, nullnessOrig) -> - // TODO: make this avoid allocation if no change - Some (TType_var (tp, combineNullness nullnessOrig nullnessNew)) - | TType_app (tcr, tinst, nullnessOrig) -> - // TODO: make this avoid allocation if no change - Some (TType_app (tcr, tinst, combineNullness nullnessOrig nullnessNew)) - | TType_ucase _ -> None // TODO - | TType_tuple _ -> None // TODO - | TType_fun (d, r, nullnessOrig) -> - // TODO: make this avoid allocation if no change - Some (TType_fun (d, r, combineNullness nullnessOrig nullnessNew)) - | TType_forall _ -> None - | TType_measure _ -> None - -let addNullnessToTy nullness (ty:TType) = - match tryAddNullnessToTy nullness ty with - | None -> ty - | Some ty -> ty - let rec remapTypeAux (tyenv : Remap) (ty:TType) = let ty = stripTyparEqns ty match ty with @@ -279,6 +247,7 @@ and remapTyparConstraintsAux tyenv cs = | TyparConstraint.SupportsComparison _ | TyparConstraint.SupportsEquality _ | TyparConstraint.SupportsNull _ + | TyparConstraint.NotSupportsNull _ | TyparConstraint.IsUnmanaged _ | TyparConstraint.IsNonNullableStruct _ | TyparConstraint.IsReferenceType _ @@ -739,7 +708,7 @@ let reduceTyconRefMeasureableOrProvided (g:TcGlobals) (tcref:TyconRef) tyargs = reduceTyconMeasureableOrProvided g tcref.Deref tyargs let rec stripTyEqnsA g canShortcut ty = - let ty = stripTyparEqnsAux canShortcut ty + let ty = stripTyparEqnsAux KnownWithoutNull canShortcut ty match ty with | TType_app (tcref, tinst, nullness) -> let tycon = tcref.Deref @@ -856,14 +825,14 @@ let (|RefTupleTy|_|) g ty = ty |> stripTyEqns g |> (function TType_tuple(tupInfo let (|FunTy|_|) g ty = ty |> stripTyEqns g |> (function TType_fun(dty, rty, _nullness) -> Some (dty, rty) | _ -> None) let tryNiceEntityRefOfTy ty = - let ty = stripTyparEqnsAux false ty + let ty = stripTyparEqnsAux KnownWithoutNull false ty match ty with | TType_app (tcref, _, _) -> ValueSome tcref | TType_measure (Measure.Con tcref) -> ValueSome tcref | _ -> ValueNone let tryNiceEntityRefOfTyOption ty = - let ty = stripTyparEqnsAux false ty + let ty = stripTyparEqnsAux KnownWithoutNull false ty match ty with | TType_app (tcref, _, _) -> Some tcref | TType_measure (Measure.Con tcref) -> Some tcref @@ -968,6 +937,7 @@ and typarConstraintsAEquivAux erasureFlag g aenv tpc1 tpc2 = | TyparConstraint.SupportsComparison _ , TyparConstraint.SupportsComparison _ | TyparConstraint.SupportsEquality _ , TyparConstraint.SupportsEquality _ | TyparConstraint.SupportsNull _ , TyparConstraint.SupportsNull _ + | TyparConstraint.NotSupportsNull _ , TyparConstraint.NotSupportsNull _ | TyparConstraint.IsNonNullableStruct _ , TyparConstraint.IsNonNullableStruct _ | TyparConstraint.IsReferenceType _ , TyparConstraint.IsReferenceType _ | TyparConstraint.IsUnmanaged _ , TyparConstraint.IsUnmanaged _ @@ -2048,6 +2018,7 @@ and accFreeInTyparConstraint opts tpc acc = | TyparConstraint.SupportsComparison _ | TyparConstraint.SupportsEquality _ | TyparConstraint.SupportsNull _ + | TyparConstraint.NotSupportsNull _ | TyparConstraint.IsNonNullableStruct _ | TyparConstraint.IsReferenceType _ | TyparConstraint.IsUnmanaged _ @@ -2161,6 +2132,7 @@ and accFreeInTyparConstraintLeftToRight g cxFlag thruFlag acc tpc = | TyparConstraint.SupportsComparison _ | TyparConstraint.SupportsEquality _ | TyparConstraint.SupportsNull _ + | TyparConstraint.NotSupportsNull _ | TyparConstraint.IsNonNullableStruct _ | TyparConstraint.IsUnmanaged _ | TyparConstraint.IsReferenceType _ @@ -3384,6 +3356,8 @@ module DebugPrint = begin wordL (tagText "struct") |> constraintPrefix | TyparConstraint.IsReferenceType _ -> wordL (tagText "not struct") |> constraintPrefix + | TyparConstraint.NotSupportsNull _ -> + wordL (tagText "not null") |> constraintPrefix | TyparConstraint.IsUnmanaged _ -> wordL (tagText "unmanaged") |> constraintPrefix | TyparConstraint.SimpleChoice(tys, _) -> @@ -6506,7 +6480,6 @@ let mkCallArray4DSet (g:TcGlobals) m ty e1 idx1 idx2 idx3 idx4 v = mkApps g (typ let mkCallHash (g:TcGlobals) m ty e1 = mkApps g (typedExprForIntrinsic g m g.hash_info, [[ty]], [ e1 ], m) let mkCallBox (g:TcGlobals) m ty e1 = mkApps g (typedExprForIntrinsic g m g.box_info, [[ty]], [ e1 ], m) let mkCallIsNull (g:TcGlobals) m ty e1 = mkApps g (typedExprForIntrinsic g m g.isnull_info, [[ty]], [ e1 ], m) -let mkCallIsNotNull (g:TcGlobals) m ty e1 = mkApps g (typedExprForIntrinsic g m g.isnotnull_info, [[ty]], [ e1 ], m) let mkCallRaise (g:TcGlobals) m ty e1 = mkApps g (typedExprForIntrinsic g m g.raise_info, [[ty]], [ e1 ], m) let mkCallNewDecimal (g:TcGlobals) m (e1, e2, e3, e4, e5) = mkApps g (typedExprForIntrinsic g m g.new_decimal_info, [], [ e1;e2;e3;e4;e5 ], m) diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index dffd1c814d3..2416eb244e1 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -76,10 +76,9 @@ val stripExpr : Expr -> Expr val valsOfBinds : Bindings -> Vals val (|ExprValWithPossibleTypeInst|_|) : Expr -> (ValRef * ValUseFlag * TType list * range) option -val combineNullness: Nullness -> Nullness -> Nullness -/// Ensure that a type admits nullness -val tryAddNullnessToTy: Nullness -> TType -> TType option -val addNullnessToTy: Nullness -> TType -> TType +//val combineNullness: Nullness -> Nullness -> Nullness +//val tryAddNullnessToTy: Nullness -> TType -> TType option +//val addNullnessToTy: Nullness -> TType -> TType //------------------------------------------------------------------------- // Build decision trees imperatively @@ -1135,6 +1134,7 @@ val ModuleNameIsMangled : TcGlobals -> Attribs -> bool val CompileAsEvent : TcGlobals -> Attribs -> bool +val TypeNullIsTrueValue : TcGlobals -> TType -> bool val TypeNullIsExtraValueNew : TcGlobals -> range -> TType -> bool val TypeNullIsExtraValueOld : TcGlobals -> range -> TType -> bool val TyconRefNullIsExtraValueOld : TcGlobals -> range -> TyconRef -> bool @@ -1287,7 +1287,6 @@ val mkCallArray4DSet : TcGlobals -> range -> TType -> Expr -> Expr -> Ex val mkCallHash : TcGlobals -> range -> TType -> Expr -> Expr val mkCallBox : TcGlobals -> range -> TType -> Expr -> Expr val mkCallIsNull : TcGlobals -> range -> TType -> Expr -> Expr -val mkCallIsNotNull : TcGlobals -> range -> TType -> Expr -> Expr val mkCallRaise : TcGlobals -> range -> TType -> Expr -> Expr val mkCallGenericComparisonWithComparerOuter : TcGlobals -> range -> TType -> Expr -> Expr -> Expr -> Expr diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index ce2537f3fdb..67a45235efa 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -1453,6 +1453,7 @@ let p_tyar_constraint x st = | TyparConstraint.SupportsComparison _ -> p_byte 10 st | TyparConstraint.SupportsEquality _ -> p_byte 11 st | TyparConstraint.IsUnmanaged _ -> p_byte 12 st + | TyparConstraint.NotSupportsNull _ -> p_byte 13 st let p_tyar_constraints = (p_list p_tyar_constraint) let u_tyar_constraint st = @@ -1471,6 +1472,7 @@ let u_tyar_constraint st = | 10 -> (fun _ -> TyparConstraint.SupportsComparison range0) | 11 -> (fun _ -> TyparConstraint.SupportsEquality range0) | 12 -> (fun _ -> TyparConstraint.IsUnmanaged range0) + | 13 -> (fun _ -> TyparConstraint.NotSupportsNull range0) | _ -> ufailwith st "u_tyar_constraint" diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 48aa9fc043a..a9b621f032a 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -660,7 +660,6 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let v_hash_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "hash" , None , Some "Hash" , [vara], ([[varaTy]], v_int_ty)) let v_box_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "box" , None , Some "Box" , [vara], ([[varaTy]], v_obj_ty)) let v_isnull_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "isNull" , None , Some "IsNull" , [vara], ([[varaTy]], v_bool_ty)) - let v_isnotnull_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "isNotNull" , None , Some "IsNotNull" , [vara], ([[varaTy]], v_bool_ty)) let v_raise_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "raise" , None , Some "Raise" , [vara], ([[mkSysNonGenericTy sys "Exception"]], varaTy)) let v_failwith_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "failwith" , None , Some "FailWith" , [vara], ([[v_string_ty]], varaTy)) let v_invalid_arg_info = makeIntrinsicValRef(fslib_MFOperators_nleref, "invalidArg" , None , Some "InvalidArg" , [vara], ([[v_string_ty]; [v_string_ty]], varaTy)) @@ -1350,7 +1349,6 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d member __.hash_info = v_hash_info member __.box_info = v_box_info member __.isnull_info = v_isnull_info - member __.isnotnull_info = v_isnotnull_info member __.raise_info = v_raise_info member __.failwith_info = v_failwith_info member __.invalid_arg_info = v_invalid_arg_info diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index fc39b19e4b1..0968fc0bb5e 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -4233,7 +4233,9 @@ let rec TcTyparConstraint ridx cenv newOk checkCxs occ (env: TcEnv) tpenv c = AddCxTypeMustSubsumeType ContextInfo.NoContext env.DisplayEnv cenv.css m NoTrace ty' (mkTyparTy tp') tpenv - | WhereTyparSupportsNull(tp, m) -> checkSimpleConstraint tp m AddCxTypeMustSupportNull + | WhereTyparSupportsNull(tp, m) -> checkSimpleConstraint tp m AddCxTypeDefnSupportsNull + + | WhereTyparNotSupportsNull(tp, m) -> checkSimpleConstraint tp m AddCxTypeDefnNotSupportsNull | WhereTyparIsComparable(tp, m) -> checkSimpleConstraint tp m AddCxTypeMustSupportComparison @@ -4660,16 +4662,22 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped if TypeNullNever g innerTyC then let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString), m)) + // TODO - doesn't feel right - it will add KnownNotNull + KnownWithNull --> KnownWithNull, e.g. // let f (x: string) = (x = null) match tryAddNullnessToTy KnownWithNull innerTyC with + | None -> let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC errorR(Error(FSComp.SR.tcTypeDoesNotHaveAnyNull(tyString), m)) innerTyC, tpenv + | Some innerTyCWithNull -> - AddCxTypeMustSupportNull env.DisplayEnv cenv.css m NoTrace innerTyCWithNull + // The inner type is not allowed to support null or use null as a representation value + AddCxTypeDefnNotSupportsNull env.DisplayEnv cenv.css m NoTrace innerTyC + innerTyCWithNull, tpenv + else warning(Error(FSComp.SR.tcNullnessCheckingNotEnabled(), m)) innerTyC, tpenv @@ -5486,12 +5494,13 @@ and TcPat warnOnUpper cenv env topValInfo vFlags (tpenv, names, takenNames) ty p (fun _ -> TPat_range(c1, c2, m)), (tpenv, names, takenNames) | SynPat.Null m -> - AddCxTypeMustSupportNull env.DisplayEnv cenv.css m NoTrace ty + AddCxTypeDefnSupportsNull env.DisplayEnv cenv.css m NoTrace ty (fun _ -> TPat_null m), (tpenv, names, takenNames) | SynPat.InstanceMember (_, _, _, _, m) -> errorR(Error(FSComp.SR.tcIllegalPattern(), pat.Range)) (fun _ -> TPat_wild m), (tpenv, names, takenNames) + | SynPat.FromParseError (pat, _) -> suppressErrorReporting (fun () -> TcPatAndRecover warnOnUpper cenv env topValInfo vFlags (tpenv, names, takenNames) (NewErrorType()) pat) @@ -5811,7 +5820,7 @@ and TcExprUndelayed cenv overallTy env tpenv (synExpr: SynExpr) = expr, tpenv | SynExpr.Null m -> - AddCxTypeMustSupportNull env.DisplayEnv cenv.css m NoTrace overallTy + AddCxTypeDefnSupportsNull env.DisplayEnv cenv.css m NoTrace overallTy mkNull m overallTy, tpenv | SynExpr.Lazy (synInnerExpr, m) -> diff --git a/src/fsharp/TypeRelations.fs b/src/fsharp/TypeRelations.fs index 5f4634b8dad..e2e257e225c 100755 --- a/src/fsharp/TypeRelations.fs +++ b/src/fsharp/TypeRelations.fs @@ -147,7 +147,9 @@ let ChooseTyparSolutionAndRange (g: TcGlobals) amap (tp:Typar) = errorR(Error(FSComp.SR.typrelCannotResolveAmbiguityInPrintf(),m)) maxSoFar,m | TyparConstraint.SupportsNull m -> - maxSoFar,m + addNullnessToTy KnownWithNull maxSoFar,m + | TyparConstraint.NotSupportsNull m -> + maxSoFar,m // TODO: this doesn't force non-nullness | TyparConstraint.SupportsComparison m -> join m g.mk_IComparable_ty,m | TyparConstraint.SupportsEquality m -> diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs index 2f454d08034..f1fd4ab461c 100644 --- a/src/fsharp/ast.fs +++ b/src/fsharp/ast.fs @@ -394,6 +394,8 @@ and | WhereTyparIsUnmanaged of genericName:SynTypar * range:range /// F# syntax is 'typar : null | WhereTyparSupportsNull of genericName:SynTypar * range:range + /// F# syntax is 'typar : null + | WhereTyparNotSupportsNull of genericName:SynTypar * range:range /// F# syntax is 'typar : comparison | WhereTyparIsComparable of genericName:SynTypar * range:range /// F# syntax is 'typar : equality diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs index 4a228d00a78..10698ab964c 100755 --- a/src/fsharp/infos.fs +++ b/src/fsharp/infos.fs @@ -211,6 +211,7 @@ let private FoldHierarchyOfTypeAux followInterfaces allowMultiIntfInst skipUnref | TyparConstraint.IsEnum _ | TyparConstraint.IsDelegate _ | TyparConstraint.SupportsNull _ + | TyparConstraint.NotSupportsNull _ | TyparConstraint.IsNonNullableStruct _ | TyparConstraint.IsUnmanaged _ | TyparConstraint.IsReferenceType _ @@ -326,6 +327,8 @@ let CopyTyparConstraints m tprefInst (tporig:Typar) = TyparConstraint.IsEnum (instType tprefInst uty,m) | TyparConstraint.SupportsComparison _ -> TyparConstraint.SupportsComparison m + | TyparConstraint.NotSupportsNull _ -> + TyparConstraint.NotSupportsNull m | TyparConstraint.SupportsEquality _ -> TyparConstraint.SupportsEquality m | TyparConstraint.IsDelegate(aty, bty,_) -> diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy index 8b628abdc7f..9923363da0b 100644 --- a/src/fsharp/pars.fsy +++ b/src/fsharp/pars.fsy @@ -2188,6 +2188,10 @@ typeConstraint: | typar COLON NULL { WhereTyparSupportsNull($1,lhs parseState) } + | typar COLON IDENT NULL + { if $3 <> "not" then reportParseErrorAt (rhs parseState 3) (FSComp.SR.parsUnexpectedIdentifier($3)) + WhereTyparNotSupportsNull($1,lhs parseState) } + | typar COLON LPAREN classMemberSpfn rparen { let tp = $1 WhereTyparSupportsMember([ SynType.Var(tp, tp.Range) ],$4,lhs parseState) } diff --git a/src/fsharp/service/ServiceAssemblyContent.fs b/src/fsharp/service/ServiceAssemblyContent.fs index 673fe03e060..a8de2304978 100644 --- a/src/fsharp/service/ServiceAssemblyContent.fs +++ b/src/fsharp/service/ServiceAssemblyContent.fs @@ -541,11 +541,13 @@ module ParsedInput = List.iter walkAttribute attrs walkTypar typar - and walkTypeConstraint = function + and walkTypeConstraint cx = + match cx with | SynTypeConstraint.WhereTyparIsValueType (t, _) | SynTypeConstraint.WhereTyparIsReferenceType (t, _) | SynTypeConstraint.WhereTyparIsUnmanaged (t, _) | SynTypeConstraint.WhereTyparSupportsNull (t, _) + | SynTypeConstraint.WhereTyparNotSupportsNull (t, _) | SynTypeConstraint.WhereTyparIsComparable (t, _) | SynTypeConstraint.WhereTyparIsEquatable (t, _) -> walkTypar t | SynTypeConstraint.WhereTyparDefaultsToType (t, ty, _) @@ -554,7 +556,8 @@ module ParsedInput = | SynTypeConstraint.WhereTyparIsDelegate (t, ts, _) -> walkTypar t; List.iter walkType ts | SynTypeConstraint.WhereTyparSupportsMember (ts, sign, _) -> List.iter walkType ts; walkMemberSig sign - and walkPat = function + and walkPat pat = + match pat with | SynPat.Tuple (pats, _) | SynPat.ArrayOrList (_, pats, _) | SynPat.Ands (pats, _) -> List.iter walkPat pats @@ -590,11 +593,13 @@ module ParsedInput = and walkInterfaceImpl (InterfaceImpl(_, bindings, _)) = List.iter walkBinding bindings - and walkIndexerArg = function + and walkIndexerArg arg = + match arg with | SynIndexerArg.One e -> walkExpr e | SynIndexerArg.Two (e1, e2) -> List.iter walkExpr [e1; e2] - and walkType = function + and walkType ty = + match ty with | SynType.Array (_, t, _) | SynType.HashConstraint (t, _) | SynType.MeasurePower (t, _, _) -> walkType t @@ -613,13 +618,15 @@ module ParsedInput = walkExpr e2 e1 |> Option.iter walkExpr - and walkSimplePats = function + and walkSimplePats spats = + match spats with | SynSimplePats.SimplePats (pats, _) -> List.iter walkSimplePat pats | SynSimplePats.Typed (pats, ty, _) -> walkSimplePats pats walkType ty - and walkExpr = function + and walkExpr expr = + match expr with | SynExpr.Paren (e, _, _, _) | SynExpr.Quote (_, _, e, _, _) | SynExpr.Typed (e, _, _) @@ -715,7 +722,8 @@ module ParsedInput = | SynExpr.Const (SynConst.Measure(_, m), _) -> walkMeasure m | _ -> () - and walkMeasure = function + and walkMeasure synMeasure = + match synMeasure with | SynMeasure.Product (m1, m2, _) | SynMeasure.Divide (m1, m2, _) -> walkMeasure m1; walkMeasure m2 | SynMeasure.Named (longIdent, _) -> addLongIdent longIdent @@ -725,7 +733,8 @@ module ParsedInput = | SynMeasure.One | SynMeasure.Anon _ -> () - and walkSimplePat = function + and walkSimplePat spat = + match spat with | SynSimplePat.Attrib (pat, attrs, _) -> walkSimplePat pat List.iter walkAttribute attrs diff --git a/src/fsharp/service/ServiceUntypedParse.fs b/src/fsharp/service/ServiceUntypedParse.fs index e60364e4ddf..66cbd8ad933 100755 --- a/src/fsharp/service/ServiceUntypedParse.fs +++ b/src/fsharp/service/ServiceUntypedParse.fs @@ -734,6 +734,7 @@ module UntypedParseImpl = | SynTypeConstraint.WhereTyparIsReferenceType(t, _) -> walkTypar t | SynTypeConstraint.WhereTyparIsUnmanaged(t, _) -> walkTypar t | SynTypeConstraint.WhereTyparSupportsNull (t, _) -> walkTypar t + | SynTypeConstraint.WhereTyparNotSupportsNull (t, _) -> walkTypar t | SynTypeConstraint.WhereTyparIsComparable(t, _) -> walkTypar t | SynTypeConstraint.WhereTyparIsEquatable(t, _) -> walkTypar t | SynTypeConstraint.WhereTyparSubtypeOfType(t, ty, _) -> walkTypar t |> Option.orElse (walkType ty) diff --git a/src/fsharp/symbols/Symbols.fs b/src/fsharp/symbols/Symbols.fs index 85bce7d69bf..dc49a76f6b8 100644 --- a/src/fsharp/symbols/Symbols.fs +++ b/src/fsharp/symbols/Symbols.fs @@ -1265,6 +1265,11 @@ and FSharpGenericParameterConstraint(cenv, cx: TyparConstraint) = | TyparConstraint.SupportsComparison _ -> true | _ -> false + member __.IsNotSupportsNullConstraint = + match cx with + | TyparConstraint.NotSupportsNull _ -> true + | _ -> false + member __.IsEqualityConstraint = match cx with | TyparConstraint.SupportsEquality _ -> true diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 1bd3c8383eb..0b1decf256e 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -2314,6 +2314,9 @@ and /// Indicates a constraint that a type has a 'null' value | SupportsNull of range + /// Indicates a constraint that a type doesn't support nullness + | NotSupportsNull of range + /// Indicates a constraint that a type has a member with the given signature | MayResolveMember of TraitConstraintInfo * range @@ -3910,6 +3913,11 @@ and Nullness = | Known info -> info | Variable v -> v.Evaluate() + //member n.TryEvaluate() = + // match n with + // | Known info -> Some info + // | Variable v -> v.TryEvaluate() + override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.ObliviousToNull -> "%" // Note, nullness variables are only created if the nullness checking feature is on @@ -3921,6 +3929,11 @@ and NullnessVar() = | None -> NullnessInfo.WithoutNull | Some soln -> soln.Evaluate() + //member nv.TryEvaluate() = + // match solution with + // | None -> None + // | Some soln -> soln.TryEvaluate() + member nv.IsSolved = solution.IsSome member nv.Set(nullness) = @@ -3938,10 +3951,13 @@ and NullnessVar() = and [] NullnessInfo = + /// we know that there is an extra null value in the type | WithNull + /// we know that there is no extra null value in the type | WithoutNull + /// we know we don't care | ObliviousToNull @@ -5340,9 +5356,45 @@ let rec stripUnitEqnsAux canShortcut unt = | Measure.Var r when r.IsSolved -> stripUnitEqnsAux canShortcut (tryShortcutSolvedUnitPar canShortcut r) | _ -> unt -let rec stripTyparEqnsAux canShortcut ty = +let combineNullness (nullnessOrig: Nullness) (nullnessNew: Nullness) = + match nullnessOrig.Evaluate() with + | NullnessInfo.WithoutNull -> nullnessNew + | NullnessInfo.ObliviousToNull -> nullnessOrig + | NullnessInfo.WithNull -> + match nullnessNew.Evaluate() with + | NullnessInfo.WithoutNull -> nullnessOrig + | NullnessInfo.ObliviousToNull -> nullnessNew + | NullnessInfo.WithNull -> nullnessOrig + +let tryAddNullnessToTy nullnessNew (ty:TType) = + match ty with + | TType_var (tp, nullnessOrig) -> + // TODO: make this avoid allocation if no change + Some (TType_var (tp, combineNullness nullnessOrig nullnessNew)) + | TType_app (tcr, tinst, nullnessOrig) -> + // TODO: make this avoid allocation if no change + Some (TType_app (tcr, tinst, combineNullness nullnessOrig nullnessNew)) + | TType_ucase _ -> None // TODO + | TType_tuple _ -> None // TODO + | TType_fun (d, r, nullnessOrig) -> + // TODO: make this avoid allocation if no change + Some (TType_fun (d, r, combineNullness nullnessOrig nullnessNew)) + | TType_forall _ -> None + | TType_measure _ -> None + +let addNullnessToTy (nullness: Nullness) (ty:TType) = + match nullness.Evaluate() with + | NullnessInfo.WithoutNull -> ty + | _ -> + match ty with + | TType_var (tp, nullnessOrig) -> TType_var (tp, combineNullness nullnessOrig nullness) + | TType_app (tcr, tinst, nullnessOrig) -> TType_app (tcr, tinst, combineNullness nullnessOrig nullness) + | TType_fun (d, r, nullnessOrig) -> TType_fun (d, r, combineNullness nullnessOrig nullness) + | _ -> ty + +let rec stripTyparEqnsAux nullness0 canShortcut ty = match ty with - | TType_var (r, _nullness) -> + | TType_var (r, nullness) -> match r.Solution with | Some soln -> if canShortcut then @@ -5351,20 +5403,23 @@ let rec stripTyparEqnsAux canShortcut ty = // This is only because IterType likes to walk _all_ the constraints _everywhere_ in a type, including // those attached to _solved_ type variables. In an ideal world this would never be needed - see the notes // on IterType. - | TType_var (r2, _) when r2.Constraints.IsEmpty -> - match r2.Solution with - | None -> () - | Some _ as soln2 -> - r.typar_solution <- soln2 + | TType_var (r2, nullness2) when r2.Constraints.IsEmpty -> + match nullness2.Evaluate() with + | NullnessInfo.WithoutNull -> + match r2.Solution with + | None -> () + | Some _ as soln2 -> + r.typar_solution <- soln2 + | _ -> () | _ -> () - stripTyparEqnsAux canShortcut soln + stripTyparEqnsAux (combineNullness nullness0 nullness) canShortcut soln | None -> - ty + addNullnessToTy nullness0 ty | TType_measure unt -> TType_measure (stripUnitEqnsAux canShortcut unt) | _ -> ty -let stripTyparEqns ty = stripTyparEqnsAux false ty +let stripTyparEqns ty = stripTyparEqnsAux KnownWithoutNull false ty let stripUnitEqns unt = stripUnitEqnsAux false unt //--------------------------------------------------------------------------- diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index 7bc5daa817e..87f14d3e1d8 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index 413bebec877..1d32b9d4b45 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.en.xlf b/src/fsharp/xlf/FSComp.txt.en.xlf index aa330d47d51..06b8aa0f18b 100644 --- a/src/fsharp/xlf/FSComp.txt.en.xlf +++ b/src/fsharp/xlf/FSComp.txt.en.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index 709b09e6e79..617713e0c46 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index b3bf07200e2..6e1d43bc005 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 4022aefa888..d962de01ec5 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index f71b7eae4ca..6bc1e0425d3 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index a262935fa82..893a6556dfd 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index 5ebf1bb6ee3..278c806a150 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 6c9d46daefb..192188f6364 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index d3a062b568a..25e11631233 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index 526c87bd429..d25c026c323 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index ce1cc77b9b7..a5c9b606ec7 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index 05827121697..f25d4c7b6b5 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -7102,6 +7102,16 @@ Specify the language version + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.cs.xlf b/src/fsharp/xlf/FSStrings.cs.xlf index ec3cdbeb1e9..bb9aa749572 100644 --- a/src/fsharp/xlf/FSStrings.cs.xlf +++ b/src/fsharp/xlf/FSStrings.cs.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.de.xlf b/src/fsharp/xlf/FSStrings.de.xlf index 617c2217ced..e3885056d99 100644 --- a/src/fsharp/xlf/FSStrings.de.xlf +++ b/src/fsharp/xlf/FSStrings.de.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.en.xlf b/src/fsharp/xlf/FSStrings.en.xlf index 8b1cd327214..2eeb5fb5586 100644 --- a/src/fsharp/xlf/FSStrings.en.xlf +++ b/src/fsharp/xlf/FSStrings.en.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.es.xlf b/src/fsharp/xlf/FSStrings.es.xlf index 8bd360c324b..61f8ac82606 100644 --- a/src/fsharp/xlf/FSStrings.es.xlf +++ b/src/fsharp/xlf/FSStrings.es.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.fr.xlf b/src/fsharp/xlf/FSStrings.fr.xlf index 79db1b5097c..8755c6a4eab 100644 --- a/src/fsharp/xlf/FSStrings.fr.xlf +++ b/src/fsharp/xlf/FSStrings.fr.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.it.xlf b/src/fsharp/xlf/FSStrings.it.xlf index 0c72898fe77..a9f66e28514 100644 --- a/src/fsharp/xlf/FSStrings.it.xlf +++ b/src/fsharp/xlf/FSStrings.it.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ja.xlf b/src/fsharp/xlf/FSStrings.ja.xlf index 00b557e3ee9..8c59639a7c2 100644 --- a/src/fsharp/xlf/FSStrings.ja.xlf +++ b/src/fsharp/xlf/FSStrings.ja.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ko.xlf b/src/fsharp/xlf/FSStrings.ko.xlf index 6786ae0cad6..463e2861a68 100644 --- a/src/fsharp/xlf/FSStrings.ko.xlf +++ b/src/fsharp/xlf/FSStrings.ko.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.pl.xlf b/src/fsharp/xlf/FSStrings.pl.xlf index 0a47fba5e08..9003ca4ba9a 100644 --- a/src/fsharp/xlf/FSStrings.pl.xlf +++ b/src/fsharp/xlf/FSStrings.pl.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.pt-BR.xlf b/src/fsharp/xlf/FSStrings.pt-BR.xlf index c59e5c7cec7..9eecb46d5b2 100644 --- a/src/fsharp/xlf/FSStrings.pt-BR.xlf +++ b/src/fsharp/xlf/FSStrings.pt-BR.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.ru.xlf b/src/fsharp/xlf/FSStrings.ru.xlf index 2128ca740be..6f7f41c20bd 100644 --- a/src/fsharp/xlf/FSStrings.ru.xlf +++ b/src/fsharp/xlf/FSStrings.ru.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.tr.xlf b/src/fsharp/xlf/FSStrings.tr.xlf index 6f653757b69..d2df5b6301a 100644 --- a/src/fsharp/xlf/FSStrings.tr.xlf +++ b/src/fsharp/xlf/FSStrings.tr.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.zh-Hans.xlf b/src/fsharp/xlf/FSStrings.zh-Hans.xlf index e9b6edd772f..fbf2fb6dfb2 100644 --- a/src/fsharp/xlf/FSStrings.zh-Hans.xlf +++ b/src/fsharp/xlf/FSStrings.zh-Hans.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSStrings.zh-Hant.xlf b/src/fsharp/xlf/FSStrings.zh-Hant.xlf index c67de7a197d..c5beeffc0f7 100644 --- a/src/fsharp/xlf/FSStrings.zh-Hant.xlf +++ b/src/fsharp/xlf/FSStrings.zh-Hant.xlf @@ -1632,6 +1632,11 @@ Nullness warning: The types '{0}' and '{1}' do not have equivalent nullability '{2}' and '{3}'. + + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + Nullness warning: The type '{0}' supports a null value but a constraint requires the type to be non-null. + + \ No newline at end of file diff --git a/tests/fsharp/core/nullness/test.fsx b/tests/fsharp/core/nullness/test.fsx new file mode 100644 index 00000000000..8d6424dd9ad --- /dev/null +++ b/tests/fsharp/core/nullness/test.fsx @@ -0,0 +1,192 @@ +module M + +open System +open System.Runtime.CompilerServices + +//let f<'T when 'T : not struct> (x: 'T?) = 1 + +module Basics = + let x1 : string = null // Expected to give a nullability warning + let x2 : string? = null // Should not give a nullability warning + let x3 : string? = "a" // Should not give a nullability warning + let x4 : string = "" // Should not give a nullability warning + + let x5 = nonNull "" // Should not give a nullability warning + let x6 = nonNull< string? > "" // QUESTION: should this give a nullability warning due to (T?)? Should there be a non-null constraint? + let x7 = nonNull "" + let x8 = nonNull Array.empty + let x9 = nonNull [| "" |] + let x10 = nonNullV (Nullable(3)) + let x11 = nonNullV (Nullable()) + let x12 = nullV + let x13 = nullV + let x14 = withNullV 6L + let x15 : string? = withNull x4 + let x16 : Nullable = withNullV 3 + + let y0 = isNull null // QUESTION: gives a nullability warning due to 'obj' being the default. This seems ok + let y1 = isNull (null: obj?) // Should not give a nullability warning + let y2 = isNull "" // Should not give a nullability warning + let y9 = isNull "" // Should not give a nullability warning + let y10 = isNull< string? > "" // QUESTION: should this give a nullability warning due to (T?)? Should there be a non-null constraint? + +module NotNullConstraint = + let f3 (x: 'T when 'T : not null) = 1 + f3 1 // Should not give an error + f3 "a" // Should not give an error + f3 (null: obj?) // Expect to give a warning + f3 (null: string?) // Expect to give a warning +#if NEGATIVE + f3 (Some 1) // Expect to give an error +#endif + +module Basics2 = + let f1 () = null + // val f : unit -> 'a when 'a : null + + let f2 () : string? = null + // val f : unit -> string? + + let f3 () : 'T? = null + + let f4 () : 'T? when 'T : not struct = null + + let f5 () : 'T when 'T : not struct and 'T : null = null + + let f6 () : 'T? when 'T : not struct and 'T : null = null + + // Note yet allowed + //let f7 () : 'T? when 'T : struct = null + let f7b () : Nullable<'T> = nullV // BUG: Incorrectly gives a warning about System.ValueType with /test:AssumeNullOnImport + + let f8 () : string = null // Expected to give a nullability warning + +type C(s: string) = + member __.Value = s + +module InteropBasics = + let s0 = String.Concat("","") // Expected to infer string? with /test:AssumeNullOnImport + let s1 : string = String.Concat("","") // Expected to gives a warning with /test:AssumeNullOnImport + let test1() = String.Concat("","") + let test2(s1:string, s2: string) = String.Concat(s1,s2) + let test3() = String( [| 'a' |] ) + let test4() = System.AppDomain.CurrentDomain + let test5 : System.AppDomain = System.AppDomain.CurrentDomain // Expected to gives a warning with /test:AssumeNullOnImport + +type KonsoleWithNulls = + static member WriteLine(s: string?) = Console.WriteLine(s) + static member WriteLine(fmt: string?, arg1: string?) = Console.WriteLine(fmt, arg1) + static member WriteLine(fmt: string?, [] args: obj?[]?) = Console.WriteLine(fmt, args) + static member WriteLineC(s: C?) = Console.WriteLine(s.Value) + static member WriteLineC(fmt: C?, arg1: C?) = Console.WriteLine(fmt.Value, arg1.Value) + +module KonsoleWithNullsModule = + let WriteLine(s: string?) = Console.WriteLine(s) + let WriteLine2(fmt: string?, arg1: string?) = Console.WriteLine(fmt, arg1) + let WriteLineC(s: C?) = Console.WriteLine(s.Value) + let WriteLineC2(fmt: C?, arg1: C?) = Console.WriteLine(fmt.Value, arg1.Value) + +module KonsoleWithNullsModule2 = + let WriteLine x = KonsoleWithNullsModule.WriteLine x + let WriteLine2 (fmt, arg1) = KonsoleWithNullsModule.WriteLine2(fmt, arg1) + let WriteLineC(s) = KonsoleWithNullsModule.WriteLineC(s) + let WriteLineC2(fmt, arg1) = KonsoleWithNullsModule.WriteLineC2(fmt, arg1) + +type KonsoleNoNulls = + static member WriteLine(s: string) = Console.WriteLine(s) + static member WriteLine(fmt: string, arg1: string?) = Console.WriteLine(fmt, arg1) + static member WriteLine(fmt: string, [] args: obj[]) = Console.WriteLine(fmt, args) + static member WriteLineC(s: C) = Console.WriteLine(s.Value) + static member WriteLineC(fmt: C, arg1: C) = Console.WriteLine(fmt.Value, arg1.Value) + +module KonsoleNoNullsModule = + let WriteLine(s: string) = Console.WriteLine(s) + let WriteLine2(fmt: string, arg1: string) = Console.WriteLine(fmt, arg1) + let WriteLineC(s: C) = Console.WriteLine(s.Value) + let WriteLineC2(fmt: C, arg1: C) = Console.WriteLine(fmt.Value, arg1.Value) + +module KonsoleNoNullsModule2 = + let WriteLine x = KonsoleNoNullsModule.WriteLine x + let WriteLine2 (fmt, arg1) = KonsoleNoNullsModule.WriteLine2(fmt, arg1) + let WriteLineC(s) = KonsoleNoNullsModule.WriteLineC(s) + let WriteLineC2(fmt, arg1) = KonsoleNoNullsModule.WriteLineC2(fmt, arg1) + +System.Console.WriteLine("a") +System.Console.WriteLine("a", (null: obj[])) // Expected to give a nullability warning + +KonsoleWithNulls.WriteLine("Hello world") +KonsoleWithNulls.WriteLine(null) // WRONG: gives an incorrect nullability warning for string? and string? +KonsoleWithNulls.WriteLine("Hello","world") +KonsoleWithNulls.WriteLine("Hello","world","there") // // WRONG: gives an incorrect nullability warning for string? and string? + +KonsoleNoNulls.WriteLine("Hello world") +KonsoleNoNulls.WriteLine(null) // Expected to give a nullability warning +KonsoleNoNulls.WriteLine("Hello","world") +//KonsoleNoNulls.WriteLine("Hello",null) // CHECK ME +KonsoleNoNulls.WriteLine(null, "World") // Expected to give a nullability warning + +KonsoleWithNullsModule.WriteLine("Hello world") +KonsoleWithNullsModule.WriteLine(null) +KonsoleWithNullsModule.WriteLine2("Hello","world") +KonsoleWithNullsModule.WriteLine2("Hello",null) +KonsoleWithNullsModule.WriteLine2(null,"world") + +KonsoleWithNullsModule2.WriteLine("Hello world") +KonsoleWithNullsModule2.WriteLine(null) +KonsoleWithNullsModule2.WriteLine2("Hello","world") +KonsoleWithNullsModule2.WriteLine2("Hello",null) +KonsoleWithNullsModule2.WriteLine2(null,"world") + +KonsoleNoNullsModule.WriteLine("Hello world") +KonsoleNoNullsModule.WriteLine(null) // Expected to give a nullability warning +KonsoleNoNullsModule.WriteLine2("Hello","world") +KonsoleNoNullsModule.WriteLine2("Hello",null) // Expected to give a nullability warning +KonsoleNoNullsModule.WriteLine2(null,"world") // Expected to give a nullability warning + +//------------------------------------- + +// Param array cases + +KonsoleNoNulls.WriteLine("Hello","world","there") +KonsoleWithNulls.WriteLine("Hello","world",null) // Expected to give a nullability warning +KonsoleNoNulls.WriteLine("Hello","world",null) // Expected to give a nullability warning +System.Console.WriteLine("a", (null: obj[]?)) +System.Console.WriteLine("a", (null: obj?[]?)) + +//------- +// random stuff + +let f0 line = + let add (s:string) = () + match line with + | null | "" -> () + | _ -> add line // Exected to give a nullness warning + +let f0b line = + let add (s:string) = () + match line with + | null -> () + | _ -> add (nonNull line) // Exected to give a nullness warning + +let add (s:string) = () +let f0c line = + add (nonNull "") // WRONG: should not give a nullness warning + +let f1 (x: (string __hacknull)) = x;; + +//let f2 (x: string or null) = x;; +let f3 (x: string?) = x +let f5 x = (x: int) +//let f4 x = (x: string nullable) + +//let f6<'T when 'T : not null> (x: 'T) = x +//let f6<'T when 'T : not null> (x: 'T) = x + +//let f2 (x: string | null) = x;; + +//let f2 (_x : string | null) = x;; + +//let f2 (x: (string | null)) = x;; + +//let f3 x = (x: (string | null)) + From 54b3ab138aff5b57c7e84c452a07f5fc60660fbd Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 6 Nov 2018 19:52:12 +0000 Subject: [PATCH 016/137] inconsistent constraints give error --- src/fsharp/ConstraintSolver.fs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 8f3066f8eed..54486384a88 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -1731,6 +1731,13 @@ and AddConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace tp newConstraint = | TyparConstraint.SupportsComparison _, TyparConstraint.IsDelegate _ | TyparConstraint.IsDelegate _ , TyparConstraint.SupportsComparison _ + + | TyparConstraint.NotSupportsNull _, TyparConstraint.SupportsNull _ + | TyparConstraint.SupportsNull _, TyparConstraint.NotSupportsNull _ + + | TyparConstraint.SupportsNull _, TyparConstraint.IsNonNullableStruct _ + | TyparConstraint.IsNonNullableStruct _, TyparConstraint.SupportsNull _ + | TyparConstraint.IsNonNullableStruct _, TyparConstraint.IsReferenceType _ | TyparConstraint.IsReferenceType _, TyparConstraint.IsNonNullableStruct _ -> ErrorD (Error(FSComp.SR.csStructConstraintInconsistent(), m)) From cde866896d01a5085a58c3192fe343891bc1efd9 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 8 Nov 2018 13:18:44 +0000 Subject: [PATCH 017/137] fix errors --- src/fsharp/ConstraintSolver.fs | 10 ++++++---- src/fsharp/FSComp.txt | 3 +++ src/fsharp/xlf/FSComp.txt.cs.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.de.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.en.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.es.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.fr.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.it.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.ja.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.ko.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.pl.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.ru.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.tr.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 15 +++++++++++++++ src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 15 +++++++++++++++ tests/fsharp/core/nullness/test.fsx | 4 +++- 17 files changed, 222 insertions(+), 5 deletions(-) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 11791c2d80d..013a7ce7bad 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -1774,19 +1774,21 @@ and AddConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace tp newConstraint = } | TyparConstraint.SupportsComparison _, TyparConstraint.IsDelegate _ - | TyparConstraint.IsDelegate _ , TyparConstraint.SupportsComparison _ + | TyparConstraint.IsDelegate _ , TyparConstraint.SupportsComparison _ -> + ErrorD (Error(FSComp.SR.csDelegateComparisonConstraintInconsistent(), m)) | TyparConstraint.NotSupportsNull _, TyparConstraint.SupportsNull _ - | TyparConstraint.SupportsNull _, TyparConstraint.NotSupportsNull _ + | TyparConstraint.SupportsNull _, TyparConstraint.NotSupportsNull _ -> + ErrorD (Error(FSComp.SR.csNullNotNullConstraintInconsistent(), m)) | TyparConstraint.SupportsNull _, TyparConstraint.IsNonNullableStruct _ - | TyparConstraint.IsNonNullableStruct _, TyparConstraint.SupportsNull _ + | TyparConstraint.IsNonNullableStruct _, TyparConstraint.SupportsNull _ -> + ErrorD (Error(FSComp.SR.csStructNullConstraintInconsistent(), m)) | TyparConstraint.IsNonNullableStruct _, TyparConstraint.IsReferenceType _ | TyparConstraint.IsReferenceType _, TyparConstraint.IsNonNullableStruct _ -> ErrorD (Error(FSComp.SR.csStructConstraintInconsistent(), m)) - | TyparConstraint.SupportsComparison _, TyparConstraint.SupportsComparison _ | TyparConstraint.SupportsEquality _, TyparConstraint.SupportsEquality _ | TyparConstraint.SupportsNull _, TyparConstraint.SupportsNull _ diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index 2422f5b8334..fc1ad44cf10 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -309,6 +309,9 @@ csTypeDoesNotSupportConversion,"The type '%s' does not support a conversion to t csMethodFoundButIsStatic,"The type '%s' has a method '%s' (full name '%s'), but the method is static" csMethodFoundButIsNotStatic,"The type '%s' has a method '%s' (full name '%s'), but the method is not static" 472,csStructConstraintInconsistent,"The constraints 'struct' and 'not struct' are inconsistent" +472,csNullNotNullConstraintInconsistent,"The constraints 'null' and 'not null' are inconsistent" +472,csStructNullConstraintInconsistent,"The constraints 'struct' and 'null' are inconsistent" +472,csDelegateComparisonConstraintInconsistent,"The constraints 'delegate' and 'comparison' are inconsistent" csTypeDoesNotHaveNull,"The type '%s' does not have 'null' as a proper value" csTypeHasNullAsTrueValue,"The type '%s' has 'null' as a true representation value but a constraint does not permit this" csTypeHasNullAsExtraValue,"The type '%s' has 'null' as an extra value but a constraint does not permit this" diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index 0e78a4565df..4ac942b4a0a 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index 2a48b2c4051..f1932f54254 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.en.xlf b/src/fsharp/xlf/FSComp.txt.en.xlf index 3c64c14df9a..7ee457dee81 100644 --- a/src/fsharp/xlf/FSComp.txt.en.xlf +++ b/src/fsharp/xlf/FSComp.txt.en.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index 5eee19fc976..c19624b33a3 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index 96ddcf95292..f78e4971445 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 6aa3f694df0..0b5024f36e9 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index 80d996632a8..9ce4536ab86 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index ffbdcd439df..5c247a140b4 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index a4e89cff769..c0671b9364f 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 85277b5c578..06af966238a 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index 0ed6096d28f..e3d22199bc9 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index 1923d9defe7..bcf94d86653 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index 67c91c08a81..3019883ef53 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index bcbec934aaf..245299f2f45 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -7152,6 +7152,21 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + The constraints 'null' and 'not null' are inconsistent + The constraints 'null' and 'not null' are inconsistent + + + + The constraints 'struct' and 'null' are inconsistent + The constraints 'struct' and 'null' are inconsistent + + + + The constraints 'delegate' and 'comparison' are inconsistent + The constraints 'delegate' and 'comparison' are inconsistent + + \ No newline at end of file diff --git a/tests/fsharp/core/nullness/test.fsx b/tests/fsharp/core/nullness/test.fsx index 8d6424dd9ad..65c401dac01 100644 --- a/tests/fsharp/core/nullness/test.fsx +++ b/tests/fsharp/core/nullness/test.fsx @@ -53,7 +53,9 @@ module Basics2 = let f5 () : 'T when 'T : not struct and 'T : null = null - let f6 () : 'T? when 'T : not struct and 'T : null = null +#if NEGATIVE + let f6 () : 'T? when 'T : not struct and 'T : null = null // Expected to give an error about inconistent constraints +#endif // Note yet allowed //let f7 () : 'T? when 'T : struct = null From 44abd737ca693b1a5c002fb150183332289a8e97 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 12 Nov 2018 12:28:50 +0000 Subject: [PATCH 018/137] build with lkg --- src/absil/illib.fs | 42 +- src/absil/ilreflect.fs | 40 +- src/absil/ilwritepdb.fs | 4 + .../FSharp.Compiler.Private/FSComp.fs | 2260 +++++++++-------- .../FSharp.Compiler.Private/FSComp.resx | 9 + src/fsharp/ConstraintSolver.fs | 17 +- src/fsharp/ErrorLogger.fs | 1 - .../FSharp.Build-proto.fsproj | 1 + src/fsharp/FSharp.Build/FSharp.Build.fsproj | 1 + .../FSharp.Build/FSharpCommandLineBuilder.fs | 12 + .../FSharp.Build/FSharpEmbedResXSource.fs | 5 + .../FSharp.Build/FSharpEmbedResourceText.fs | 5 + src/fsharp/FSharp.Build/Fsc.fs | 127 +- src/fsharp/FSharp.Build/WriteCodeFragment.fs | 30 +- .../FSharp.Compiler.Private.fsproj | 1 + .../FSharp.Compiler.Server.Shared.fsproj | 1 + src/fsharp/FSharp.Core/option.fsi | 8 + src/fsharp/FSharp.Core/prim-types.fs | 14 +- src/fsharp/FSharp.Core/prim-types.fsi | 15 +- src/fsharp/FSharp.Core/reflect.fsi | 137 +- src/fsharp/Fsc-proto/Fsc-proto.fsproj | 1 + src/fsharp/LexFilter.fs | 2 +- src/fsharp/NicePrint.fs | 2 +- src/fsharp/TastOps.fs | 2 +- src/fsharp/TastPickle.fs | 24 +- src/fsharp/TcGlobals.fs | 2 +- src/fsharp/TypeChecker.fs | 4 +- src/fsharp/ast.fs | 2 +- src/fsharp/fsi/Fsi.fsproj | 2 +- src/fsharp/fsi/console.fs | 16 +- src/fsharp/import.fs | 8 +- src/fsharp/lexhelp.fs | 1 + src/fsharp/lib.fs | 28 +- src/fsharp/pars.fsy | 11 +- src/fsharp/service/ServiceLexing.fs | 2 +- src/fsharp/symbols/SymbolHelpers.fs | 2 +- src/fsharp/symbols/Symbols.fs | 4 +- src/fsharp/symbols/Symbols.fsi | 2 +- src/fsharp/tast.fs | 16 +- src/utils/CompilerLocationUtils.fs | 7 +- src/utils/sformat.fs | 35 +- 41 files changed, 1614 insertions(+), 1289 deletions(-) diff --git a/src/absil/illib.fs b/src/absil/illib.fs index ab92a747b5e..bee45a1254a 100644 --- a/src/absil/illib.fs +++ b/src/absil/illib.fs @@ -64,13 +64,17 @@ let reportTime = type InlineDelayInit<'T when 'T : not struct> = new (f: unit -> 'T) = {store = Unchecked.defaultof<'T>; func = Func<_>(f) } val mutable store : 'T +#if BUILDING_WITH_LKG val mutable func : Func<'T> +#else + val mutable func : Func<'T> ? +#endif member x.Value = match x.func with | null -> x.store | _ -> let res = LazyInitializer.EnsureInitialized(&x.store, x.func) - x.func <- Unchecked.defaultof<_> + x.func <- null res //------------------------------------------------------------------------- @@ -194,9 +198,7 @@ module Array = /// ~0.8x slower for ints let inline areEqual (xs: 'T []) (ys: 'T []) = match xs, ys with - | null, null -> true | [||], [||] -> true - | null, _ | _, null -> false | _ when xs.Length <> ys.Length -> false | _ -> let mutable break' = false @@ -220,8 +222,7 @@ module Array = /// check if subArray is found in the wholeArray starting /// at the provided index let inline isSubArray (subArray: 'T []) (wholeArray:'T []) index = - if isNull subArray || isNull wholeArray then false - elif subArray.Length = 0 then true + if subArray.Length = 0 then true elif subArray.Length > wholeArray.Length then false elif subArray.Length = wholeArray.Length then areEqual subArray wholeArray else let rec loop subidx idx = @@ -491,9 +492,6 @@ module String = String (strArr) let extractTrailingIndex (str: string) = - match str with - | null -> null, None - | _ -> let charr = str.ToCharArray() Array.revInPlace charr let digits = Array.takeWhile Char.IsDigit charr @@ -503,13 +501,9 @@ module String = | "" -> str, None | index -> str.Substring (0, str.Length - index.Length), Some (int index) - /// Remove all trailing and leading whitespace from the string - /// return null if the string is null - let trim (value: string) = if isNull value then null else value.Trim() - /// Splits a string into substrings based on the strings in the array separators let split options (separator: string []) (value: string) = - if isNull value then null else value.Split(separator, options) + value.Split(separator, options) let (|StartsWith|_|) pattern value = if String.IsNullOrWhiteSpace value then @@ -947,13 +941,19 @@ type LazyWithContext<'T,'ctxt> = mutable value : 'T /// This field holds either the function to run or a LazyWithContextFailure object recording the exception raised /// from running the function. It is null if the thunk has been evaluated successfully. - mutable funcOrException: obj; +#if BUILDING_WITH_LKG + mutable funcOrException: obj +#else + mutable funcOrException: obj? +#endif /// A helper to ensure we rethrow the "original" exception findOriginalException : exn -> exn } + static member Create(f: ('ctxt->'T), findOriginalException) : LazyWithContext<'T,'ctxt> = { value = Unchecked.defaultof<'T>; - funcOrException = box f; + funcOrException = box f findOriginalException = findOriginalException } + static member NotLazy(x:'T) : LazyWithContext<'T,'ctxt> = { value = x funcOrException = null @@ -1238,13 +1238,25 @@ module Shim = member __.IsPathRootedShim (path: string) = Path.IsPathRooted path member __.IsInvalidPathShim(path: string) = +#if BUILDING_WITH_LKG let isInvalidPath(p:string) = +#else + let isInvalidPath(p:string?) = +#endif String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidPathChars()) <> -1 +#if BUILDING_WITH_LKG let isInvalidFilename(p:string) = +#else + let isInvalidFilename(p:string?) = +#endif String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1 +#if BUILDING_WITH_LKG let isInvalidDirectory(d:string) = +#else + let isInvalidDirectory(d:string?) = +#endif d=null || d.IndexOfAny(Path.GetInvalidPathChars()) <> -1 isInvalidPath (path) || diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs index 6cb379d5d4d..06b762d41a7 100644 --- a/src/absil/ilreflect.fs +++ b/src/absil/ilreflect.fs @@ -391,7 +391,11 @@ let emEnv0 = emEntryPts = [] delayedFieldInits = [] } -let envBindTypeRef emEnv (tref:ILTypeRef) (typT, typB, typeDef)= +#if BUILDING_WITH_LKG +let envBindTypeRef emEnv (tref:ILTypeRef) (typT: System.Type, typB, typeDef)= +#else +let envBindTypeRef emEnv (tref:ILTypeRef) (typT: System.Type?, typB, typeDef)= +#endif match typT with | null -> failwithf "binding null type in envBindTypeRef: %s\n" tref.Name; | _ -> {emEnv with emTypMap = Zmap.add tref (typT, typB, typeDef, None) emEnv.emTypMap} @@ -426,8 +430,8 @@ let convTypeRef cenv emEnv preferCreated (tref:ILTypeRef) = let res = match Zmap.tryFind tref emEnv.emTypMap with | Some (_typT, _typB, _typeDef, Some createdTy) when preferCreated -> createdTy - | Some (typT, _typB, _typeDef, _) -> typT - | None -> convTypeRefAux cenv tref + | Some (typT, _typB, _typeDef, _) -> typT + | None -> convTypeRefAux cenv tref match res with | null -> error(Error(FSComp.SR.itemNotFoundDuringDynamicCodeGen ("type", tref.QualifiedName, tref.Scope.QualifiedName), range0)) | _ -> res @@ -844,7 +848,11 @@ let convMethodSpec cenv emEnv (mspec:ILMethodSpec) = // - QueryableTypeGetConstructors: get a constructor on a non-TypeBuilder type //---------------------------------------------------------------------------- -let queryableTypeGetConstructor cenv emEnv (parentT:Type) (mref:ILMethodRef) = +#if BUILDING_WITH_LKG +let queryableTypeGetConstructor cenv emEnv (parentT:Type) (mref:ILMethodRef) : ConstructorInfo = +#else +let queryableTypeGetConstructor cenv emEnv (parentT:Type) (mref:ILMethodRef) : ConstructorInfo? = +#endif let tyargTs = getGenericArgumentsOfType parentT let reqArgTs = let emEnv = envPushTyvars emEnv tyargTs @@ -855,7 +863,11 @@ let queryableTypeGetConstructor cenv emEnv (parentT:Type) (mref:ILMethodRef) = | _ -> res +#if BUILDING_WITH_LKG let nonQueryableTypeGetConstructor (parentTI:Type) (consInfo : ConstructorInfo) : ConstructorInfo = +#else +let nonQueryableTypeGetConstructor (parentTI:Type) (consInfo : ConstructorInfo) : ConstructorInfo? = +#endif if parentTI.IsGenericType then TypeBuilder.GetConstructor(parentTI, consInfo) else consInfo //---------------------------------------------------------------------------- @@ -960,16 +972,16 @@ let getGenericMethodDefinition q (ty:Type) = let getArrayMethInfo n ty = match n with - | 2 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.GetArray2D null 0 0 @@> ty - | 3 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.GetArray3D null 0 0 0 @@> ty - | 4 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.GetArray4D null 0 0 0 0 @@> ty + | 2 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.GetArray2D Unchecked.defaultof<_> 0 0 @@> ty + | 3 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.GetArray3D Unchecked.defaultof<_> 0 0 0 @@> ty + | 4 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.GetArray4D Unchecked.defaultof<_> 0 0 0 0 @@> ty | _ -> invalidArg "n" "not expecting array dimension > 4" let setArrayMethInfo n ty = match n with - | 2 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray2D null 0 0 0 @@> ty - | 3 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray3D null 0 0 0 0 @@> ty - | 4 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray4D null 0 0 0 0 0 @@> ty + | 2 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray2D Unchecked.defaultof<_> 0 0 0 @@> ty + | 3 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray3D Unchecked.defaultof<_> 0 0 0 0 @@> ty + | 4 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray4D Unchecked.defaultof<_> 0 0 0 0 0 @@> ty | _ -> invalidArg "n" "not expecting array dimension > 4" @@ -1276,7 +1288,11 @@ let rec emitInstr cenv (modB : ModuleBuilder) emEnv (ilG:ILGenerator) instr = setArrayMethInfo shape.Rank ety else #endif +#if BUILDING_WITH_LKG modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, (null:Type), Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) +#else + modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, (null:Type?), Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) +#endif ilG.EmitAndLog(OpCodes.Call, meth) | I_newarr (shape, ty) -> @@ -1284,7 +1300,11 @@ let rec emitInstr cenv (modB : ModuleBuilder) emEnv (ilG:ILGenerator) instr = then ilG.EmitAndLog(OpCodes.Newarr, convType cenv emEnv ty) else let aty = convType cenv emEnv (ILType.Array(shape, ty)) +#if BUILDING_WITH_LKG let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, (null:Type), Array.create shape.Rank (typeof)) +#else + let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, (null:Type?), Array.create shape.Rank (typeof)) +#endif ilG.EmitAndLog(OpCodes.Newobj, meth) | I_ldlen -> ilG.EmitAndLog(OpCodes.Ldlen) diff --git a/src/absil/ilwritepdb.fs b/src/absil/ilwritepdb.fs index 61771a9b2de..4caf952b651 100644 --- a/src/absil/ilwritepdb.fs +++ b/src/absil/ilwritepdb.fs @@ -448,7 +448,11 @@ let generatePortablePdb (embedAllSource:bool) (embedSourceList:string list) (sou | None -> MetadataTokens.MethodDefinitionHandle(0) | Some x -> MetadataTokens.MethodDefinitionHandle(x) +#if BUILDING_WITH_LKG let deterministicIdProvider isDeterministic : System.Func, BlobContentId> = +#else + let deterministicIdProvider isDeterministic : System.Func, BlobContentId> ? = +#endif match isDeterministic with | false -> null | true -> diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index 7571cb73938..91f3d9c5218 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -1036,3377 +1036,3386 @@ type internal SR private() = /// The constraints 'struct' and 'not struct' are inconsistent /// (Originally from ..\FSComp.txt:311) static member csStructConstraintInconsistent() = (472, GetStringFunc("csStructConstraintInconsistent",",,,") ) - /// The type '%s' does not have 'null' as a proper value + /// The constraints 'null' and 'not null' are inconsistent /// (Originally from ..\FSComp.txt:312) + static member csNullNotNullConstraintInconsistent() = (472, GetStringFunc("csNullNotNullConstraintInconsistent",",,,") ) + /// The constraints 'struct' and 'null' are inconsistent + /// (Originally from ..\FSComp.txt:313) + static member csStructNullConstraintInconsistent() = (472, GetStringFunc("csStructNullConstraintInconsistent",",,,") ) + /// The constraints 'delegate' and 'comparison' are inconsistent + /// (Originally from ..\FSComp.txt:314) + static member csDelegateComparisonConstraintInconsistent() = (472, GetStringFunc("csDelegateComparisonConstraintInconsistent",",,,") ) + /// The type '%s' does not have 'null' as a proper value + /// (Originally from ..\FSComp.txt:315) static member csTypeDoesNotHaveNull(a0 : System.String) = (GetStringFunc("csTypeDoesNotHaveNull",",,,%s,,,") a0) /// The type '%s' has 'null' as a true representation value but a constraint does not permit this - /// (Originally from ..\FSComp.txt:313) + /// (Originally from ..\FSComp.txt:316) static member csTypeHasNullAsTrueValue(a0 : System.String) = (GetStringFunc("csTypeHasNullAsTrueValue",",,,%s,,,") a0) /// The type '%s' has 'null' as an extra value but a constraint does not permit this - /// (Originally from ..\FSComp.txt:314) + /// (Originally from ..\FSComp.txt:317) static member csTypeHasNullAsExtraValue(a0 : System.String) = (GetStringFunc("csTypeHasNullAsExtraValue",",,,%s,,,") a0) /// The type '%s' does not have 'null' as a proper value. To create a null value for a Nullable type use 'System.Nullable()'. - /// (Originally from ..\FSComp.txt:315) + /// (Originally from ..\FSComp.txt:318) static member csNullableTypeDoesNotHaveNull(a0 : System.String) = (GetStringFunc("csNullableTypeDoesNotHaveNull",",,,%s,,,") a0) /// The type '%s' does not support the 'comparison' constraint because it has the 'NoComparison' attribute - /// (Originally from ..\FSComp.txt:316) + /// (Originally from ..\FSComp.txt:319) static member csTypeDoesNotSupportComparison1(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportComparison1",",,,%s,,,") a0) /// The type '%s' does not support the 'comparison' constraint. For example, it does not support the 'System.IComparable' interface - /// (Originally from ..\FSComp.txt:317) + /// (Originally from ..\FSComp.txt:320) static member csTypeDoesNotSupportComparison2(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportComparison2",",,,%s,,,") a0) /// The type '%s' does not support the 'comparison' constraint because it is a record, union or struct with one or more structural element types which do not support the 'comparison' constraint. Either avoid the use of comparison with this type, or add the 'StructuralComparison' attribute to the type to determine which field type does not support comparison - /// (Originally from ..\FSComp.txt:318) + /// (Originally from ..\FSComp.txt:321) static member csTypeDoesNotSupportComparison3(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportComparison3",",,,%s,,,") a0) /// The type '%s' does not support the 'equality' constraint because it has the 'NoEquality' attribute - /// (Originally from ..\FSComp.txt:319) + /// (Originally from ..\FSComp.txt:322) static member csTypeDoesNotSupportEquality1(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportEquality1",",,,%s,,,") a0) /// The type '%s' does not support the 'equality' constraint because it is a function type - /// (Originally from ..\FSComp.txt:320) + /// (Originally from ..\FSComp.txt:323) static member csTypeDoesNotSupportEquality2(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportEquality2",",,,%s,,,") a0) /// The type '%s' does not support the 'equality' constraint because it is a record, union or struct with one or more structural element types which do not support the 'equality' constraint. Either avoid the use of equality with this type, or add the 'StructuralEquality' attribute to the type to determine which field type does not support equality - /// (Originally from ..\FSComp.txt:321) + /// (Originally from ..\FSComp.txt:324) static member csTypeDoesNotSupportEquality3(a0 : System.String) = (GetStringFunc("csTypeDoesNotSupportEquality3",",,,%s,,,") a0) /// The type '%s' is not a CLI enum type - /// (Originally from ..\FSComp.txt:322) + /// (Originally from ..\FSComp.txt:325) static member csTypeIsNotEnumType(a0 : System.String) = (GetStringFunc("csTypeIsNotEnumType",",,,%s,,,") a0) /// The type '%s' has a non-standard delegate type - /// (Originally from ..\FSComp.txt:323) + /// (Originally from ..\FSComp.txt:326) static member csTypeHasNonStandardDelegateType(a0 : System.String) = (GetStringFunc("csTypeHasNonStandardDelegateType",",,,%s,,,") a0) /// The type '%s' is not a CLI delegate type - /// (Originally from ..\FSComp.txt:324) + /// (Originally from ..\FSComp.txt:327) static member csTypeIsNotDelegateType(a0 : System.String) = (GetStringFunc("csTypeIsNotDelegateType",",,,%s,,,") a0) /// This type parameter cannot be instantiated to 'Nullable'. This is a restriction imposed in order to ensure the meaning of 'null' in some CLI languages is not confusing when used in conjunction with 'Nullable' values. - /// (Originally from ..\FSComp.txt:325) + /// (Originally from ..\FSComp.txt:328) static member csTypeParameterCannotBeNullable() = (GetStringFunc("csTypeParameterCannotBeNullable",",,,") ) /// A generic construct requires that the type '%s' is a CLI or F# struct type - /// (Originally from ..\FSComp.txt:326) + /// (Originally from ..\FSComp.txt:329) static member csGenericConstructRequiresStructType(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresStructType",",,,%s,,,") a0) /// A generic construct requires that the type '%s' is an unmanaged type - /// (Originally from ..\FSComp.txt:327) + /// (Originally from ..\FSComp.txt:330) static member csGenericConstructRequiresUnmanagedType(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresUnmanagedType",",,,%s,,,") a0) /// The type '%s' is not compatible with any of the types %s, arising from the use of a printf-style format string - /// (Originally from ..\FSComp.txt:328) + /// (Originally from ..\FSComp.txt:331) static member csTypeNotCompatibleBecauseOfPrintf(a0 : System.String, a1 : System.String) = (GetStringFunc("csTypeNotCompatibleBecauseOfPrintf",",,,%s,,,%s,,,") a0 a1) /// A generic construct requires that the type '%s' have reference semantics, but it does not, i.e. it is a struct - /// (Originally from ..\FSComp.txt:329) + /// (Originally from ..\FSComp.txt:332) static member csGenericConstructRequiresReferenceSemantics(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresReferenceSemantics",",,,%s,,,") a0) /// A generic construct requires that the type '%s' be non-abstract - /// (Originally from ..\FSComp.txt:330) + /// (Originally from ..\FSComp.txt:333) static member csGenericConstructRequiresNonAbstract(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresNonAbstract",",,,%s,,,") a0) /// A generic construct requires that the type '%s' have a public default constructor - /// (Originally from ..\FSComp.txt:331) + /// (Originally from ..\FSComp.txt:334) static member csGenericConstructRequiresPublicDefaultConstructor(a0 : System.String) = (GetStringFunc("csGenericConstructRequiresPublicDefaultConstructor",",,,%s,,,") a0) /// Type instantiation length mismatch - /// (Originally from ..\FSComp.txt:332) + /// (Originally from ..\FSComp.txt:335) static member csTypeInstantiationLengthMismatch() = (483, GetStringFunc("csTypeInstantiationLengthMismatch",",,,") ) /// Optional arguments not permitted here - /// (Originally from ..\FSComp.txt:333) + /// (Originally from ..\FSComp.txt:336) static member csOptionalArgumentNotPermittedHere() = (484, GetStringFunc("csOptionalArgumentNotPermittedHere",",,,") ) /// %s is not a static member - /// (Originally from ..\FSComp.txt:334) + /// (Originally from ..\FSComp.txt:337) static member csMemberIsNotStatic(a0 : System.String) = (485, GetStringFunc("csMemberIsNotStatic",",,,%s,,,") a0) /// %s is not an instance member - /// (Originally from ..\FSComp.txt:335) + /// (Originally from ..\FSComp.txt:338) static member csMemberIsNotInstance(a0 : System.String) = (486, GetStringFunc("csMemberIsNotInstance",",,,%s,,,") a0) /// Argument length mismatch - /// (Originally from ..\FSComp.txt:336) + /// (Originally from ..\FSComp.txt:339) static member csArgumentLengthMismatch() = (487, GetStringFunc("csArgumentLengthMismatch",",,,") ) /// The argument types don't match - /// (Originally from ..\FSComp.txt:337) + /// (Originally from ..\FSComp.txt:340) static member csArgumentTypesDoNotMatch() = (488, GetStringFunc("csArgumentTypesDoNotMatch",",,,") ) /// This method expects a CLI 'params' parameter in this position. 'params' is a way of passing a variable number of arguments to a method in languages such as C#. Consider passing an array for this argument - /// (Originally from ..\FSComp.txt:338) + /// (Originally from ..\FSComp.txt:341) static member csMethodExpectsParams() = (489, GetStringFunc("csMethodExpectsParams",",,,") ) /// The member or object constructor '%s' is not %s - /// (Originally from ..\FSComp.txt:339) + /// (Originally from ..\FSComp.txt:342) static member csMemberIsNotAccessible(a0 : System.String, a1 : System.String) = (490, GetStringFunc("csMemberIsNotAccessible",",,,%s,,,%s,,,") a0 a1) /// The member or object constructor '%s' is not %s. Private members may only be accessed from within the declaring type. Protected members may only be accessed from an extending type and cannot be accessed from inner lambda expressions. - /// (Originally from ..\FSComp.txt:340) + /// (Originally from ..\FSComp.txt:343) static member csMemberIsNotAccessible2(a0 : System.String, a1 : System.String) = (491, GetStringFunc("csMemberIsNotAccessible2",",,,%s,,,%s,,,") a0 a1) /// %s is not a static method - /// (Originally from ..\FSComp.txt:341) + /// (Originally from ..\FSComp.txt:344) static member csMethodIsNotAStaticMethod(a0 : System.String) = (492, GetStringFunc("csMethodIsNotAStaticMethod",",,,%s,,,") a0) /// %s is not an instance method - /// (Originally from ..\FSComp.txt:342) + /// (Originally from ..\FSComp.txt:345) static member csMethodIsNotAnInstanceMethod(a0 : System.String) = (493, GetStringFunc("csMethodIsNotAnInstanceMethod",",,,%s,,,") a0) /// The member or object constructor '%s' has no argument or settable return property '%s'. %s. - /// (Originally from ..\FSComp.txt:343) + /// (Originally from ..\FSComp.txt:346) static member csMemberHasNoArgumentOrReturnProperty(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("csMemberHasNoArgumentOrReturnProperty",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The object constructor '%s' has no argument or settable return property '%s'. %s. - /// (Originally from ..\FSComp.txt:344) + /// (Originally from ..\FSComp.txt:347) static member csCtorHasNoArgumentOrReturnProperty(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("csCtorHasNoArgumentOrReturnProperty",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The required signature is %s - /// (Originally from ..\FSComp.txt:345) + /// (Originally from ..\FSComp.txt:348) static member csRequiredSignatureIs(a0 : System.String) = (495, GetStringFunc("csRequiredSignatureIs",",,,%s,,,") a0) /// The member or object constructor '%s' requires %d argument(s). The required signature is '%s'. - /// (Originally from ..\FSComp.txt:346) + /// (Originally from ..\FSComp.txt:349) static member csMemberSignatureMismatch(a0 : System.String, a1 : System.Int32, a2 : System.String) = (496, GetStringFunc("csMemberSignatureMismatch",",,,%s,,,%d,,,%s,,,") a0 a1 a2) /// The member or object constructor '%s' requires %d additional argument(s). The required signature is '%s'. - /// (Originally from ..\FSComp.txt:347) + /// (Originally from ..\FSComp.txt:350) static member csMemberSignatureMismatch2(a0 : System.String, a1 : System.Int32, a2 : System.String) = (497, GetStringFunc("csMemberSignatureMismatch2",",,,%s,,,%d,,,%s,,,") a0 a1 a2) /// The member or object constructor '%s' requires %d argument(s). The required signature is '%s'. Some names for missing arguments are %s. - /// (Originally from ..\FSComp.txt:348) + /// (Originally from ..\FSComp.txt:351) static member csMemberSignatureMismatch3(a0 : System.String, a1 : System.Int32, a2 : System.String, a3 : System.String) = (498, GetStringFunc("csMemberSignatureMismatch3",",,,%s,,,%d,,,%s,,,%s,,,") a0 a1 a2 a3) /// The member or object constructor '%s' requires %d additional argument(s). The required signature is '%s'. Some names for missing arguments are %s. - /// (Originally from ..\FSComp.txt:349) + /// (Originally from ..\FSComp.txt:352) static member csMemberSignatureMismatch4(a0 : System.String, a1 : System.Int32, a2 : System.String, a3 : System.String) = (499, GetStringFunc("csMemberSignatureMismatch4",",,,%s,,,%d,,,%s,,,%s,,,") a0 a1 a2 a3) /// The member or object constructor '%s' requires %d argument(s) but is here given %d unnamed and %d named argument(s). The required signature is '%s'. - /// (Originally from ..\FSComp.txt:350) + /// (Originally from ..\FSComp.txt:353) static member csMemberSignatureMismatchArityNamed(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.Int32, a4 : System.String) = (500, GetStringFunc("csMemberSignatureMismatchArityNamed",",,,%s,,,%d,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3 a4) /// The member or object constructor '%s' takes %d argument(s) but is here given %d. The required signature is '%s'. - /// (Originally from ..\FSComp.txt:351) + /// (Originally from ..\FSComp.txt:354) static member csMemberSignatureMismatchArity(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String) = (501, GetStringFunc("csMemberSignatureMismatchArity",",,,%s,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3) /// The object constructor '%s' takes %d argument(s) but is here given %d. The required signature is '%s'. - /// (Originally from ..\FSComp.txt:352) + /// (Originally from ..\FSComp.txt:355) static member csCtorSignatureMismatchArity(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String) = (501, GetStringFunc("csCtorSignatureMismatchArity",",,,%s,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3) /// The object constructor '%s' takes %d argument(s) but is here given %d. The required signature is '%s'. If some of the arguments are meant to assign values to properties, consider separating those arguments with a comma (','). - /// (Originally from ..\FSComp.txt:353) + /// (Originally from ..\FSComp.txt:356) static member csCtorSignatureMismatchArityProp(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String) = (501, GetStringFunc("csCtorSignatureMismatchArityProp",",,,%s,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3) /// The member or object constructor '%s' takes %d type argument(s) but is here given %d. The required signature is '%s'. - /// (Originally from ..\FSComp.txt:354) + /// (Originally from ..\FSComp.txt:357) static member csMemberSignatureMismatchArityType(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String) = (502, GetStringFunc("csMemberSignatureMismatchArityType",",,,%s,,,%d,,,%d,,,%s,,,") a0 a1 a2 a3) /// A member or object constructor '%s' taking %d arguments is not accessible from this code location. All accessible versions of method '%s' take %d arguments. - /// (Originally from ..\FSComp.txt:355) + /// (Originally from ..\FSComp.txt:358) static member csMemberNotAccessible(a0 : System.String, a1 : System.Int32, a2 : System.String, a3 : System.Int32) = (503, GetStringFunc("csMemberNotAccessible",",,,%s,,,%d,,,%s,,,%d,,,") a0 a1 a2 a3) /// Incorrect generic instantiation. No %s member named '%s' takes %d generic arguments. - /// (Originally from ..\FSComp.txt:356) + /// (Originally from ..\FSComp.txt:359) static member csIncorrectGenericInstantiation(a0 : System.String, a1 : System.String, a2 : System.Int32) = (504, GetStringFunc("csIncorrectGenericInstantiation",",,,%s,,,%s,,,%d,,,") a0 a1 a2) /// The member or object constructor '%s' does not take %d argument(s). An overload was found taking %d arguments. - /// (Originally from ..\FSComp.txt:357) + /// (Originally from ..\FSComp.txt:360) static member csMemberOverloadArityMismatch(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (505, GetStringFunc("csMemberOverloadArityMismatch",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// No %s member or object constructor named '%s' takes %d arguments - /// (Originally from ..\FSComp.txt:358) + /// (Originally from ..\FSComp.txt:361) static member csNoMemberTakesTheseArguments(a0 : System.String, a1 : System.String, a2 : System.Int32) = (506, GetStringFunc("csNoMemberTakesTheseArguments",",,,%s,,,%s,,,%d,,,") a0 a1 a2) /// No %s member or object constructor named '%s' takes %d arguments. Note the call to this member also provides %d named arguments. - /// (Originally from ..\FSComp.txt:359) + /// (Originally from ..\FSComp.txt:362) static member csNoMemberTakesTheseArguments2(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.Int32) = (507, GetStringFunc("csNoMemberTakesTheseArguments2",",,,%s,,,%s,,,%d,,,%d,,,") a0 a1 a2 a3) /// No %s member or object constructor named '%s' takes %d arguments. The named argument '%s' doesn't correspond to any argument or settable return property for any overload. - /// (Originally from ..\FSComp.txt:360) + /// (Originally from ..\FSComp.txt:363) static member csNoMemberTakesTheseArguments3(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.String) = (508, GetStringFunc("csNoMemberTakesTheseArguments3",",,,%s,,,%s,,,%d,,,%s,,,") a0 a1 a2 a3) /// Method or object constructor '%s' not found - /// (Originally from ..\FSComp.txt:361) + /// (Originally from ..\FSComp.txt:364) static member csMethodNotFound(a0 : System.String) = (509, GetStringFunc("csMethodNotFound",",,,%s,,,") a0) /// No overloads match for method '%s'. - /// (Originally from ..\FSComp.txt:362) + /// (Originally from ..\FSComp.txt:365) static member csNoOverloadsFound(a0 : System.String) = (GetStringFunc("csNoOverloadsFound",",,,%s,,,") a0) /// A unique overload for method '%s' could not be determined based on type information prior to this program point. A type annotation may be needed. - /// (Originally from ..\FSComp.txt:363) + /// (Originally from ..\FSComp.txt:366) static member csMethodIsOverloaded(a0 : System.String) = (GetStringFunc("csMethodIsOverloaded",",,,%s,,,") a0) /// Candidates: %s - /// (Originally from ..\FSComp.txt:364) + /// (Originally from ..\FSComp.txt:367) static member csCandidates(a0 : System.String) = (GetStringFunc("csCandidates",",,,%s,,,") a0) /// The available overloads are shown below. - /// (Originally from ..\FSComp.txt:365) + /// (Originally from ..\FSComp.txt:368) static member csSeeAvailableOverloads() = (GetStringFunc("csSeeAvailableOverloads",",,,") ) /// Accessibility modifiers are not permitted on 'do' bindings, but '%s' was given. - /// (Originally from ..\FSComp.txt:366) + /// (Originally from ..\FSComp.txt:369) static member parsDoCannotHaveVisibilityDeclarations(a0 : System.String) = (512, GetStringFunc("parsDoCannotHaveVisibilityDeclarations",",,,%s,,,") a0) /// End of file in #if section begun at or after here - /// (Originally from ..\FSComp.txt:367) + /// (Originally from ..\FSComp.txt:370) static member parsEofInHashIf() = (513, GetStringFunc("parsEofInHashIf",",,,") ) /// End of file in string begun at or before here - /// (Originally from ..\FSComp.txt:368) + /// (Originally from ..\FSComp.txt:371) static member parsEofInString() = (514, GetStringFunc("parsEofInString",",,,") ) /// End of file in verbatim string begun at or before here - /// (Originally from ..\FSComp.txt:369) + /// (Originally from ..\FSComp.txt:372) static member parsEofInVerbatimString() = (515, GetStringFunc("parsEofInVerbatimString",",,,") ) /// End of file in comment begun at or before here - /// (Originally from ..\FSComp.txt:370) + /// (Originally from ..\FSComp.txt:373) static member parsEofInComment() = (516, GetStringFunc("parsEofInComment",",,,") ) /// End of file in string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:371) + /// (Originally from ..\FSComp.txt:374) static member parsEofInStringInComment() = (517, GetStringFunc("parsEofInStringInComment",",,,") ) /// End of file in verbatim string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:372) + /// (Originally from ..\FSComp.txt:375) static member parsEofInVerbatimStringInComment() = (518, GetStringFunc("parsEofInVerbatimStringInComment",",,,") ) /// End of file in IF-OCAML section begun at or before here - /// (Originally from ..\FSComp.txt:373) + /// (Originally from ..\FSComp.txt:376) static member parsEofInIfOcaml() = (519, GetStringFunc("parsEofInIfOcaml",",,,") ) /// End of file in directive begun at or before here - /// (Originally from ..\FSComp.txt:374) + /// (Originally from ..\FSComp.txt:377) static member parsEofInDirective() = (520, GetStringFunc("parsEofInDirective",",,,") ) /// No #endif found for #if or #else - /// (Originally from ..\FSComp.txt:375) + /// (Originally from ..\FSComp.txt:378) static member parsNoHashEndIfFound() = (521, GetStringFunc("parsNoHashEndIfFound",",,,") ) /// Attributes have been ignored in this construct - /// (Originally from ..\FSComp.txt:376) + /// (Originally from ..\FSComp.txt:379) static member parsAttributesIgnored() = (522, GetStringFunc("parsAttributesIgnored",",,,") ) /// 'use' bindings are not permitted in primary constructors - /// (Originally from ..\FSComp.txt:377) + /// (Originally from ..\FSComp.txt:380) static member parsUseBindingsIllegalInImplicitClassConstructors() = (523, GetStringFunc("parsUseBindingsIllegalInImplicitClassConstructors",",,,") ) /// 'use' bindings are not permitted in modules and are treated as 'let' bindings - /// (Originally from ..\FSComp.txt:378) + /// (Originally from ..\FSComp.txt:381) static member parsUseBindingsIllegalInModules() = (524, GetStringFunc("parsUseBindingsIllegalInModules",",,,") ) /// An integer for loop must use a simple identifier - /// (Originally from ..\FSComp.txt:379) + /// (Originally from ..\FSComp.txt:382) static member parsIntegerForLoopRequiresSimpleIdentifier() = (525, GetStringFunc("parsIntegerForLoopRequiresSimpleIdentifier",",,,") ) /// At most one 'with' augmentation is permitted - /// (Originally from ..\FSComp.txt:380) + /// (Originally from ..\FSComp.txt:383) static member parsOnlyOneWithAugmentationAllowed() = (526, GetStringFunc("parsOnlyOneWithAugmentationAllowed",",,,") ) /// A semicolon is not expected at this point - /// (Originally from ..\FSComp.txt:381) + /// (Originally from ..\FSComp.txt:384) static member parsUnexpectedSemicolon() = (527, GetStringFunc("parsUnexpectedSemicolon",",,,") ) /// Unexpected end of input - /// (Originally from ..\FSComp.txt:382) + /// (Originally from ..\FSComp.txt:385) static member parsUnexpectedEndOfFile() = (528, GetStringFunc("parsUnexpectedEndOfFile",",,,") ) /// Accessibility modifiers are not permitted here, but '%s' was given. - /// (Originally from ..\FSComp.txt:383) + /// (Originally from ..\FSComp.txt:386) static member parsUnexpectedVisibilityDeclaration(a0 : System.String) = (529, GetStringFunc("parsUnexpectedVisibilityDeclaration",",,,%s,,,") a0) /// Only '#' compiler directives may occur prior to the first 'namespace' declaration - /// (Originally from ..\FSComp.txt:384) + /// (Originally from ..\FSComp.txt:387) static member parsOnlyHashDirectivesAllowed() = (530, GetStringFunc("parsOnlyHashDirectivesAllowed",",,,") ) /// Accessibility modifiers should come immediately prior to the identifier naming a construct - /// (Originally from ..\FSComp.txt:385) + /// (Originally from ..\FSComp.txt:388) static member parsVisibilityDeclarationsShouldComePriorToIdentifier() = (531, GetStringFunc("parsVisibilityDeclarationsShouldComePriorToIdentifier",",,,") ) /// Files should begin with either a namespace or module declaration, e.g. 'namespace SomeNamespace.SubNamespace' or 'module SomeNamespace.SomeModule', but not both. To define a module within a namespace use 'module SomeModule = ...' - /// (Originally from ..\FSComp.txt:386) + /// (Originally from ..\FSComp.txt:389) static member parsNamespaceOrModuleNotBoth() = (532, GetStringFunc("parsNamespaceOrModuleNotBoth",",,,") ) /// A module abbreviation must be a simple name, not a path - /// (Originally from ..\FSComp.txt:387) + /// (Originally from ..\FSComp.txt:390) static member parsModuleAbbreviationMustBeSimpleName() = (534, GetStringFunc("parsModuleAbbreviationMustBeSimpleName",",,,") ) /// Ignoring attributes on module abbreviation - /// (Originally from ..\FSComp.txt:388) + /// (Originally from ..\FSComp.txt:391) static member parsIgnoreAttributesOnModuleAbbreviation() = (535, GetStringFunc("parsIgnoreAttributesOnModuleAbbreviation",",,,") ) /// The '%s' accessibility attribute is not allowed on module abbreviation. Module abbreviations are always private. - /// (Originally from ..\FSComp.txt:389) + /// (Originally from ..\FSComp.txt:392) static member parsIgnoreAttributesOnModuleAbbreviationAlwaysPrivate(a0 : System.String) = (536, GetStringFunc("parsIgnoreAttributesOnModuleAbbreviationAlwaysPrivate",",,,%s,,,") a0) /// The '%s' visibility attribute is not allowed on module abbreviation. Module abbreviations are always private. - /// (Originally from ..\FSComp.txt:390) + /// (Originally from ..\FSComp.txt:393) static member parsIgnoreVisibilityOnModuleAbbreviationAlwaysPrivate(a0 : System.String) = (537, GetStringFunc("parsIgnoreVisibilityOnModuleAbbreviationAlwaysPrivate",",,,%s,,,") a0) /// Unclosed block - /// (Originally from ..\FSComp.txt:391) + /// (Originally from ..\FSComp.txt:394) static member parsUnClosedBlockInHashLight() = (538, GetStringFunc("parsUnClosedBlockInHashLight",",,,") ) /// Unmatched 'begin' or 'struct' - /// (Originally from ..\FSComp.txt:392) + /// (Originally from ..\FSComp.txt:395) static member parsUnmatchedBeginOrStruct() = (539, GetStringFunc("parsUnmatchedBeginOrStruct",",,,") ) /// A module name must be a simple name, not a path - /// (Originally from ..\FSComp.txt:393) + /// (Originally from ..\FSComp.txt:396) static member parsModuleDefnMustBeSimpleName() = (541, GetStringFunc("parsModuleDefnMustBeSimpleName",",,,") ) /// Unexpected empty type moduleDefn list - /// (Originally from ..\FSComp.txt:394) + /// (Originally from ..\FSComp.txt:397) static member parsUnexpectedEmptyModuleDefn() = (542, GetStringFunc("parsUnexpectedEmptyModuleDefn",",,,") ) /// Attributes should be placed before 'val' - /// (Originally from ..\FSComp.txt:395) + /// (Originally from ..\FSComp.txt:398) static member parsAttributesMustComeBeforeVal() = (GetStringFunc("parsAttributesMustComeBeforeVal",",,,") ) /// Attributes are not permitted on interface implementations - /// (Originally from ..\FSComp.txt:396) + /// (Originally from ..\FSComp.txt:399) static member parsAttributesAreNotPermittedOnInterfaceImplementations() = (543, GetStringFunc("parsAttributesAreNotPermittedOnInterfaceImplementations",",,,") ) /// Syntax error - /// (Originally from ..\FSComp.txt:397) + /// (Originally from ..\FSComp.txt:400) static member parsSyntaxError() = (544, GetStringFunc("parsSyntaxError",",,,") ) /// Augmentations are not permitted on delegate type moduleDefns - /// (Originally from ..\FSComp.txt:398) + /// (Originally from ..\FSComp.txt:401) static member parsAugmentationsIllegalOnDelegateType() = (545, GetStringFunc("parsAugmentationsIllegalOnDelegateType",",,,") ) /// Unmatched 'class', 'interface' or 'struct' - /// (Originally from ..\FSComp.txt:399) + /// (Originally from ..\FSComp.txt:402) static member parsUnmatchedClassInterfaceOrStruct() = (546, GetStringFunc("parsUnmatchedClassInterfaceOrStruct",",,,") ) /// A type definition requires one or more members or other declarations. If you intend to define an empty class, struct or interface, then use 'type ... = class end', 'interface end' or 'struct end'. - /// (Originally from ..\FSComp.txt:400) + /// (Originally from ..\FSComp.txt:403) static member parsEmptyTypeDefinition() = (547, GetStringFunc("parsEmptyTypeDefinition",",,,") ) /// Unmatched 'with' or badly formatted 'with' block - /// (Originally from ..\FSComp.txt:401) + /// (Originally from ..\FSComp.txt:404) static member parsUnmatchedWith() = (550, GetStringFunc("parsUnmatchedWith",",,,") ) /// 'get', 'set' or 'get,set' required - /// (Originally from ..\FSComp.txt:402) + /// (Originally from ..\FSComp.txt:405) static member parsGetOrSetRequired() = (551, GetStringFunc("parsGetOrSetRequired",",,,") ) /// Only class types may take value arguments - /// (Originally from ..\FSComp.txt:403) + /// (Originally from ..\FSComp.txt:406) static member parsOnlyClassCanTakeValueArguments() = (552, GetStringFunc("parsOnlyClassCanTakeValueArguments",",,,") ) /// Unmatched 'begin' - /// (Originally from ..\FSComp.txt:404) + /// (Originally from ..\FSComp.txt:407) static member parsUnmatchedBegin() = (553, GetStringFunc("parsUnmatchedBegin",",,,") ) /// Invalid declaration syntax - /// (Originally from ..\FSComp.txt:405) + /// (Originally from ..\FSComp.txt:408) static member parsInvalidDeclarationSyntax() = (554, GetStringFunc("parsInvalidDeclarationSyntax",",,,") ) /// 'get' and/or 'set' required - /// (Originally from ..\FSComp.txt:406) + /// (Originally from ..\FSComp.txt:409) static member parsGetAndOrSetRequired() = (555, GetStringFunc("parsGetAndOrSetRequired",",,,") ) /// Type annotations on property getters and setters must be given after the 'get()' or 'set(v)', e.g. 'with get() : string = ...' - /// (Originally from ..\FSComp.txt:407) + /// (Originally from ..\FSComp.txt:410) static member parsTypeAnnotationsOnGetSet() = (556, GetStringFunc("parsTypeAnnotationsOnGetSet",",,,") ) /// A getter property is expected to be a function, e.g. 'get() = ...' or 'get(index) = ...' - /// (Originally from ..\FSComp.txt:408) + /// (Originally from ..\FSComp.txt:411) static member parsGetterMustHaveAtLeastOneArgument() = (557, GetStringFunc("parsGetterMustHaveAtLeastOneArgument",",,,") ) /// Multiple accessibilities given for property getter or setter - /// (Originally from ..\FSComp.txt:409) + /// (Originally from ..\FSComp.txt:412) static member parsMultipleAccessibilitiesForGetSet() = (558, GetStringFunc("parsMultipleAccessibilitiesForGetSet",",,,") ) /// Property setters must be defined using 'set value = ', 'set idx value = ' or 'set (idx1,...,idxN) value = ... ' - /// (Originally from ..\FSComp.txt:410) + /// (Originally from ..\FSComp.txt:413) static member parsSetSyntax() = (559, GetStringFunc("parsSetSyntax",",,,") ) /// Interfaces always have the same visibility as the enclosing type - /// (Originally from ..\FSComp.txt:411) + /// (Originally from ..\FSComp.txt:414) static member parsInterfacesHaveSameVisibilityAsEnclosingType() = (560, GetStringFunc("parsInterfacesHaveSameVisibilityAsEnclosingType",",,,") ) /// Accessibility modifiers are not allowed on this member. Abstract slots always have the same visibility as the enclosing type. - /// (Originally from ..\FSComp.txt:412) + /// (Originally from ..\FSComp.txt:415) static member parsAccessibilityModsIllegalForAbstract() = (561, GetStringFunc("parsAccessibilityModsIllegalForAbstract",",,,") ) /// Attributes are not permitted on 'inherit' declarations - /// (Originally from ..\FSComp.txt:413) + /// (Originally from ..\FSComp.txt:416) static member parsAttributesIllegalOnInherit() = (562, GetStringFunc("parsAttributesIllegalOnInherit",",,,") ) /// Accessibility modifiers are not permitted on an 'inherits' declaration - /// (Originally from ..\FSComp.txt:414) + /// (Originally from ..\FSComp.txt:417) static member parsVisibilityIllegalOnInherit() = (563, GetStringFunc("parsVisibilityIllegalOnInherit",",,,") ) /// 'inherit' declarations cannot have 'as' bindings. To access members of the base class when overriding a method, the syntax 'base.SomeMember' may be used; 'base' is a keyword. Remove this 'as' binding. - /// (Originally from ..\FSComp.txt:415) + /// (Originally from ..\FSComp.txt:418) static member parsInheritDeclarationsCannotHaveAsBindings() = (564, GetStringFunc("parsInheritDeclarationsCannotHaveAsBindings",",,,") ) /// Attributes are not allowed here - /// (Originally from ..\FSComp.txt:416) + /// (Originally from ..\FSComp.txt:419) static member parsAttributesIllegalHere() = (565, GetStringFunc("parsAttributesIllegalHere",",,,") ) /// Accessibility modifiers are not permitted in this position for type abbreviations - /// (Originally from ..\FSComp.txt:417) + /// (Originally from ..\FSComp.txt:420) static member parsTypeAbbreviationsCannotHaveVisibilityDeclarations() = (566, GetStringFunc("parsTypeAbbreviationsCannotHaveVisibilityDeclarations",",,,") ) /// Accessibility modifiers are not permitted in this position for enum types - /// (Originally from ..\FSComp.txt:418) + /// (Originally from ..\FSComp.txt:421) static member parsEnumTypesCannotHaveVisibilityDeclarations() = (567, GetStringFunc("parsEnumTypesCannotHaveVisibilityDeclarations",",,,") ) /// All enum fields must be given values - /// (Originally from ..\FSComp.txt:419) + /// (Originally from ..\FSComp.txt:422) static member parsAllEnumFieldsRequireValues() = (568, GetStringFunc("parsAllEnumFieldsRequireValues",",,,") ) /// Accessibility modifiers are not permitted on inline assembly code types - /// (Originally from ..\FSComp.txt:420) + /// (Originally from ..\FSComp.txt:423) static member parsInlineAssemblyCannotHaveVisibilityDeclarations() = (569, GetStringFunc("parsInlineAssemblyCannotHaveVisibilityDeclarations",",,,") ) /// Unexpected identifier: '%s' - /// (Originally from ..\FSComp.txt:421) + /// (Originally from ..\FSComp.txt:424) static member parsUnexpectedIdentifier(a0 : System.String) = (571, GetStringFunc("parsUnexpectedIdentifier",",,,%s,,,") a0) /// Accessibility modifiers are not permitted on union cases. Use 'type U = internal ...' or 'type U = private ...' to give an accessibility to the whole representation. - /// (Originally from ..\FSComp.txt:422) + /// (Originally from ..\FSComp.txt:425) static member parsUnionCasesCannotHaveVisibilityDeclarations() = (572, GetStringFunc("parsUnionCasesCannotHaveVisibilityDeclarations",",,,") ) /// Accessibility modifiers are not permitted on enumeration fields - /// (Originally from ..\FSComp.txt:423) + /// (Originally from ..\FSComp.txt:426) static member parsEnumFieldsCannotHaveVisibilityDeclarations() = (573, GetStringFunc("parsEnumFieldsCannotHaveVisibilityDeclarations",",,,") ) /// Consider using a separate record type instead - /// (Originally from ..\FSComp.txt:424) + /// (Originally from ..\FSComp.txt:427) static member parsConsiderUsingSeparateRecordType() = (GetStringFunc("parsConsiderUsingSeparateRecordType",",,,") ) /// Accessibility modifiers are not permitted on record fields. Use 'type R = internal ...' or 'type R = private ...' to give an accessibility to the whole representation. - /// (Originally from ..\FSComp.txt:425) + /// (Originally from ..\FSComp.txt:428) static member parsRecordFieldsCannotHaveVisibilityDeclarations() = (575, GetStringFunc("parsRecordFieldsCannotHaveVisibilityDeclarations",",,,") ) /// The declaration form 'let ... and ...' for non-recursive bindings is not used in F# code. Consider using a sequence of 'let' bindings - /// (Originally from ..\FSComp.txt:426) + /// (Originally from ..\FSComp.txt:429) static member parsLetAndForNonRecBindings() = (576, GetStringFunc("parsLetAndForNonRecBindings",",,,") ) /// Unmatched '(' - /// (Originally from ..\FSComp.txt:427) + /// (Originally from ..\FSComp.txt:430) static member parsUnmatchedParen() = (583, GetStringFunc("parsUnmatchedParen",",,,") ) /// Successive patterns should be separated by spaces or tupled - /// (Originally from ..\FSComp.txt:428) + /// (Originally from ..\FSComp.txt:431) static member parsSuccessivePatternsShouldBeSpacedOrTupled() = (584, GetStringFunc("parsSuccessivePatternsShouldBeSpacedOrTupled",",,,") ) /// No matching 'in' found for this 'let' - /// (Originally from ..\FSComp.txt:429) + /// (Originally from ..\FSComp.txt:432) static member parsNoMatchingInForLet() = (586, GetStringFunc("parsNoMatchingInForLet",",,,") ) /// Error in the return expression for this 'let'. Possible incorrect indentation. - /// (Originally from ..\FSComp.txt:430) + /// (Originally from ..\FSComp.txt:433) static member parsErrorInReturnForLetIncorrectIndentation() = (587, GetStringFunc("parsErrorInReturnForLetIncorrectIndentation",",,,") ) /// The block following this '%s' is unfinished. Every code block is an expression and must have a result. '%s' cannot be the final code element in a block. Consider giving this block an explicit result. - /// (Originally from ..\FSComp.txt:431) + /// (Originally from ..\FSComp.txt:434) static member parsExpectedExpressionAfterLet(a0 : System.String, a1 : System.String) = (588, GetStringFunc("parsExpectedExpressionAfterLet",",,,%s,,,%s,,,") a0 a1) /// Incomplete conditional. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:432) + /// (Originally from ..\FSComp.txt:435) static member parsIncompleteIf() = (589, GetStringFunc("parsIncompleteIf",",,,") ) /// 'assert' may not be used as a first class value. Use 'assert ' instead. - /// (Originally from ..\FSComp.txt:433) + /// (Originally from ..\FSComp.txt:436) static member parsAssertIsNotFirstClassValue() = (590, GetStringFunc("parsAssertIsNotFirstClassValue",",,,") ) /// Identifier expected - /// (Originally from ..\FSComp.txt:434) + /// (Originally from ..\FSComp.txt:437) static member parsIdentifierExpected() = (594, GetStringFunc("parsIdentifierExpected",",,,") ) /// 'in' or '=' expected - /// (Originally from ..\FSComp.txt:435) + /// (Originally from ..\FSComp.txt:438) static member parsInOrEqualExpected() = (595, GetStringFunc("parsInOrEqualExpected",",,,") ) /// The use of '->' in sequence and computation expressions is limited to the form 'for pat in expr -> expr'. Use the syntax 'for ... in ... do ... yield...' to generate elements in more complex sequence expressions. - /// (Originally from ..\FSComp.txt:436) + /// (Originally from ..\FSComp.txt:439) static member parsArrowUseIsLimited() = (596, GetStringFunc("parsArrowUseIsLimited",",,,") ) /// Successive arguments should be separated by spaces or tupled, and arguments involving function or method applications should be parenthesized - /// (Originally from ..\FSComp.txt:437) + /// (Originally from ..\FSComp.txt:440) static member parsSuccessiveArgsShouldBeSpacedOrTupled() = (597, GetStringFunc("parsSuccessiveArgsShouldBeSpacedOrTupled",",,,") ) /// Unmatched '[' - /// (Originally from ..\FSComp.txt:438) + /// (Originally from ..\FSComp.txt:441) static member parsUnmatchedBracket() = (598, GetStringFunc("parsUnmatchedBracket",",,,") ) /// Missing qualification after '.' - /// (Originally from ..\FSComp.txt:439) + /// (Originally from ..\FSComp.txt:442) static member parsMissingQualificationAfterDot() = (599, GetStringFunc("parsMissingQualificationAfterDot",",,,") ) /// In F# code you may use 'expr.[expr]'. A type annotation may be required to indicate the first expression is an array - /// (Originally from ..\FSComp.txt:440) + /// (Originally from ..\FSComp.txt:443) static member parsParenFormIsForML() = (GetStringFunc("parsParenFormIsForML",",,,") ) /// Mismatched quotation, beginning with '%s' - /// (Originally from ..\FSComp.txt:441) + /// (Originally from ..\FSComp.txt:444) static member parsMismatchedQuote(a0 : System.String) = (601, GetStringFunc("parsMismatchedQuote",",,,%s,,,") a0) /// Unmatched '%s' - /// (Originally from ..\FSComp.txt:442) + /// (Originally from ..\FSComp.txt:445) static member parsUnmatched(a0 : System.String) = (602, GetStringFunc("parsUnmatched",",,,%s,,,") a0) /// Unmatched '[|' - /// (Originally from ..\FSComp.txt:443) + /// (Originally from ..\FSComp.txt:446) static member parsUnmatchedBracketBar() = (603, GetStringFunc("parsUnmatchedBracketBar",",,,") ) /// Unmatched '{' - /// (Originally from ..\FSComp.txt:444) + /// (Originally from ..\FSComp.txt:447) static member parsUnmatchedBrace() = (604, GetStringFunc("parsUnmatchedBrace",",,,") ) /// Unmatched '{|' - /// (Originally from ..\FSComp.txt:445) + /// (Originally from ..\FSComp.txt:448) static member parsUnmatchedBraceBar() = (605, GetStringFunc("parsUnmatchedBraceBar",",,,") ) /// Field bindings must have the form 'id = expr;' - /// (Originally from ..\FSComp.txt:446) + /// (Originally from ..\FSComp.txt:449) static member parsFieldBinding() = (609, GetStringFunc("parsFieldBinding",",,,") ) /// This member is not permitted in an object implementation - /// (Originally from ..\FSComp.txt:447) + /// (Originally from ..\FSComp.txt:450) static member parsMemberIllegalInObjectImplementation() = (610, GetStringFunc("parsMemberIllegalInObjectImplementation",",,,") ) /// Missing function body - /// (Originally from ..\FSComp.txt:448) + /// (Originally from ..\FSComp.txt:451) static member parsMissingFunctionBody() = (611, GetStringFunc("parsMissingFunctionBody",",,,") ) /// Syntax error in labelled type argument - /// (Originally from ..\FSComp.txt:449) + /// (Originally from ..\FSComp.txt:452) static member parsSyntaxErrorInLabeledType() = (613, GetStringFunc("parsSyntaxErrorInLabeledType",",,,") ) /// Unexpected infix operator in type expression - /// (Originally from ..\FSComp.txt:450) + /// (Originally from ..\FSComp.txt:453) static member parsUnexpectedInfixOperator() = (615, GetStringFunc("parsUnexpectedInfixOperator",",,,") ) /// The syntax '(typ,...,typ) ident' is not used in F# code. Consider using 'ident' instead - /// (Originally from ..\FSComp.txt:451) + /// (Originally from ..\FSComp.txt:454) static member parsMultiArgumentGenericTypeFormDeprecated() = (GetStringFunc("parsMultiArgumentGenericTypeFormDeprecated",",,,") ) /// Invalid literal in type - /// (Originally from ..\FSComp.txt:452) + /// (Originally from ..\FSComp.txt:455) static member parsInvalidLiteralInType() = (618, GetStringFunc("parsInvalidLiteralInType",",,,") ) /// Unexpected infix operator in unit-of-measure expression. Legal operators are '*', '/' and '^'. - /// (Originally from ..\FSComp.txt:453) + /// (Originally from ..\FSComp.txt:456) static member parsUnexpectedOperatorForUnitOfMeasure() = (619, GetStringFunc("parsUnexpectedOperatorForUnitOfMeasure",",,,") ) /// Unexpected integer literal in unit-of-measure expression - /// (Originally from ..\FSComp.txt:454) + /// (Originally from ..\FSComp.txt:457) static member parsUnexpectedIntegerLiteralForUnitOfMeasure() = (620, GetStringFunc("parsUnexpectedIntegerLiteralForUnitOfMeasure",",,,") ) /// Syntax error: unexpected type parameter specification - /// (Originally from ..\FSComp.txt:455) + /// (Originally from ..\FSComp.txt:458) static member parsUnexpectedTypeParameter() = (621, GetStringFunc("parsUnexpectedTypeParameter",",,,") ) /// Mismatched quotation operator name, beginning with '%s' - /// (Originally from ..\FSComp.txt:456) + /// (Originally from ..\FSComp.txt:459) static member parsMismatchedQuotationName(a0 : System.String) = (622, GetStringFunc("parsMismatchedQuotationName",",,,%s,,,") a0) /// Active pattern case identifiers must begin with an uppercase letter - /// (Originally from ..\FSComp.txt:457) + /// (Originally from ..\FSComp.txt:460) static member parsActivePatternCaseMustBeginWithUpperCase() = (623, GetStringFunc("parsActivePatternCaseMustBeginWithUpperCase",",,,") ) /// The '|' character is not permitted in active pattern case identifiers - /// (Originally from ..\FSComp.txt:458) + /// (Originally from ..\FSComp.txt:461) static member parsActivePatternCaseContainsPipe() = (624, GetStringFunc("parsActivePatternCaseContainsPipe",",,,") ) /// Denominator must not be 0 in unit-of-measure exponent - /// (Originally from ..\FSComp.txt:459) + /// (Originally from ..\FSComp.txt:462) static member parsIllegalDenominatorForMeasureExponent() = (625, GetStringFunc("parsIllegalDenominatorForMeasureExponent",",,,") ) /// No '=' symbol should follow a 'namespace' declaration - /// (Originally from ..\FSComp.txt:460) + /// (Originally from ..\FSComp.txt:463) static member parsNoEqualShouldFollowNamespace() = (GetStringFunc("parsNoEqualShouldFollowNamespace",",,,") ) /// The syntax 'module ... = struct .. end' is not used in F# code. Consider using 'module ... = begin .. end' - /// (Originally from ..\FSComp.txt:461) + /// (Originally from ..\FSComp.txt:464) static member parsSyntaxModuleStructEndDeprecated() = (GetStringFunc("parsSyntaxModuleStructEndDeprecated",",,,") ) /// The syntax 'module ... : sig .. end' is not used in F# code. Consider using 'module ... = begin .. end' - /// (Originally from ..\FSComp.txt:462) + /// (Originally from ..\FSComp.txt:465) static member parsSyntaxModuleSigEndDeprecated() = (GetStringFunc("parsSyntaxModuleSigEndDeprecated",",,,") ) /// A static field was used where an instance field is expected - /// (Originally from ..\FSComp.txt:463) + /// (Originally from ..\FSComp.txt:466) static member tcStaticFieldUsedWhenInstanceFieldExpected() = (627, GetStringFunc("tcStaticFieldUsedWhenInstanceFieldExpected",",,,") ) /// Method '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:464) + /// (Originally from ..\FSComp.txt:467) static member tcMethodNotAccessible(a0 : System.String) = (629, GetStringFunc("tcMethodNotAccessible",",,,%s,,,") a0) /// Implicit product of measures following / - /// (Originally from ..\FSComp.txt:466) + /// (Originally from ..\FSComp.txt:469) static member tcImplicitMeasureFollowingSlash() = (632, GetStringFunc("tcImplicitMeasureFollowingSlash",",,,") ) /// Unexpected SynMeasure.Anon - /// (Originally from ..\FSComp.txt:467) + /// (Originally from ..\FSComp.txt:470) static member tcUnexpectedMeasureAnon() = (633, GetStringFunc("tcUnexpectedMeasureAnon",",,,") ) /// Non-zero constants cannot have generic units. For generic zero, write 0.0<_>. - /// (Originally from ..\FSComp.txt:468) + /// (Originally from ..\FSComp.txt:471) static member tcNonZeroConstantCannotHaveGenericUnit() = (634, GetStringFunc("tcNonZeroConstantCannotHaveGenericUnit",",,,") ) /// In sequence expressions, results are generated using 'yield' - /// (Originally from ..\FSComp.txt:469) + /// (Originally from ..\FSComp.txt:472) static member tcSeqResultsUseYield() = (635, GetStringFunc("tcSeqResultsUseYield",",,,") ) /// Unexpected big rational constant - /// (Originally from ..\FSComp.txt:470) + /// (Originally from ..\FSComp.txt:473) static member tcUnexpectedBigRationalConstant() = (GetStringFunc("tcUnexpectedBigRationalConstant",",,,") ) /// Units-of-measure supported only on float, float32, decimal and signed integer types - /// (Originally from ..\FSComp.txt:471) + /// (Originally from ..\FSComp.txt:474) static member tcInvalidTypeForUnitsOfMeasure() = (636, GetStringFunc("tcInvalidTypeForUnitsOfMeasure",",,,") ) /// Unexpected Const_uint16array - /// (Originally from ..\FSComp.txt:472) + /// (Originally from ..\FSComp.txt:475) static member tcUnexpectedConstUint16Array() = (GetStringFunc("tcUnexpectedConstUint16Array",",,,") ) /// Unexpected Const_bytearray - /// (Originally from ..\FSComp.txt:473) + /// (Originally from ..\FSComp.txt:476) static member tcUnexpectedConstByteArray() = (GetStringFunc("tcUnexpectedConstByteArray",",,,") ) /// A parameter with attributes must also be given a name, e.g. '[] Name : Type' - /// (Originally from ..\FSComp.txt:474) + /// (Originally from ..\FSComp.txt:477) static member tcParameterRequiresName() = (640, GetStringFunc("tcParameterRequiresName",",,,") ) /// Return values cannot have names - /// (Originally from ..\FSComp.txt:475) + /// (Originally from ..\FSComp.txt:478) static member tcReturnValuesCannotHaveNames() = (641, GetStringFunc("tcReturnValuesCannotHaveNames",",,,") ) /// MemberKind.PropertyGetSet only expected in parse trees - /// (Originally from ..\FSComp.txt:476) + /// (Originally from ..\FSComp.txt:479) static member tcMemberKindPropertyGetSetNotExpected() = (GetStringFunc("tcMemberKindPropertyGetSetNotExpected",",,,") ) /// Namespaces cannot contain values. Consider using a module to hold your value declarations. - /// (Originally from ..\FSComp.txt:477) + /// (Originally from ..\FSComp.txt:480) static member tcNamespaceCannotContainValues() = (201, GetStringFunc("tcNamespaceCannotContainValues",",,,") ) /// Namespaces cannot contain extension members except in the same file and namespace declaration group where the type is defined. Consider using a module to hold declarations of extension members. - /// (Originally from ..\FSComp.txt:478) + /// (Originally from ..\FSComp.txt:481) static member tcNamespaceCannotContainExtensionMembers() = (644, GetStringFunc("tcNamespaceCannotContainExtensionMembers",",,,") ) /// Multiple visibility attributes have been specified for this identifier - /// (Originally from ..\FSComp.txt:479) + /// (Originally from ..\FSComp.txt:482) static member tcMultipleVisibilityAttributes() = (645, GetStringFunc("tcMultipleVisibilityAttributes",",,,") ) /// Multiple visibility attributes have been specified for this identifier. 'let' bindings in classes are always private, as are any 'let' bindings inside expressions. - /// (Originally from ..\FSComp.txt:480) + /// (Originally from ..\FSComp.txt:483) static member tcMultipleVisibilityAttributesWithLet() = (646, GetStringFunc("tcMultipleVisibilityAttributesWithLet",",,,") ) /// The name '(%s)' should not be used as a member name. To define comparison semantics for a type, implement the 'System.IComparable' interface. If defining a static member for use from other CLI languages then use the name '%s' instead. - /// (Originally from ..\FSComp.txt:481) + /// (Originally from ..\FSComp.txt:484) static member tcInvalidMethodNameForRelationalOperator(a0 : System.String, a1 : System.String) = (GetStringFunc("tcInvalidMethodNameForRelationalOperator",",,,%s,,,%s,,,") a0 a1) /// The name '(%s)' should not be used as a member name. To define equality semantics for a type, override the 'Object.Equals' member. If defining a static member for use from other CLI languages then use the name '%s' instead. - /// (Originally from ..\FSComp.txt:482) + /// (Originally from ..\FSComp.txt:485) static member tcInvalidMethodNameForEquality(a0 : System.String, a1 : System.String) = (GetStringFunc("tcInvalidMethodNameForEquality",",,,%s,,,%s,,,") a0 a1) /// The name '(%s)' should not be used as a member name. If defining a static member for use from other CLI languages then use the name '%s' instead. - /// (Originally from ..\FSComp.txt:483) + /// (Originally from ..\FSComp.txt:486) static member tcInvalidMemberName(a0 : System.String, a1 : System.String) = (GetStringFunc("tcInvalidMemberName",",,,%s,,,%s,,,") a0 a1) /// The name '(%s)' should not be used as a member name because it is given a standard definition in the F# library over fixed types - /// (Originally from ..\FSComp.txt:484) + /// (Originally from ..\FSComp.txt:487) static member tcInvalidMemberNameFixedTypes(a0 : System.String) = (GetStringFunc("tcInvalidMemberNameFixedTypes",",,,%s,,,") a0) /// The '%s' operator should not normally be redefined. To define overloaded comparison semantics for a particular type, implement the 'System.IComparable' interface in the definition of that type. - /// (Originally from ..\FSComp.txt:485) + /// (Originally from ..\FSComp.txt:488) static member tcInvalidOperatorDefinitionRelational(a0 : System.String) = (GetStringFunc("tcInvalidOperatorDefinitionRelational",",,,%s,,,") a0) /// The '%s' operator should not normally be redefined. To define equality semantics for a type, override the 'Object.Equals' member in the definition of that type. - /// (Originally from ..\FSComp.txt:486) + /// (Originally from ..\FSComp.txt:489) static member tcInvalidOperatorDefinitionEquality(a0 : System.String) = (GetStringFunc("tcInvalidOperatorDefinitionEquality",",,,%s,,,") a0) /// The '%s' operator should not normally be redefined. Consider using a different operator name - /// (Originally from ..\FSComp.txt:487) + /// (Originally from ..\FSComp.txt:490) static member tcInvalidOperatorDefinition(a0 : System.String) = (GetStringFunc("tcInvalidOperatorDefinition",",,,%s,,,") a0) /// The '%s' operator cannot be redefined. Consider using a different operator name - /// (Originally from ..\FSComp.txt:488) + /// (Originally from ..\FSComp.txt:491) static member tcInvalidIndexOperatorDefinition(a0 : System.String) = (GetStringFunc("tcInvalidIndexOperatorDefinition",",,,%s,,,") a0) /// Expected module or namespace parent %s - /// (Originally from ..\FSComp.txt:489) + /// (Originally from ..\FSComp.txt:492) static member tcExpectModuleOrNamespaceParent(a0 : System.String) = (GetStringFunc("tcExpectModuleOrNamespaceParent",",,,%s,,,") a0) /// The struct, record or union type '%s' implements the interface 'System.IComparable' explicitly. You must apply the 'CustomComparison' attribute to the type. - /// (Originally from ..\FSComp.txt:490) + /// (Originally from ..\FSComp.txt:493) static member tcImplementsIComparableExplicitly(a0 : System.String) = (647, GetStringFunc("tcImplementsIComparableExplicitly",",,,%s,,,") a0) /// The struct, record or union type '%s' implements the interface 'System.IComparable<_>' explicitly. You must apply the 'CustomComparison' attribute to the type, and should also provide a consistent implementation of the non-generic interface System.IComparable. - /// (Originally from ..\FSComp.txt:491) + /// (Originally from ..\FSComp.txt:494) static member tcImplementsGenericIComparableExplicitly(a0 : System.String) = (648, GetStringFunc("tcImplementsGenericIComparableExplicitly",",,,%s,,,") a0) /// The struct, record or union type '%s' implements the interface 'System.IStructuralComparable' explicitly. Apply the 'CustomComparison' attribute to the type. - /// (Originally from ..\FSComp.txt:492) + /// (Originally from ..\FSComp.txt:495) static member tcImplementsIStructuralComparableExplicitly(a0 : System.String) = (649, GetStringFunc("tcImplementsIStructuralComparableExplicitly",",,,%s,,,") a0) /// This record contains fields from inconsistent types - /// (Originally from ..\FSComp.txt:493) + /// (Originally from ..\FSComp.txt:496) static member tcRecordFieldInconsistentTypes() = (656, GetStringFunc("tcRecordFieldInconsistentTypes",",,,") ) /// DLLImport stubs cannot be inlined - /// (Originally from ..\FSComp.txt:494) + /// (Originally from ..\FSComp.txt:497) static member tcDllImportStubsCannotBeInlined() = (657, GetStringFunc("tcDllImportStubsCannotBeInlined",",,,") ) /// Structs may only bind a 'this' parameter at member declarations - /// (Originally from ..\FSComp.txt:495) + /// (Originally from ..\FSComp.txt:498) static member tcStructsCanOnlyBindThisAtMemberDeclaration() = (658, GetStringFunc("tcStructsCanOnlyBindThisAtMemberDeclaration",",,,") ) /// Unexpected expression at recursive inference point - /// (Originally from ..\FSComp.txt:496) + /// (Originally from ..\FSComp.txt:499) static member tcUnexpectedExprAtRecInfPoint() = (659, GetStringFunc("tcUnexpectedExprAtRecInfPoint",",,,") ) /// This code is less generic than required by its annotations because the explicit type variable '%s' could not be generalized. It was constrained to be '%s'. - /// (Originally from ..\FSComp.txt:497) + /// (Originally from ..\FSComp.txt:500) static member tcLessGenericBecauseOfAnnotation(a0 : System.String, a1 : System.String) = (660, GetStringFunc("tcLessGenericBecauseOfAnnotation",",,,%s,,,%s,,,") a0 a1) /// One or more of the explicit class or function type variables for this binding could not be generalized, because they were constrained to other types - /// (Originally from ..\FSComp.txt:498) + /// (Originally from ..\FSComp.txt:501) static member tcConstrainedTypeVariableCannotBeGeneralized() = (661, GetStringFunc("tcConstrainedTypeVariableCannotBeGeneralized",",,,") ) /// A generic type parameter has been used in a way that constrains it to always be '%s' - /// (Originally from ..\FSComp.txt:499) + /// (Originally from ..\FSComp.txt:502) static member tcGenericParameterHasBeenConstrained(a0 : System.String) = (662, GetStringFunc("tcGenericParameterHasBeenConstrained",",,,%s,,,") a0) /// This type parameter has been used in a way that constrains it to always be '%s' - /// (Originally from ..\FSComp.txt:500) + /// (Originally from ..\FSComp.txt:503) static member tcTypeParameterHasBeenConstrained(a0 : System.String) = (663, GetStringFunc("tcTypeParameterHasBeenConstrained",",,,%s,,,") a0) /// The type parameters inferred for this value are not stable under the erasure of type abbreviations. This is due to the use of type abbreviations which drop or reorder type parameters, e.g. \n\ttype taggedInt<'a> = int or\n\ttype swap<'a,'b> = 'b * 'a.\nConsider declaring the type parameters for this value explicitly, e.g.\n\tlet f<'a,'b> ((x,y) : swap<'b,'a>) : swap<'a,'b> = (y,x). - /// (Originally from ..\FSComp.txt:501) + /// (Originally from ..\FSComp.txt:504) static member tcTypeParametersInferredAreNotStable() = (664, GetStringFunc("tcTypeParametersInferredAreNotStable",",,,") ) /// Explicit type parameters may only be used on module or member bindings - /// (Originally from ..\FSComp.txt:502) + /// (Originally from ..\FSComp.txt:505) static member tcExplicitTypeParameterInvalid() = (665, GetStringFunc("tcExplicitTypeParameterInvalid",",,,") ) /// You must explicitly declare either all or no type parameters when overriding a generic abstract method - /// (Originally from ..\FSComp.txt:503) + /// (Originally from ..\FSComp.txt:506) static member tcOverridingMethodRequiresAllOrNoTypeParameters() = (666, GetStringFunc("tcOverridingMethodRequiresAllOrNoTypeParameters",",,,") ) /// The field labels and expected type of this record expression or pattern do not uniquely determine a corresponding record type - /// (Originally from ..\FSComp.txt:504) + /// (Originally from ..\FSComp.txt:507) static member tcFieldsDoNotDetermineUniqueRecordType() = (667, GetStringFunc("tcFieldsDoNotDetermineUniqueRecordType",",,,") ) /// The field '%s' appears twice in this record expression or pattern - /// (Originally from ..\FSComp.txt:505) + /// (Originally from ..\FSComp.txt:508) static member tcFieldAppearsTwiceInRecord(a0 : System.String) = (668, GetStringFunc("tcFieldAppearsTwiceInRecord",",,,%s,,,") a0) /// Unknown union case - /// (Originally from ..\FSComp.txt:506) + /// (Originally from ..\FSComp.txt:509) static member tcUnknownUnion() = (669, GetStringFunc("tcUnknownUnion",",,,") ) /// This code is not sufficiently generic. The type variable %s could not be generalized because it would escape its scope. - /// (Originally from ..\FSComp.txt:507) + /// (Originally from ..\FSComp.txt:510) static member tcNotSufficientlyGenericBecauseOfScope(a0 : System.String) = (670, GetStringFunc("tcNotSufficientlyGenericBecauseOfScope",",,,%s,,,") a0) /// A property cannot have explicit type parameters. Consider using a method instead. - /// (Originally from ..\FSComp.txt:508) + /// (Originally from ..\FSComp.txt:511) static member tcPropertyRequiresExplicitTypeParameters() = (671, GetStringFunc("tcPropertyRequiresExplicitTypeParameters",",,,") ) /// A constructor cannot have explicit type parameters. Consider using a static construction method instead. - /// (Originally from ..\FSComp.txt:509) + /// (Originally from ..\FSComp.txt:512) static member tcConstructorCannotHaveTypeParameters() = (672, GetStringFunc("tcConstructorCannotHaveTypeParameters",",,,") ) /// This instance member needs a parameter to represent the object being invoked. Make the member static or use the notation 'member x.Member(args) = ...'. - /// (Originally from ..\FSComp.txt:510) + /// (Originally from ..\FSComp.txt:513) static member tcInstanceMemberRequiresTarget() = (673, GetStringFunc("tcInstanceMemberRequiresTarget",",,,") ) /// Unexpected source-level property specification in syntax tree - /// (Originally from ..\FSComp.txt:511) + /// (Originally from ..\FSComp.txt:514) static member tcUnexpectedPropertyInSyntaxTree() = (674, GetStringFunc("tcUnexpectedPropertyInSyntaxTree",",,,") ) /// A static initializer requires an argument - /// (Originally from ..\FSComp.txt:512) + /// (Originally from ..\FSComp.txt:515) static member tcStaticInitializerRequiresArgument() = (675, GetStringFunc("tcStaticInitializerRequiresArgument",",,,") ) /// An object constructor requires an argument - /// (Originally from ..\FSComp.txt:513) + /// (Originally from ..\FSComp.txt:516) static member tcObjectConstructorRequiresArgument() = (676, GetStringFunc("tcObjectConstructorRequiresArgument",",,,") ) /// This static member should not have a 'this' parameter. Consider using the notation 'member Member(args) = ...'. - /// (Originally from ..\FSComp.txt:514) + /// (Originally from ..\FSComp.txt:517) static member tcStaticMemberShouldNotHaveThis() = (677, GetStringFunc("tcStaticMemberShouldNotHaveThis",",,,") ) /// An explicit static initializer should use the syntax 'static new(args) = expr' - /// (Originally from ..\FSComp.txt:515) + /// (Originally from ..\FSComp.txt:518) static member tcExplicitStaticInitializerSyntax() = (678, GetStringFunc("tcExplicitStaticInitializerSyntax",",,,") ) /// An explicit object constructor should use the syntax 'new(args) = expr' - /// (Originally from ..\FSComp.txt:516) + /// (Originally from ..\FSComp.txt:519) static member tcExplicitObjectConstructorSyntax() = (679, GetStringFunc("tcExplicitObjectConstructorSyntax",",,,") ) /// Unexpected source-level property specification - /// (Originally from ..\FSComp.txt:517) + /// (Originally from ..\FSComp.txt:520) static member tcUnexpectedPropertySpec() = (680, GetStringFunc("tcUnexpectedPropertySpec",",,,") ) /// This form of object expression is not used in F#. Use 'member this.MemberName ... = ...' to define member implementations in object expressions. - /// (Originally from ..\FSComp.txt:518) + /// (Originally from ..\FSComp.txt:521) static member tcObjectExpressionFormDeprecated() = (GetStringFunc("tcObjectExpressionFormDeprecated",",,,") ) /// Invalid declaration - /// (Originally from ..\FSComp.txt:519) + /// (Originally from ..\FSComp.txt:522) static member tcInvalidDeclaration() = (682, GetStringFunc("tcInvalidDeclaration",",,,") ) /// Attributes are not allowed within patterns - /// (Originally from ..\FSComp.txt:520) + /// (Originally from ..\FSComp.txt:523) static member tcAttributesInvalidInPatterns() = (683, GetStringFunc("tcAttributesInvalidInPatterns",",,,") ) /// The generic function '%s' must be given explicit type argument(s) - /// (Originally from ..\FSComp.txt:521) + /// (Originally from ..\FSComp.txt:524) static member tcFunctionRequiresExplicitTypeArguments(a0 : System.String) = (685, GetStringFunc("tcFunctionRequiresExplicitTypeArguments",",,,%s,,,") a0) /// The method or function '%s' should not be given explicit type argument(s) because it does not declare its type parameters explicitly - /// (Originally from ..\FSComp.txt:522) + /// (Originally from ..\FSComp.txt:525) static member tcDoesNotAllowExplicitTypeArguments(a0 : System.String) = (686, GetStringFunc("tcDoesNotAllowExplicitTypeArguments",",,,%s,,,") a0) /// This value, type or method expects %d type parameter(s) but was given %d - /// (Originally from ..\FSComp.txt:523) + /// (Originally from ..\FSComp.txt:526) static member tcTypeParameterArityMismatch(a0 : System.Int32, a1 : System.Int32) = (687, GetStringFunc("tcTypeParameterArityMismatch",",,,%d,,,%d,,,") a0 a1) /// The default, zero-initializing constructor of a struct type may only be used if all the fields of the struct type admit default initialization - /// (Originally from ..\FSComp.txt:524) + /// (Originally from ..\FSComp.txt:527) static member tcDefaultStructConstructorCall() = (688, GetStringFunc("tcDefaultStructConstructorCall",",,,") ) /// Couldn't find Dispose on IDisposable, or it was overloaded - /// (Originally from ..\FSComp.txt:525) + /// (Originally from ..\FSComp.txt:528) static member tcCouldNotFindIDisposable() = (GetStringFunc("tcCouldNotFindIDisposable",",,,") ) /// This value is not a literal and cannot be used in a pattern - /// (Originally from ..\FSComp.txt:526) + /// (Originally from ..\FSComp.txt:529) static member tcNonLiteralCannotBeUsedInPattern() = (689, GetStringFunc("tcNonLiteralCannotBeUsedInPattern",",,,") ) /// This field is readonly - /// (Originally from ..\FSComp.txt:527) + /// (Originally from ..\FSComp.txt:530) static member tcFieldIsReadonly() = (690, GetStringFunc("tcFieldIsReadonly",",,,") ) /// Named arguments must appear after all other arguments - /// (Originally from ..\FSComp.txt:528) + /// (Originally from ..\FSComp.txt:531) static member tcNameArgumentsMustAppearLast() = (691, GetStringFunc("tcNameArgumentsMustAppearLast",",,,") ) /// This function value is being used to construct a delegate type whose signature includes a byref argument. You must use an explicit lambda expression taking %d arguments. - /// (Originally from ..\FSComp.txt:529) + /// (Originally from ..\FSComp.txt:532) static member tcFunctionRequiresExplicitLambda(a0 : System.Int32) = (692, GetStringFunc("tcFunctionRequiresExplicitLambda",",,,%d,,,") a0) /// The type '%s' is not a type whose values can be enumerated with this syntax, i.e. is not compatible with either seq<_>, IEnumerable<_> or IEnumerable and does not have a GetEnumerator method - /// (Originally from ..\FSComp.txt:530) + /// (Originally from ..\FSComp.txt:533) static member tcTypeCannotBeEnumerated(a0 : System.String) = (693, GetStringFunc("tcTypeCannotBeEnumerated",",,,%s,,,") a0) /// This recursive binding uses an invalid mixture of recursive forms - /// (Originally from ..\FSComp.txt:531) + /// (Originally from ..\FSComp.txt:534) static member tcInvalidMixtureOfRecursiveForms() = (695, GetStringFunc("tcInvalidMixtureOfRecursiveForms",",,,") ) /// This is not a valid object construction expression. Explicit object constructors must either call an alternate constructor or initialize all fields of the object and specify a call to a super class constructor. - /// (Originally from ..\FSComp.txt:532) + /// (Originally from ..\FSComp.txt:535) static member tcInvalidObjectConstructionExpression() = (696, GetStringFunc("tcInvalidObjectConstructionExpression",",,,") ) /// Invalid constraint - /// (Originally from ..\FSComp.txt:533) + /// (Originally from ..\FSComp.txt:536) static member tcInvalidConstraint() = (697, GetStringFunc("tcInvalidConstraint",",,,") ) /// Invalid constraint: the type used for the constraint is sealed, which means the constraint could only be satisfied by at most one solution - /// (Originally from ..\FSComp.txt:534) + /// (Originally from ..\FSComp.txt:537) static member tcInvalidConstraintTypeSealed() = (698, GetStringFunc("tcInvalidConstraintTypeSealed",",,,") ) /// An 'enum' constraint must be of the form 'enum' - /// (Originally from ..\FSComp.txt:535) + /// (Originally from ..\FSComp.txt:538) static member tcInvalidEnumConstraint() = (699, GetStringFunc("tcInvalidEnumConstraint",",,,") ) /// 'new' constraints must take one argument of type 'unit' and return the constructed type - /// (Originally from ..\FSComp.txt:536) + /// (Originally from ..\FSComp.txt:539) static member tcInvalidNewConstraint() = (700, GetStringFunc("tcInvalidNewConstraint",",,,") ) /// This property has an invalid type. Properties taking multiple indexer arguments should have types of the form 'ty1 * ty2 -> ty3'. Properties returning functions should have types of the form '(ty1 -> ty2)'. - /// (Originally from ..\FSComp.txt:537) + /// (Originally from ..\FSComp.txt:540) static member tcInvalidPropertyType() = (701, GetStringFunc("tcInvalidPropertyType",",,,") ) /// Expected unit-of-measure parameter, not type parameter. Explicit unit-of-measure parameters must be marked with the [] attribute. - /// (Originally from ..\FSComp.txt:538) + /// (Originally from ..\FSComp.txt:541) static member tcExpectedUnitOfMeasureMarkWithAttribute() = (702, GetStringFunc("tcExpectedUnitOfMeasureMarkWithAttribute",",,,") ) /// Expected type parameter, not unit-of-measure parameter - /// (Originally from ..\FSComp.txt:539) + /// (Originally from ..\FSComp.txt:542) static member tcExpectedTypeParameter() = (703, GetStringFunc("tcExpectedTypeParameter",",,,") ) /// Expected type, not unit-of-measure - /// (Originally from ..\FSComp.txt:540) + /// (Originally from ..\FSComp.txt:543) static member tcExpectedTypeNotUnitOfMeasure() = (704, GetStringFunc("tcExpectedTypeNotUnitOfMeasure",",,,") ) /// Expected unit-of-measure, not type - /// (Originally from ..\FSComp.txt:541) + /// (Originally from ..\FSComp.txt:544) static member tcExpectedUnitOfMeasureNotType() = (705, GetStringFunc("tcExpectedUnitOfMeasureNotType",",,,") ) /// Units-of-measure cannot be used as prefix arguments to a type. Rewrite as postfix arguments in angle brackets. - /// (Originally from ..\FSComp.txt:542) + /// (Originally from ..\FSComp.txt:545) static member tcInvalidUnitsOfMeasurePrefix() = (706, GetStringFunc("tcInvalidUnitsOfMeasurePrefix",",,,") ) /// Unit-of-measure cannot be used in type constructor application - /// (Originally from ..\FSComp.txt:543) + /// (Originally from ..\FSComp.txt:546) static member tcUnitsOfMeasureInvalidInTypeConstructor() = (707, GetStringFunc("tcUnitsOfMeasureInvalidInTypeConstructor",",,,") ) /// This control construct may only be used if the computation expression builder defines a '%s' method - /// (Originally from ..\FSComp.txt:544) + /// (Originally from ..\FSComp.txt:547) static member tcRequireBuilderMethod(a0 : System.String) = (708, GetStringFunc("tcRequireBuilderMethod",",,,%s,,,") a0) /// This type has no nested types - /// (Originally from ..\FSComp.txt:545) + /// (Originally from ..\FSComp.txt:548) static member tcTypeHasNoNestedTypes() = (709, GetStringFunc("tcTypeHasNoNestedTypes",",,,") ) /// Unexpected %s in type expression - /// (Originally from ..\FSComp.txt:546) + /// (Originally from ..\FSComp.txt:549) static member tcUnexpectedSymbolInTypeExpression(a0 : System.String) = (711, GetStringFunc("tcUnexpectedSymbolInTypeExpression",",,,%s,,,") a0) /// Type parameter cannot be used as type constructor - /// (Originally from ..\FSComp.txt:547) + /// (Originally from ..\FSComp.txt:550) static member tcTypeParameterInvalidAsTypeConstructor() = (712, GetStringFunc("tcTypeParameterInvalidAsTypeConstructor",",,,") ) /// Illegal syntax in type expression - /// (Originally from ..\FSComp.txt:548) + /// (Originally from ..\FSComp.txt:551) static member tcIllegalSyntaxInTypeExpression() = (713, GetStringFunc("tcIllegalSyntaxInTypeExpression",",,,") ) /// Anonymous unit-of-measure cannot be nested inside another unit-of-measure expression - /// (Originally from ..\FSComp.txt:549) + /// (Originally from ..\FSComp.txt:552) static member tcAnonymousUnitsOfMeasureCannotBeNested() = (714, GetStringFunc("tcAnonymousUnitsOfMeasureCannotBeNested",",,,") ) /// Anonymous type variables are not permitted in this declaration - /// (Originally from ..\FSComp.txt:550) + /// (Originally from ..\FSComp.txt:553) static member tcAnonymousTypeInvalidInDeclaration() = (715, GetStringFunc("tcAnonymousTypeInvalidInDeclaration",",,,") ) /// Unexpected / in type - /// (Originally from ..\FSComp.txt:551) + /// (Originally from ..\FSComp.txt:554) static member tcUnexpectedSlashInType() = (716, GetStringFunc("tcUnexpectedSlashInType",",,,") ) /// Unexpected type arguments - /// (Originally from ..\FSComp.txt:552) + /// (Originally from ..\FSComp.txt:555) static member tcUnexpectedTypeArguments() = (717, GetStringFunc("tcUnexpectedTypeArguments",",,,") ) /// Optional arguments are only permitted on type members - /// (Originally from ..\FSComp.txt:553) + /// (Originally from ..\FSComp.txt:556) static member tcOptionalArgsOnlyOnMembers() = (718, GetStringFunc("tcOptionalArgsOnlyOnMembers",",,,") ) /// Name '%s' not bound in pattern context - /// (Originally from ..\FSComp.txt:554) + /// (Originally from ..\FSComp.txt:557) static member tcNameNotBoundInPattern(a0 : System.String) = (719, GetStringFunc("tcNameNotBoundInPattern",",,,%s,,,") a0) /// Non-primitive numeric literal constants cannot be used in pattern matches because they can be mapped to multiple different types through the use of a NumericLiteral module. Consider using replacing with a variable, and use 'when = ' at the end of the match clause. - /// (Originally from ..\FSComp.txt:555) + /// (Originally from ..\FSComp.txt:558) static member tcInvalidNonPrimitiveLiteralInPatternMatch() = (720, GetStringFunc("tcInvalidNonPrimitiveLiteralInPatternMatch",",,,") ) /// Type arguments cannot be specified here - /// (Originally from ..\FSComp.txt:556) + /// (Originally from ..\FSComp.txt:559) static member tcInvalidTypeArgumentUsage() = (721, GetStringFunc("tcInvalidTypeArgumentUsage",",,,") ) /// Only active patterns returning exactly one result may accept arguments - /// (Originally from ..\FSComp.txt:557) + /// (Originally from ..\FSComp.txt:560) static member tcRequireActivePatternWithOneResult() = (722, GetStringFunc("tcRequireActivePatternWithOneResult",",,,") ) /// Invalid argument to parameterized pattern label - /// (Originally from ..\FSComp.txt:558) + /// (Originally from ..\FSComp.txt:561) static member tcInvalidArgForParameterizedPattern() = (723, GetStringFunc("tcInvalidArgForParameterizedPattern",",,,") ) /// Internal error. Invalid index into active pattern array - /// (Originally from ..\FSComp.txt:559) + /// (Originally from ..\FSComp.txt:562) static member tcInvalidIndexIntoActivePatternArray() = (724, GetStringFunc("tcInvalidIndexIntoActivePatternArray",",,,") ) /// This union case does not take arguments - /// (Originally from ..\FSComp.txt:560) + /// (Originally from ..\FSComp.txt:563) static member tcUnionCaseDoesNotTakeArguments() = (725, GetStringFunc("tcUnionCaseDoesNotTakeArguments",",,,") ) /// This union case takes one argument - /// (Originally from ..\FSComp.txt:561) + /// (Originally from ..\FSComp.txt:564) static member tcUnionCaseRequiresOneArgument() = (726, GetStringFunc("tcUnionCaseRequiresOneArgument",",,,") ) /// This union case expects %d arguments in tupled form - /// (Originally from ..\FSComp.txt:562) + /// (Originally from ..\FSComp.txt:565) static member tcUnionCaseExpectsTupledArguments(a0 : System.Int32) = (727, GetStringFunc("tcUnionCaseExpectsTupledArguments",",,,%d,,,") a0) /// Field '%s' is not static - /// (Originally from ..\FSComp.txt:563) + /// (Originally from ..\FSComp.txt:566) static member tcFieldIsNotStatic(a0 : System.String) = (728, GetStringFunc("tcFieldIsNotStatic",",,,%s,,,") a0) /// This field is not a literal and cannot be used in a pattern - /// (Originally from ..\FSComp.txt:564) + /// (Originally from ..\FSComp.txt:567) static member tcFieldNotLiteralCannotBeUsedInPattern() = (729, GetStringFunc("tcFieldNotLiteralCannotBeUsedInPattern",",,,") ) /// This is not a variable, constant, active recognizer or literal - /// (Originally from ..\FSComp.txt:565) + /// (Originally from ..\FSComp.txt:568) static member tcRequireVarConstRecogOrLiteral() = (730, GetStringFunc("tcRequireVarConstRecogOrLiteral",",,,") ) /// This is not a valid pattern - /// (Originally from ..\FSComp.txt:566) + /// (Originally from ..\FSComp.txt:569) static member tcInvalidPattern() = (731, GetStringFunc("tcInvalidPattern",",,,") ) /// Character range matches have been removed in F#. Consider using a 'when' pattern guard instead. - /// (Originally from ..\FSComp.txt:567) + /// (Originally from ..\FSComp.txt:570) static member tcUseWhenPatternGuard() = (GetStringFunc("tcUseWhenPatternGuard",",,,") ) /// Illegal pattern - /// (Originally from ..\FSComp.txt:568) + /// (Originally from ..\FSComp.txt:571) static member tcIllegalPattern() = (733, GetStringFunc("tcIllegalPattern",",,,") ) /// Syntax error - unexpected '?' symbol - /// (Originally from ..\FSComp.txt:569) + /// (Originally from ..\FSComp.txt:572) static member tcSyntaxErrorUnexpectedQMark() = (734, GetStringFunc("tcSyntaxErrorUnexpectedQMark",",,,") ) /// Expected %d expressions, got %d - /// (Originally from ..\FSComp.txt:570) + /// (Originally from ..\FSComp.txt:573) static member tcExpressionCountMisMatch(a0 : System.Int32, a1 : System.Int32) = (735, GetStringFunc("tcExpressionCountMisMatch",",,,%d,,,%d,,,") a0 a1) /// TcExprUndelayed: delayed - /// (Originally from ..\FSComp.txt:571) + /// (Originally from ..\FSComp.txt:574) static member tcExprUndelayed() = (736, GetStringFunc("tcExprUndelayed",",,,") ) /// This expression form may only be used in sequence and computation expressions - /// (Originally from ..\FSComp.txt:572) + /// (Originally from ..\FSComp.txt:575) static member tcExpressionRequiresSequence() = (737, GetStringFunc("tcExpressionRequiresSequence",",,,") ) /// Invalid object expression. Objects without overrides or interfaces should use the expression form 'new Type(args)' without braces. - /// (Originally from ..\FSComp.txt:573) + /// (Originally from ..\FSComp.txt:576) static member tcInvalidObjectExpressionSyntaxForm() = (738, GetStringFunc("tcInvalidObjectExpressionSyntaxForm",",,,") ) /// Invalid object, sequence or record expression - /// (Originally from ..\FSComp.txt:574) + /// (Originally from ..\FSComp.txt:577) static member tcInvalidObjectSequenceOrRecordExpression() = (739, GetStringFunc("tcInvalidObjectSequenceOrRecordExpression",",,,") ) /// Invalid record, sequence or computation expression. Sequence expressions should be of the form 'seq { ... }' - /// (Originally from ..\FSComp.txt:575) + /// (Originally from ..\FSComp.txt:578) static member tcInvalidSequenceExpressionSyntaxForm() = (740, GetStringFunc("tcInvalidSequenceExpressionSyntaxForm",",,,") ) /// This list or array expression includes an element of the form 'if ... then ... else'. Parenthesize this expression to indicate it is an individual element of the list or array, to disambiguate this from a list generated using a sequence expression - /// (Originally from ..\FSComp.txt:576) + /// (Originally from ..\FSComp.txt:579) static member tcExpressionWithIfRequiresParenthesis() = (GetStringFunc("tcExpressionWithIfRequiresParenthesis",",,,") ) /// Unable to parse format string '%s' - /// (Originally from ..\FSComp.txt:577) + /// (Originally from ..\FSComp.txt:580) static member tcUnableToParseFormatString(a0 : System.String) = (741, GetStringFunc("tcUnableToParseFormatString",",,,%s,,,") a0) /// This list expression exceeds the maximum size for list literals. Use an array for larger literals and call Array.ToList. - /// (Originally from ..\FSComp.txt:578) + /// (Originally from ..\FSComp.txt:581) static member tcListLiteralMaxSize() = (742, GetStringFunc("tcListLiteralMaxSize",",,,") ) /// The expression form 'expr then expr' may only be used as part of an explicit object constructor - /// (Originally from ..\FSComp.txt:579) + /// (Originally from ..\FSComp.txt:582) static member tcExpressionFormRequiresObjectConstructor() = (743, GetStringFunc("tcExpressionFormRequiresObjectConstructor",",,,") ) /// Named arguments cannot be given to member trait calls - /// (Originally from ..\FSComp.txt:580) + /// (Originally from ..\FSComp.txt:583) static member tcNamedArgumentsCannotBeUsedInMemberTraits() = (744, GetStringFunc("tcNamedArgumentsCannotBeUsedInMemberTraits",",,,") ) /// This is not a valid name for an enumeration case - /// (Originally from ..\FSComp.txt:581) + /// (Originally from ..\FSComp.txt:584) static member tcNotValidEnumCaseName() = (745, GetStringFunc("tcNotValidEnumCaseName",",,,") ) /// This field is not mutable - /// (Originally from ..\FSComp.txt:582) + /// (Originally from ..\FSComp.txt:585) static member tcFieldIsNotMutable() = (746, GetStringFunc("tcFieldIsNotMutable",",,,") ) /// This construct may only be used within list, array and sequence expressions, e.g. expressions of the form 'seq { ... }', '[ ... ]' or '[| ... |]'. These use the syntax 'for ... in ... do ... yield...' to generate elements - /// (Originally from ..\FSComp.txt:583) + /// (Originally from ..\FSComp.txt:586) static member tcConstructRequiresListArrayOrSequence() = (747, GetStringFunc("tcConstructRequiresListArrayOrSequence",",,,") ) /// This construct may only be used within computation expressions. To return a value from an ordinary function simply write the expression without 'return'. - /// (Originally from ..\FSComp.txt:584) + /// (Originally from ..\FSComp.txt:587) static member tcConstructRequiresComputationExpressions() = (748, GetStringFunc("tcConstructRequiresComputationExpressions",",,,") ) /// This construct may only be used within sequence or computation expressions - /// (Originally from ..\FSComp.txt:585) + /// (Originally from ..\FSComp.txt:588) static member tcConstructRequiresSequenceOrComputations() = (749, GetStringFunc("tcConstructRequiresSequenceOrComputations",",,,") ) /// This construct may only be used within computation expressions - /// (Originally from ..\FSComp.txt:586) + /// (Originally from ..\FSComp.txt:589) static member tcConstructRequiresComputationExpression() = (750, GetStringFunc("tcConstructRequiresComputationExpression",",,,") ) /// Invalid indexer expression - /// (Originally from ..\FSComp.txt:587) + /// (Originally from ..\FSComp.txt:590) static member tcInvalidIndexerExpression() = (751, GetStringFunc("tcInvalidIndexerExpression",",,,") ) /// The operator 'expr.[idx]' has been used on an object of indeterminate type based on information prior to this program point. Consider adding further type constraints - /// (Originally from ..\FSComp.txt:588) + /// (Originally from ..\FSComp.txt:591) static member tcObjectOfIndeterminateTypeUsedRequireTypeConstraint() = (752, GetStringFunc("tcObjectOfIndeterminateTypeUsedRequireTypeConstraint",",,,") ) /// Cannot inherit from a variable type - /// (Originally from ..\FSComp.txt:589) + /// (Originally from ..\FSComp.txt:592) static member tcCannotInheritFromVariableType() = (753, GetStringFunc("tcCannotInheritFromVariableType",",,,") ) /// Calls to object constructors on type parameters cannot be given arguments - /// (Originally from ..\FSComp.txt:590) + /// (Originally from ..\FSComp.txt:593) static member tcObjectConstructorsOnTypeParametersCannotTakeArguments() = (754, GetStringFunc("tcObjectConstructorsOnTypeParametersCannotTakeArguments",",,,") ) /// The 'CompiledName' attribute cannot be used with this language element - /// (Originally from ..\FSComp.txt:591) + /// (Originally from ..\FSComp.txt:594) static member tcCompiledNameAttributeMisused() = (755, GetStringFunc("tcCompiledNameAttributeMisused",",,,") ) /// '%s' may only be used with named types - /// (Originally from ..\FSComp.txt:592) + /// (Originally from ..\FSComp.txt:595) static member tcNamedTypeRequired(a0 : System.String) = (756, GetStringFunc("tcNamedTypeRequired",",,,%s,,,") a0) /// 'inherit' cannot be used on interface types. Consider implementing the interface by using 'interface ... with ... end' instead. - /// (Originally from ..\FSComp.txt:593) + /// (Originally from ..\FSComp.txt:596) static member tcInheritCannotBeUsedOnInterfaceType() = (757, GetStringFunc("tcInheritCannotBeUsedOnInterfaceType",",,,") ) /// 'new' cannot be used on interface types. Consider using an object expression '{ new ... with ... }' instead. - /// (Originally from ..\FSComp.txt:594) + /// (Originally from ..\FSComp.txt:597) static member tcNewCannotBeUsedOnInterfaceType() = (758, GetStringFunc("tcNewCannotBeUsedOnInterfaceType",",,,") ) /// Instances of this type cannot be created since it has been marked abstract or not all methods have been given implementations. Consider using an object expression '{ new ... with ... }' instead. - /// (Originally from ..\FSComp.txt:595) + /// (Originally from ..\FSComp.txt:598) static member tcAbstractTypeCannotBeInstantiated() = (759, GetStringFunc("tcAbstractTypeCannotBeInstantiated",",,,") ) /// It is recommended that objects supporting the IDisposable interface are created using the syntax 'new Type(args)', rather than 'Type(args)' or 'Type' as a function value representing the constructor, to indicate that resources may be owned by the generated value - /// (Originally from ..\FSComp.txt:596) + /// (Originally from ..\FSComp.txt:599) static member tcIDisposableTypeShouldUseNew() = (760, GetStringFunc("tcIDisposableTypeShouldUseNew",",,,") ) /// '%s' may only be used to construct object types - /// (Originally from ..\FSComp.txt:597) + /// (Originally from ..\FSComp.txt:600) static member tcSyntaxCanOnlyBeUsedToCreateObjectTypes(a0 : System.String) = (761, GetStringFunc("tcSyntaxCanOnlyBeUsedToCreateObjectTypes",",,,%s,,,") a0) /// Constructors for the type '%s' must directly or indirectly call its implicit object constructor. Use a call to the implicit object constructor instead of a record expression. - /// (Originally from ..\FSComp.txt:598) + /// (Originally from ..\FSComp.txt:601) static member tcConstructorRequiresCall(a0 : System.String) = (762, GetStringFunc("tcConstructorRequiresCall",",,,%s,,,") a0) /// The field '%s' has been given a value, but is not present in the type '%s' - /// (Originally from ..\FSComp.txt:599) + /// (Originally from ..\FSComp.txt:602) static member tcUndefinedField(a0 : System.String, a1 : System.String) = (763, GetStringFunc("tcUndefinedField",",,,%s,,,%s,,,") a0 a1) /// No assignment given for field '%s' of type '%s' - /// (Originally from ..\FSComp.txt:600) + /// (Originally from ..\FSComp.txt:603) static member tcFieldRequiresAssignment(a0 : System.String, a1 : System.String) = (764, GetStringFunc("tcFieldRequiresAssignment",",,,%s,,,%s,,,") a0 a1) /// Extraneous fields have been given values - /// (Originally from ..\FSComp.txt:601) + /// (Originally from ..\FSComp.txt:604) static member tcExtraneousFieldsGivenValues() = (765, GetStringFunc("tcExtraneousFieldsGivenValues",",,,") ) /// Only overrides of abstract and virtual members may be specified in object expressions - /// (Originally from ..\FSComp.txt:602) + /// (Originally from ..\FSComp.txt:605) static member tcObjectExpressionsCanOnlyOverrideAbstractOrVirtual() = (766, GetStringFunc("tcObjectExpressionsCanOnlyOverrideAbstractOrVirtual",",,,") ) /// The member '%s' does not correspond to any abstract or virtual method available to override or implement. - /// (Originally from ..\FSComp.txt:603) + /// (Originally from ..\FSComp.txt:606) static member tcNoAbstractOrVirtualMemberFound(a0 : System.String) = (767, GetStringFunc("tcNoAbstractOrVirtualMemberFound",",,,%s,,,") a0) /// The type %s contains the member '%s' but it is not a virtual or abstract method that is available to override or implement. - /// (Originally from ..\FSComp.txt:604) + /// (Originally from ..\FSComp.txt:607) static member tcMemberFoundIsNotAbstractOrVirtual(a0 : System.String, a1 : System.String) = (767, GetStringFunc("tcMemberFoundIsNotAbstractOrVirtual",",,,%s,,,%s,,,") a0 a1) /// The member '%s' does not accept the correct number of arguments. %d argument(s) are expected, but %d were given. The required signature is '%s'.%s - /// (Originally from ..\FSComp.txt:605) + /// (Originally from ..\FSComp.txt:608) static member tcArgumentArityMismatch(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String, a4 : System.String) = (768, GetStringFunc("tcArgumentArityMismatch",",,,%s,,,%d,,,%d,,,%s,,,%s,,,") a0 a1 a2 a3 a4) /// The member '%s' does not accept the correct number of arguments. One overload accepts %d arguments, but %d were given. The required signature is '%s'.%s - /// (Originally from ..\FSComp.txt:606) + /// (Originally from ..\FSComp.txt:609) static member tcArgumentArityMismatchOneOverload(a0 : System.String, a1 : System.Int32, a2 : System.Int32, a3 : System.String, a4 : System.String) = (769, GetStringFunc("tcArgumentArityMismatchOneOverload",",,,%s,,,%d,,,%d,,,%s,,,%s,,,") a0 a1 a2 a3 a4) /// A simple method name is required here - /// (Originally from ..\FSComp.txt:607) + /// (Originally from ..\FSComp.txt:610) static member tcSimpleMethodNameRequired() = (770, GetStringFunc("tcSimpleMethodNameRequired",",,,") ) /// The types System.ValueType, System.Enum, System.Delegate, System.MulticastDelegate and System.Array cannot be used as super types in an object expression or class - /// (Originally from ..\FSComp.txt:608) + /// (Originally from ..\FSComp.txt:611) static member tcPredefinedTypeCannotBeUsedAsSuperType() = (771, GetStringFunc("tcPredefinedTypeCannotBeUsedAsSuperType",",,,") ) /// 'new' must be used with a named type - /// (Originally from ..\FSComp.txt:609) + /// (Originally from ..\FSComp.txt:612) static member tcNewMustBeUsedWithNamedType() = (772, GetStringFunc("tcNewMustBeUsedWithNamedType",",,,") ) /// Cannot create an extension of a sealed type - /// (Originally from ..\FSComp.txt:610) + /// (Originally from ..\FSComp.txt:613) static member tcCannotCreateExtensionOfSealedType() = (773, GetStringFunc("tcCannotCreateExtensionOfSealedType",",,,") ) /// No arguments may be given when constructing a record value - /// (Originally from ..\FSComp.txt:611) + /// (Originally from ..\FSComp.txt:614) static member tcNoArgumentsForRecordValue() = (774, GetStringFunc("tcNoArgumentsForRecordValue",",,,") ) /// Interface implementations cannot be given on construction expressions - /// (Originally from ..\FSComp.txt:612) + /// (Originally from ..\FSComp.txt:615) static member tcNoInterfaceImplementationForConstructionExpression() = (775, GetStringFunc("tcNoInterfaceImplementationForConstructionExpression",",,,") ) /// Object construction expressions may only be used to implement constructors in class types - /// (Originally from ..\FSComp.txt:613) + /// (Originally from ..\FSComp.txt:616) static member tcObjectConstructionCanOnlyBeUsedInClassTypes() = (776, GetStringFunc("tcObjectConstructionCanOnlyBeUsedInClassTypes",",,,") ) /// Only simple bindings of the form 'id = expr' can be used in construction expressions - /// (Originally from ..\FSComp.txt:614) + /// (Originally from ..\FSComp.txt:617) static member tcOnlySimpleBindingsCanBeUsedInConstructionExpressions() = (777, GetStringFunc("tcOnlySimpleBindingsCanBeUsedInConstructionExpressions",",,,") ) /// Objects must be initialized by an object construction expression that calls an inherited object constructor and assigns a value to each field - /// (Originally from ..\FSComp.txt:615) + /// (Originally from ..\FSComp.txt:618) static member tcObjectsMustBeInitializedWithObjectExpression() = (778, GetStringFunc("tcObjectsMustBeInitializedWithObjectExpression",",,,") ) /// Expected an interface type - /// (Originally from ..\FSComp.txt:616) + /// (Originally from ..\FSComp.txt:619) static member tcExpectedInterfaceType() = (779, GetStringFunc("tcExpectedInterfaceType",",,,") ) /// Constructor expressions for interfaces do not take arguments - /// (Originally from ..\FSComp.txt:617) + /// (Originally from ..\FSComp.txt:620) static member tcConstructorForInterfacesDoNotTakeArguments() = (780, GetStringFunc("tcConstructorForInterfacesDoNotTakeArguments",",,,") ) /// This object constructor requires arguments - /// (Originally from ..\FSComp.txt:618) + /// (Originally from ..\FSComp.txt:621) static member tcConstructorRequiresArguments() = (781, GetStringFunc("tcConstructorRequiresArguments",",,,") ) /// 'new' may only be used with object constructors - /// (Originally from ..\FSComp.txt:619) + /// (Originally from ..\FSComp.txt:622) static member tcNewRequiresObjectConstructor() = (782, GetStringFunc("tcNewRequiresObjectConstructor",",,,") ) /// At least one override did not correctly implement its corresponding abstract member - /// (Originally from ..\FSComp.txt:620) + /// (Originally from ..\FSComp.txt:623) static member tcAtLeastOneOverrideIsInvalid() = (783, GetStringFunc("tcAtLeastOneOverrideIsInvalid",",,,") ) /// This numeric literal requires that a module '%s' defining functions FromZero, FromOne, FromInt32, FromInt64 and FromString be in scope - /// (Originally from ..\FSComp.txt:621) + /// (Originally from ..\FSComp.txt:624) static member tcNumericLiteralRequiresModule(a0 : System.String) = (784, GetStringFunc("tcNumericLiteralRequiresModule",",,,%s,,,") a0) /// Invalid record construction - /// (Originally from ..\FSComp.txt:622) + /// (Originally from ..\FSComp.txt:625) static member tcInvalidRecordConstruction() = (785, GetStringFunc("tcInvalidRecordConstruction",",,,") ) /// The expression form { expr with ... } may only be used with record types. To build object types use { new Type(...) with ... } - /// (Originally from ..\FSComp.txt:623) + /// (Originally from ..\FSComp.txt:626) static member tcExpressionFormRequiresRecordTypes() = (786, GetStringFunc("tcExpressionFormRequiresRecordTypes",",,,") ) /// The inherited type is not an object model type - /// (Originally from ..\FSComp.txt:624) + /// (Originally from ..\FSComp.txt:627) static member tcInheritedTypeIsNotObjectModelType() = (787, GetStringFunc("tcInheritedTypeIsNotObjectModelType",",,,") ) /// Object construction expressions (i.e. record expressions with inheritance specifications) may only be used to implement constructors in object model types. Use 'new ObjectType(args)' to construct instances of object model types outside of constructors - /// (Originally from ..\FSComp.txt:625) + /// (Originally from ..\FSComp.txt:628) static member tcObjectConstructionExpressionCanOnlyImplementConstructorsInObjectModelTypes() = (788, GetStringFunc("tcObjectConstructionExpressionCanOnlyImplementConstructorsInObjectModelTypes",",,,") ) /// '{ }' is not a valid expression. Records must include at least one field. Empty sequences are specified by using Seq.empty or an empty list '[]'. - /// (Originally from ..\FSComp.txt:626) + /// (Originally from ..\FSComp.txt:629) static member tcEmptyRecordInvalid() = (789, GetStringFunc("tcEmptyRecordInvalid",",,,") ) /// This type is not a record type. Values of class and struct types must be created using calls to object constructors. - /// (Originally from ..\FSComp.txt:627) + /// (Originally from ..\FSComp.txt:630) static member tcTypeIsNotARecordTypeNeedConstructor() = (790, GetStringFunc("tcTypeIsNotARecordTypeNeedConstructor",",,,") ) /// This type is not a record type - /// (Originally from ..\FSComp.txt:628) + /// (Originally from ..\FSComp.txt:631) static member tcTypeIsNotARecordType() = (791, GetStringFunc("tcTypeIsNotARecordType",",,,") ) /// This construct is ambiguous as part of a computation expression. Nested expressions may be written using 'let _ = (...)' and nested computations using 'let! res = builder { ... }'. - /// (Originally from ..\FSComp.txt:629) + /// (Originally from ..\FSComp.txt:632) static member tcConstructIsAmbiguousInComputationExpression() = (792, GetStringFunc("tcConstructIsAmbiguousInComputationExpression",",,,") ) /// This construct is ambiguous as part of a sequence expression. Nested expressions may be written using 'let _ = (...)' and nested sequences using 'yield! seq {... }'. - /// (Originally from ..\FSComp.txt:630) + /// (Originally from ..\FSComp.txt:633) static member tcConstructIsAmbiguousInSequenceExpression() = (793, GetStringFunc("tcConstructIsAmbiguousInSequenceExpression",",,,") ) /// 'do!' cannot be used within sequence expressions - /// (Originally from ..\FSComp.txt:631) + /// (Originally from ..\FSComp.txt:634) static member tcDoBangIllegalInSequenceExpression() = (794, GetStringFunc("tcDoBangIllegalInSequenceExpression",",,,") ) /// The use of 'let! x = coll' in sequence expressions is not permitted. Use 'for x in coll' instead. - /// (Originally from ..\FSComp.txt:632) + /// (Originally from ..\FSComp.txt:635) static member tcUseForInSequenceExpression() = (795, GetStringFunc("tcUseForInSequenceExpression",",,,") ) /// 'try'/'with' cannot be used within sequence expressions - /// (Originally from ..\FSComp.txt:633) + /// (Originally from ..\FSComp.txt:636) static member tcTryIllegalInSequenceExpression() = (796, GetStringFunc("tcTryIllegalInSequenceExpression",",,,") ) /// In sequence expressions, multiple results are generated using 'yield!' - /// (Originally from ..\FSComp.txt:634) + /// (Originally from ..\FSComp.txt:637) static member tcUseYieldBangForMultipleResults() = (797, GetStringFunc("tcUseYieldBangForMultipleResults",",,,") ) /// Invalid assignment - /// (Originally from ..\FSComp.txt:635) + /// (Originally from ..\FSComp.txt:638) static member tcInvalidAssignment() = (799, GetStringFunc("tcInvalidAssignment",",,,") ) /// Invalid use of a type name - /// (Originally from ..\FSComp.txt:636) + /// (Originally from ..\FSComp.txt:639) static member tcInvalidUseOfTypeName() = (800, GetStringFunc("tcInvalidUseOfTypeName",",,,") ) /// This type has no accessible object constructors - /// (Originally from ..\FSComp.txt:637) + /// (Originally from ..\FSComp.txt:640) static member tcTypeHasNoAccessibleConstructor() = (801, GetStringFunc("tcTypeHasNoAccessibleConstructor",",,,") ) /// Invalid use of an interface type - /// (Originally from ..\FSComp.txt:640) + /// (Originally from ..\FSComp.txt:643) static member tcInvalidUseOfInterfaceType() = (804, GetStringFunc("tcInvalidUseOfInterfaceType",",,,") ) /// Invalid use of a delegate constructor. Use the syntax 'new Type(args)' or just 'Type(args)'. - /// (Originally from ..\FSComp.txt:641) + /// (Originally from ..\FSComp.txt:644) static member tcInvalidUseOfDelegate() = (805, GetStringFunc("tcInvalidUseOfDelegate",",,,") ) /// Property '%s' is not static - /// (Originally from ..\FSComp.txt:642) + /// (Originally from ..\FSComp.txt:645) static member tcPropertyIsNotStatic(a0 : System.String) = (806, GetStringFunc("tcPropertyIsNotStatic",",,,%s,,,") a0) /// Property '%s' is not readable - /// (Originally from ..\FSComp.txt:643) + /// (Originally from ..\FSComp.txt:646) static member tcPropertyIsNotReadable(a0 : System.String) = (807, GetStringFunc("tcPropertyIsNotReadable",",,,%s,,,") a0) /// This lookup cannot be used here - /// (Originally from ..\FSComp.txt:644) + /// (Originally from ..\FSComp.txt:647) static member tcLookupMayNotBeUsedHere() = (808, GetStringFunc("tcLookupMayNotBeUsedHere",",,,") ) /// Property '%s' is static - /// (Originally from ..\FSComp.txt:645) + /// (Originally from ..\FSComp.txt:648) static member tcPropertyIsStatic(a0 : System.String) = (809, GetStringFunc("tcPropertyIsStatic",",,,%s,,,") a0) /// Property '%s' cannot be set - /// (Originally from ..\FSComp.txt:646) + /// (Originally from ..\FSComp.txt:649) static member tcPropertyCannotBeSet1(a0 : System.String) = (810, GetStringFunc("tcPropertyCannotBeSet1",",,,%s,,,") a0) /// Constructors must be applied to arguments and cannot be used as first-class values. If necessary use an anonymous function '(fun arg1 ... argN -> new Type(arg1,...,argN))'. - /// (Originally from ..\FSComp.txt:647) + /// (Originally from ..\FSComp.txt:650) static member tcConstructorsCannotBeFirstClassValues() = (811, GetStringFunc("tcConstructorsCannotBeFirstClassValues",",,,") ) /// The syntax 'expr.id' may only be used with record labels, properties and fields - /// (Originally from ..\FSComp.txt:648) + /// (Originally from ..\FSComp.txt:651) static member tcSyntaxFormUsedOnlyWithRecordLabelsPropertiesAndFields() = (812, GetStringFunc("tcSyntaxFormUsedOnlyWithRecordLabelsPropertiesAndFields",",,,") ) /// Event '%s' is static - /// (Originally from ..\FSComp.txt:649) + /// (Originally from ..\FSComp.txt:652) static member tcEventIsStatic(a0 : System.String) = (813, GetStringFunc("tcEventIsStatic",",,,%s,,,") a0) /// Event '%s' is not static - /// (Originally from ..\FSComp.txt:650) + /// (Originally from ..\FSComp.txt:653) static member tcEventIsNotStatic(a0 : System.String) = (814, GetStringFunc("tcEventIsNotStatic",",,,%s,,,") a0) /// The named argument '%s' did not match any argument or mutable property - /// (Originally from ..\FSComp.txt:651) + /// (Originally from ..\FSComp.txt:654) static member tcNamedArgumentDidNotMatch(a0 : System.String) = (815, GetStringFunc("tcNamedArgumentDidNotMatch",",,,%s,,,") a0) /// One or more of the overloads of this method has curried arguments. Consider redesigning these members to take arguments in tupled form. - /// (Originally from ..\FSComp.txt:652) + /// (Originally from ..\FSComp.txt:655) static member tcOverloadsCannotHaveCurriedArguments() = (816, GetStringFunc("tcOverloadsCannotHaveCurriedArguments",",,,") ) /// The unnamed arguments do not form a prefix of the arguments of the method called - /// (Originally from ..\FSComp.txt:653) + /// (Originally from ..\FSComp.txt:656) static member tcUnnamedArgumentsDoNotFormPrefix() = (GetStringFunc("tcUnnamedArgumentsDoNotFormPrefix",",,,") ) /// Static optimization conditionals are only for use within the F# library - /// (Originally from ..\FSComp.txt:654) + /// (Originally from ..\FSComp.txt:657) static member tcStaticOptimizationConditionalsOnlyForFSharpLibrary() = (817, GetStringFunc("tcStaticOptimizationConditionalsOnlyForFSharpLibrary",",,,") ) /// The corresponding formal argument is not optional - /// (Originally from ..\FSComp.txt:655) + /// (Originally from ..\FSComp.txt:658) static member tcFormalArgumentIsNotOptional() = (818, GetStringFunc("tcFormalArgumentIsNotOptional",",,,") ) /// Invalid optional assignment to a property or field - /// (Originally from ..\FSComp.txt:656) + /// (Originally from ..\FSComp.txt:659) static member tcInvalidOptionalAssignmentToPropertyOrField() = (819, GetStringFunc("tcInvalidOptionalAssignmentToPropertyOrField",",,,") ) /// A delegate constructor must be passed a single function value - /// (Originally from ..\FSComp.txt:657) + /// (Originally from ..\FSComp.txt:660) static member tcDelegateConstructorMustBePassed() = (820, GetStringFunc("tcDelegateConstructorMustBePassed",",,,") ) /// A binding cannot be marked both 'use' and 'rec' - /// (Originally from ..\FSComp.txt:658) + /// (Originally from ..\FSComp.txt:661) static member tcBindingCannotBeUseAndRec() = (821, GetStringFunc("tcBindingCannotBeUseAndRec",",,,") ) /// The 'VolatileField' attribute may only be used on 'let' bindings in classes - /// (Originally from ..\FSComp.txt:659) + /// (Originally from ..\FSComp.txt:662) static member tcVolatileOnlyOnClassLetBindings() = (823, GetStringFunc("tcVolatileOnlyOnClassLetBindings",",,,") ) /// Attributes are not permitted on 'let' bindings in expressions - /// (Originally from ..\FSComp.txt:660) + /// (Originally from ..\FSComp.txt:663) static member tcAttributesAreNotPermittedOnLetBindings() = (824, GetStringFunc("tcAttributesAreNotPermittedOnLetBindings",",,,") ) /// The 'DefaultValue' attribute may only be used on 'val' declarations - /// (Originally from ..\FSComp.txt:661) + /// (Originally from ..\FSComp.txt:664) static member tcDefaultValueAttributeRequiresVal() = (825, GetStringFunc("tcDefaultValueAttributeRequiresVal",",,,") ) /// The 'ConditionalAttribute' attribute may only be used on members - /// (Originally from ..\FSComp.txt:662) + /// (Originally from ..\FSComp.txt:665) static member tcConditionalAttributeRequiresMembers() = (826, GetStringFunc("tcConditionalAttributeRequiresMembers",",,,") ) /// This is not a valid name for an active pattern - /// (Originally from ..\FSComp.txt:663) + /// (Originally from ..\FSComp.txt:666) static member tcInvalidActivePatternName() = (827, GetStringFunc("tcInvalidActivePatternName",",,,") ) /// The 'EntryPointAttribute' attribute may only be used on function definitions in modules - /// (Originally from ..\FSComp.txt:664) + /// (Originally from ..\FSComp.txt:667) static member tcEntryPointAttributeRequiresFunctionInModule() = (828, GetStringFunc("tcEntryPointAttributeRequiresFunctionInModule",",,,") ) /// Mutable values cannot be marked 'inline' - /// (Originally from ..\FSComp.txt:665) + /// (Originally from ..\FSComp.txt:668) static member tcMutableValuesCannotBeInline() = (829, GetStringFunc("tcMutableValuesCannotBeInline",",,,") ) /// Mutable values cannot have generic parameters - /// (Originally from ..\FSComp.txt:666) + /// (Originally from ..\FSComp.txt:669) static member tcMutableValuesMayNotHaveGenericParameters() = (830, GetStringFunc("tcMutableValuesMayNotHaveGenericParameters",",,,") ) /// Mutable function values should be written 'let mutable f = (fun args -> ...)' - /// (Originally from ..\FSComp.txt:667) + /// (Originally from ..\FSComp.txt:670) static member tcMutableValuesSyntax() = (831, GetStringFunc("tcMutableValuesSyntax",",,,") ) /// Only functions may be marked 'inline' - /// (Originally from ..\FSComp.txt:668) + /// (Originally from ..\FSComp.txt:671) static member tcOnlyFunctionsCanBeInline() = (832, GetStringFunc("tcOnlyFunctionsCanBeInline",",,,") ) /// A literal value cannot be given the [] or [] attributes - /// (Originally from ..\FSComp.txt:669) + /// (Originally from ..\FSComp.txt:672) static member tcIllegalAttributesForLiteral() = (833, GetStringFunc("tcIllegalAttributesForLiteral",",,,") ) /// A literal value cannot be marked 'mutable' - /// (Originally from ..\FSComp.txt:670) + /// (Originally from ..\FSComp.txt:673) static member tcLiteralCannotBeMutable() = (834, GetStringFunc("tcLiteralCannotBeMutable",",,,") ) /// A literal value cannot be marked 'inline' - /// (Originally from ..\FSComp.txt:671) + /// (Originally from ..\FSComp.txt:674) static member tcLiteralCannotBeInline() = (835, GetStringFunc("tcLiteralCannotBeInline",",,,") ) /// Literal values cannot have generic parameters - /// (Originally from ..\FSComp.txt:672) + /// (Originally from ..\FSComp.txt:675) static member tcLiteralCannotHaveGenericParameters() = (836, GetStringFunc("tcLiteralCannotHaveGenericParameters",",,,") ) /// This is not a valid constant expression - /// (Originally from ..\FSComp.txt:673) + /// (Originally from ..\FSComp.txt:676) static member tcInvalidConstantExpression() = (837, GetStringFunc("tcInvalidConstantExpression",",,,") ) /// This type is not accessible from this code location - /// (Originally from ..\FSComp.txt:674) + /// (Originally from ..\FSComp.txt:677) static member tcTypeIsInaccessible() = (838, GetStringFunc("tcTypeIsInaccessible",",,,") ) /// Unexpected condition in imported assembly: failed to decode AttributeUsage attribute - /// (Originally from ..\FSComp.txt:675) + /// (Originally from ..\FSComp.txt:678) static member tcUnexpectedConditionInImportedAssembly() = (839, GetStringFunc("tcUnexpectedConditionInImportedAssembly",",,,") ) /// Unrecognized attribute target. Valid attribute targets are 'assembly', 'module', 'type', 'method', 'property', 'return', 'param', 'field', 'event', 'constructor'. - /// (Originally from ..\FSComp.txt:676) + /// (Originally from ..\FSComp.txt:679) static member tcUnrecognizedAttributeTarget() = (840, GetStringFunc("tcUnrecognizedAttributeTarget",",,,") ) /// This attribute is not valid for use on this language element. Assembly attributes should be attached to a 'do ()' declaration, if necessary within an F# module. - /// (Originally from ..\FSComp.txt:677) + /// (Originally from ..\FSComp.txt:680) static member tcAttributeIsNotValidForLanguageElementUseDo() = (841, GetStringFunc("tcAttributeIsNotValidForLanguageElementUseDo",",,,") ) /// This attribute is not valid for use on this language element - /// (Originally from ..\FSComp.txt:678) + /// (Originally from ..\FSComp.txt:681) static member tcAttributeIsNotValidForLanguageElement() = (842, GetStringFunc("tcAttributeIsNotValidForLanguageElement",",,,") ) /// Optional arguments cannot be used in custom attributes - /// (Originally from ..\FSComp.txt:679) + /// (Originally from ..\FSComp.txt:682) static member tcOptionalArgumentsCannotBeUsedInCustomAttribute() = (843, GetStringFunc("tcOptionalArgumentsCannotBeUsedInCustomAttribute",",,,") ) /// This property cannot be set - /// (Originally from ..\FSComp.txt:680) + /// (Originally from ..\FSComp.txt:683) static member tcPropertyCannotBeSet0() = (844, GetStringFunc("tcPropertyCannotBeSet0",",,,") ) /// This property or field was not found on this custom attribute type - /// (Originally from ..\FSComp.txt:681) + /// (Originally from ..\FSComp.txt:684) static member tcPropertyOrFieldNotFoundInAttribute() = (845, GetStringFunc("tcPropertyOrFieldNotFoundInAttribute",",,,") ) /// A custom attribute must be a reference type - /// (Originally from ..\FSComp.txt:682) + /// (Originally from ..\FSComp.txt:685) static member tcCustomAttributeMustBeReferenceType() = (846, GetStringFunc("tcCustomAttributeMustBeReferenceType",",,,") ) /// The number of args for a custom attribute does not match the expected number of args for the attribute constructor - /// (Originally from ..\FSComp.txt:683) + /// (Originally from ..\FSComp.txt:686) static member tcCustomAttributeArgumentMismatch() = (847, GetStringFunc("tcCustomAttributeArgumentMismatch",",,,") ) /// A custom attribute must invoke an object constructor - /// (Originally from ..\FSComp.txt:684) + /// (Originally from ..\FSComp.txt:687) static member tcCustomAttributeMustInvokeConstructor() = (848, GetStringFunc("tcCustomAttributeMustInvokeConstructor",",,,") ) /// Attribute expressions must be calls to object constructors - /// (Originally from ..\FSComp.txt:685) + /// (Originally from ..\FSComp.txt:688) static member tcAttributeExpressionsMustBeConstructorCalls() = (849, GetStringFunc("tcAttributeExpressionsMustBeConstructorCalls",",,,") ) /// This attribute cannot be used in this version of F# - /// (Originally from ..\FSComp.txt:686) + /// (Originally from ..\FSComp.txt:689) static member tcUnsupportedAttribute() = (850, GetStringFunc("tcUnsupportedAttribute",",,,") ) /// Invalid inline specification - /// (Originally from ..\FSComp.txt:687) + /// (Originally from ..\FSComp.txt:690) static member tcInvalidInlineSpecification() = (851, GetStringFunc("tcInvalidInlineSpecification",",,,") ) /// 'use' bindings must be of the form 'use = ' - /// (Originally from ..\FSComp.txt:688) + /// (Originally from ..\FSComp.txt:691) static member tcInvalidUseBinding() = (852, GetStringFunc("tcInvalidUseBinding",",,,") ) /// Abstract members are not permitted in an augmentation - they must be defined as part of the type itself - /// (Originally from ..\FSComp.txt:689) + /// (Originally from ..\FSComp.txt:692) static member tcAbstractMembersIllegalInAugmentation() = (853, GetStringFunc("tcAbstractMembersIllegalInAugmentation",",,,") ) /// Method overrides and interface implementations are not permitted here - /// (Originally from ..\FSComp.txt:690) + /// (Originally from ..\FSComp.txt:693) static member tcMethodOverridesIllegalHere() = (854, GetStringFunc("tcMethodOverridesIllegalHere",",,,") ) /// No abstract or interface member was found that corresponds to this override - /// (Originally from ..\FSComp.txt:691) + /// (Originally from ..\FSComp.txt:694) static member tcNoMemberFoundForOverride() = (855, GetStringFunc("tcNoMemberFoundForOverride",",,,") ) /// This override takes a different number of arguments to the corresponding abstract member. The following abstract members were found:%s - /// (Originally from ..\FSComp.txt:692) + /// (Originally from ..\FSComp.txt:695) static member tcOverrideArityMismatch(a0 : System.String) = (856, GetStringFunc("tcOverrideArityMismatch",",,,%s,,,") a0) /// This method already has a default implementation - /// (Originally from ..\FSComp.txt:693) + /// (Originally from ..\FSComp.txt:696) static member tcDefaultImplementationAlreadyExists() = (857, GetStringFunc("tcDefaultImplementationAlreadyExists",",,,") ) /// The method implemented by this default is ambiguous - /// (Originally from ..\FSComp.txt:694) + /// (Originally from ..\FSComp.txt:697) static member tcDefaultAmbiguous() = (858, GetStringFunc("tcDefaultAmbiguous",",,,") ) /// No abstract property was found that corresponds to this override - /// (Originally from ..\FSComp.txt:695) + /// (Originally from ..\FSComp.txt:698) static member tcNoPropertyFoundForOverride() = (859, GetStringFunc("tcNoPropertyFoundForOverride",",,,") ) /// This property overrides or implements an abstract property but the abstract property doesn't have a corresponding %s - /// (Originally from ..\FSComp.txt:696) + /// (Originally from ..\FSComp.txt:699) static member tcAbstractPropertyMissingGetOrSet(a0 : System.String) = (860, GetStringFunc("tcAbstractPropertyMissingGetOrSet",",,,%s,,,") a0) /// Invalid signature for set member - /// (Originally from ..\FSComp.txt:697) + /// (Originally from ..\FSComp.txt:700) static member tcInvalidSignatureForSet() = (861, GetStringFunc("tcInvalidSignatureForSet",",,,") ) /// This new member hides the abstract member '%s'. Rename the member or use 'override' instead. - /// (Originally from ..\FSComp.txt:698) + /// (Originally from ..\FSComp.txt:701) static member tcNewMemberHidesAbstractMember(a0 : System.String) = (864, GetStringFunc("tcNewMemberHidesAbstractMember",",,,%s,,,") a0) /// This new member hides the abstract member '%s' once tuples, functions, units of measure and/or provided types are erased. Rename the member or use 'override' instead. - /// (Originally from ..\FSComp.txt:699) + /// (Originally from ..\FSComp.txt:702) static member tcNewMemberHidesAbstractMemberWithSuffix(a0 : System.String) = (864, GetStringFunc("tcNewMemberHidesAbstractMemberWithSuffix",",,,%s,,,") a0) /// Interfaces cannot contain definitions of static initializers - /// (Originally from ..\FSComp.txt:700) + /// (Originally from ..\FSComp.txt:703) static member tcStaticInitializersIllegalInInterface() = (865, GetStringFunc("tcStaticInitializersIllegalInInterface",",,,") ) /// Interfaces cannot contain definitions of object constructors - /// (Originally from ..\FSComp.txt:701) + /// (Originally from ..\FSComp.txt:704) static member tcObjectConstructorsIllegalInInterface() = (866, GetStringFunc("tcObjectConstructorsIllegalInInterface",",,,") ) /// Interfaces cannot contain definitions of member overrides - /// (Originally from ..\FSComp.txt:702) + /// (Originally from ..\FSComp.txt:705) static member tcMemberOverridesIllegalInInterface() = (867, GetStringFunc("tcMemberOverridesIllegalInInterface",",,,") ) /// Interfaces cannot contain definitions of concrete members. You may need to define a constructor on your type to indicate that the type is a class. - /// (Originally from ..\FSComp.txt:703) + /// (Originally from ..\FSComp.txt:706) static member tcConcreteMembersIllegalInInterface() = (868, GetStringFunc("tcConcreteMembersIllegalInInterface",",,,") ) /// Constructors cannot be specified in exception augmentations - /// (Originally from ..\FSComp.txt:704) + /// (Originally from ..\FSComp.txt:707) static member tcConstructorsDisallowedInExceptionAugmentation() = (869, GetStringFunc("tcConstructorsDisallowedInExceptionAugmentation",",,,") ) /// Structs cannot have an object constructor with no arguments. This is a restriction imposed on all CLI languages as structs automatically support a default constructor. - /// (Originally from ..\FSComp.txt:705) + /// (Originally from ..\FSComp.txt:708) static member tcStructsCannotHaveConstructorWithNoArguments() = (870, GetStringFunc("tcStructsCannotHaveConstructorWithNoArguments",",,,") ) /// Constructors cannot be defined for this type - /// (Originally from ..\FSComp.txt:706) + /// (Originally from ..\FSComp.txt:709) static member tcConstructorsIllegalForThisType() = (871, GetStringFunc("tcConstructorsIllegalForThisType",",,,") ) /// Recursive bindings that include member specifications can only occur as a direct augmentation of a type - /// (Originally from ..\FSComp.txt:707) + /// (Originally from ..\FSComp.txt:710) static member tcRecursiveBindingsWithMembersMustBeDirectAugmentation() = (872, GetStringFunc("tcRecursiveBindingsWithMembersMustBeDirectAugmentation",",,,") ) /// Only simple variable patterns can be bound in 'let rec' constructs - /// (Originally from ..\FSComp.txt:708) + /// (Originally from ..\FSComp.txt:711) static member tcOnlySimplePatternsInLetRec() = (873, GetStringFunc("tcOnlySimplePatternsInLetRec",",,,") ) /// Only record fields and simple, non-recursive 'let' bindings may be marked mutable - /// (Originally from ..\FSComp.txt:709) + /// (Originally from ..\FSComp.txt:712) static member tcOnlyRecordFieldsAndSimpleLetCanBeMutable() = (874, GetStringFunc("tcOnlyRecordFieldsAndSimpleLetCanBeMutable",",,,") ) /// This member is not sufficiently generic - /// (Originally from ..\FSComp.txt:710) + /// (Originally from ..\FSComp.txt:713) static member tcMemberIsNotSufficientlyGeneric() = (875, GetStringFunc("tcMemberIsNotSufficientlyGeneric",",,,") ) /// A declaration may only be the [] attribute if a constant value is also given, e.g. 'val x : int = 1' - /// (Originally from ..\FSComp.txt:711) + /// (Originally from ..\FSComp.txt:714) static member tcLiteralAttributeRequiresConstantValue() = (876, GetStringFunc("tcLiteralAttributeRequiresConstantValue",",,,") ) /// A declaration may only be given a value in a signature if the declaration has the [] attribute - /// (Originally from ..\FSComp.txt:712) + /// (Originally from ..\FSComp.txt:715) static member tcValueInSignatureRequiresLiteralAttribute() = (877, GetStringFunc("tcValueInSignatureRequiresLiteralAttribute",",,,") ) /// Thread-static and context-static variables must be static and given the [] attribute to indicate that the value is initialized to the default value on each new thread - /// (Originally from ..\FSComp.txt:713) + /// (Originally from ..\FSComp.txt:716) static member tcThreadStaticAndContextStaticMustBeStatic() = (878, GetStringFunc("tcThreadStaticAndContextStaticMustBeStatic",",,,") ) /// Volatile fields must be marked 'mutable' and cannot be thread-static - /// (Originally from ..\FSComp.txt:714) + /// (Originally from ..\FSComp.txt:717) static member tcVolatileFieldsMustBeMutable() = (879, GetStringFunc("tcVolatileFieldsMustBeMutable",",,,") ) /// Uninitialized 'val' fields must be mutable and marked with the '[]' attribute. Consider using a 'let' binding instead of a 'val' field. - /// (Originally from ..\FSComp.txt:715) + /// (Originally from ..\FSComp.txt:718) static member tcUninitializedValFieldsMustBeMutable() = (880, GetStringFunc("tcUninitializedValFieldsMustBeMutable",",,,") ) /// Static 'val' fields in types must be mutable, private and marked with the '[]' attribute. They are initialized to the 'null' or 'zero' value for their type. Consider also using a 'static let mutable' binding in a class type. - /// (Originally from ..\FSComp.txt:716) + /// (Originally from ..\FSComp.txt:719) static member tcStaticValFieldsMustBeMutableAndPrivate() = (881, GetStringFunc("tcStaticValFieldsMustBeMutableAndPrivate",",,,") ) /// This field requires a name - /// (Originally from ..\FSComp.txt:717) + /// (Originally from ..\FSComp.txt:720) static member tcFieldRequiresName() = (882, GetStringFunc("tcFieldRequiresName",",,,") ) /// Invalid namespace, module, type or union case name - /// (Originally from ..\FSComp.txt:718) + /// (Originally from ..\FSComp.txt:721) static member tcInvalidNamespaceModuleTypeUnionName() = (883, GetStringFunc("tcInvalidNamespaceModuleTypeUnionName",",,,") ) /// Explicit type declarations for constructors must be of the form 'ty1 * ... * tyN -> resTy'. Parentheses may be required around 'resTy' - /// (Originally from ..\FSComp.txt:719) + /// (Originally from ..\FSComp.txt:722) static member tcIllegalFormForExplicitTypeDeclaration() = (884, GetStringFunc("tcIllegalFormForExplicitTypeDeclaration",",,,") ) /// Return types of union cases must be identical to the type being defined, up to abbreviations - /// (Originally from ..\FSComp.txt:720) + /// (Originally from ..\FSComp.txt:723) static member tcReturnTypesForUnionMustBeSameAsType() = (885, GetStringFunc("tcReturnTypesForUnionMustBeSameAsType",",,,") ) /// This is not a valid value for an enumeration literal - /// (Originally from ..\FSComp.txt:721) + /// (Originally from ..\FSComp.txt:724) static member tcInvalidEnumerationLiteral() = (886, GetStringFunc("tcInvalidEnumerationLiteral",",,,") ) /// The type '%s' is not an interface type - /// (Originally from ..\FSComp.txt:722) + /// (Originally from ..\FSComp.txt:725) static member tcTypeIsNotInterfaceType1(a0 : System.String) = (887, GetStringFunc("tcTypeIsNotInterfaceType1",",,,%s,,,") a0) /// Duplicate specification of an interface - /// (Originally from ..\FSComp.txt:723) + /// (Originally from ..\FSComp.txt:726) static member tcDuplicateSpecOfInterface() = (888, GetStringFunc("tcDuplicateSpecOfInterface",",,,") ) /// A field/val declaration is not permitted here - /// (Originally from ..\FSComp.txt:724) + /// (Originally from ..\FSComp.txt:727) static member tcFieldValIllegalHere() = (889, GetStringFunc("tcFieldValIllegalHere",",,,") ) /// A inheritance declaration is not permitted here - /// (Originally from ..\FSComp.txt:725) + /// (Originally from ..\FSComp.txt:728) static member tcInheritIllegalHere() = (890, GetStringFunc("tcInheritIllegalHere",",,,") ) /// This declaration opens the module '%s', which is marked as 'RequireQualifiedAccess'. Adjust your code to use qualified references to the elements of the module instead, e.g. 'List.map' instead of 'map'. This change will ensure that your code is robust as new constructs are added to libraries. - /// (Originally from ..\FSComp.txt:726) + /// (Originally from ..\FSComp.txt:729) static member tcModuleRequiresQualifiedAccess(a0 : System.String) = (892, GetStringFunc("tcModuleRequiresQualifiedAccess",",,,%s,,,") a0) /// This declaration opens the namespace or module '%s' through a partially qualified path. Adjust this code to use the full path of the namespace. This change will make your code more robust as new constructs are added to the F# and CLI libraries. - /// (Originally from ..\FSComp.txt:727) + /// (Originally from ..\FSComp.txt:730) static member tcOpenUsedWithPartiallyQualifiedPath(a0 : System.String) = (893, GetStringFunc("tcOpenUsedWithPartiallyQualifiedPath",",,,%s,,,") a0) /// Local class bindings cannot be marked inline. Consider lifting the definition out of the class or else do not mark it as inline. - /// (Originally from ..\FSComp.txt:728) + /// (Originally from ..\FSComp.txt:731) static member tcLocalClassBindingsCannotBeInline() = (894, GetStringFunc("tcLocalClassBindingsCannotBeInline",",,,") ) /// Type abbreviations cannot have members - /// (Originally from ..\FSComp.txt:729) + /// (Originally from ..\FSComp.txt:732) static member tcTypeAbbreviationsMayNotHaveMembers() = (895, GetStringFunc("tcTypeAbbreviationsMayNotHaveMembers",",,,") ) /// As of F# 4.1, the accessibility of type abbreviations is checked at compile-time. Consider changing the accessibility of the type abbreviation. Ignoring this warning might lead to runtime errors. - /// (Originally from ..\FSComp.txt:730) + /// (Originally from ..\FSComp.txt:733) static member tcTypeAbbreviationsCheckedAtCompileTime() = (GetStringFunc("tcTypeAbbreviationsCheckedAtCompileTime",",,,") ) /// Enumerations cannot have members - /// (Originally from ..\FSComp.txt:731) + /// (Originally from ..\FSComp.txt:734) static member tcEnumerationsMayNotHaveMembers() = (896, GetStringFunc("tcEnumerationsMayNotHaveMembers",",,,") ) /// Measure declarations may have only static members - /// (Originally from ..\FSComp.txt:732) + /// (Originally from ..\FSComp.txt:735) static member tcMeasureDeclarationsRequireStaticMembers() = (897, GetStringFunc("tcMeasureDeclarationsRequireStaticMembers",",,,") ) /// Structs cannot contain 'do' bindings because the default constructor for structs would not execute these bindings - /// (Originally from ..\FSComp.txt:733) + /// (Originally from ..\FSComp.txt:736) static member tcStructsMayNotContainDoBindings() = (GetStringFunc("tcStructsMayNotContainDoBindings",",,,") ) /// Structs cannot contain value definitions because the default constructor for structs will not execute these bindings. Consider adding additional arguments to the primary constructor for the type. - /// (Originally from ..\FSComp.txt:734) + /// (Originally from ..\FSComp.txt:737) static member tcStructsMayNotContainLetBindings() = (901, GetStringFunc("tcStructsMayNotContainLetBindings",",,,") ) /// Static value definitions may only be used in types with a primary constructor. Consider adding arguments to the type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:735) + /// (Originally from ..\FSComp.txt:738) static member tcStaticLetBindingsRequireClassesWithImplicitConstructors() = (902, GetStringFunc("tcStaticLetBindingsRequireClassesWithImplicitConstructors",",,,") ) /// Measure declarations may have only static members: constructors are not available - /// (Originally from ..\FSComp.txt:736) + /// (Originally from ..\FSComp.txt:739) static member tcMeasureDeclarationsRequireStaticMembersNotConstructors() = (904, GetStringFunc("tcMeasureDeclarationsRequireStaticMembersNotConstructors",",,,") ) /// A member and a local class binding both have the name '%s' - /// (Originally from ..\FSComp.txt:737) + /// (Originally from ..\FSComp.txt:740) static member tcMemberAndLocalClassBindingHaveSameName(a0 : System.String) = (905, GetStringFunc("tcMemberAndLocalClassBindingHaveSameName",",,,%s,,,") a0) /// Type abbreviations cannot have interface declarations - /// (Originally from ..\FSComp.txt:738) + /// (Originally from ..\FSComp.txt:741) static member tcTypeAbbreviationsCannotHaveInterfaceDeclaration() = (906, GetStringFunc("tcTypeAbbreviationsCannotHaveInterfaceDeclaration",",,,") ) /// Enumerations cannot have interface declarations - /// (Originally from ..\FSComp.txt:739) + /// (Originally from ..\FSComp.txt:742) static member tcEnumerationsCannotHaveInterfaceDeclaration() = (907, GetStringFunc("tcEnumerationsCannotHaveInterfaceDeclaration",",,,") ) /// This type is not an interface type - /// (Originally from ..\FSComp.txt:740) + /// (Originally from ..\FSComp.txt:743) static member tcTypeIsNotInterfaceType0() = (908, GetStringFunc("tcTypeIsNotInterfaceType0",",,,") ) /// All implemented interfaces should be declared on the initial declaration of the type - /// (Originally from ..\FSComp.txt:741) + /// (Originally from ..\FSComp.txt:744) static member tcAllImplementedInterfacesShouldBeDeclared() = (909, GetStringFunc("tcAllImplementedInterfacesShouldBeDeclared",",,,") ) /// A default implementation of this interface has already been added because the explicit implementation of the interface was not specified at the definition of the type - /// (Originally from ..\FSComp.txt:742) + /// (Originally from ..\FSComp.txt:745) static member tcDefaultImplementationForInterfaceHasAlreadyBeenAdded() = (910, GetStringFunc("tcDefaultImplementationForInterfaceHasAlreadyBeenAdded",",,,") ) /// This member is not permitted in an interface implementation - /// (Originally from ..\FSComp.txt:743) + /// (Originally from ..\FSComp.txt:746) static member tcMemberNotPermittedInInterfaceImplementation() = (911, GetStringFunc("tcMemberNotPermittedInInterfaceImplementation",",,,") ) /// This declaration element is not permitted in an augmentation - /// (Originally from ..\FSComp.txt:744) + /// (Originally from ..\FSComp.txt:747) static member tcDeclarationElementNotPermittedInAugmentation() = (912, GetStringFunc("tcDeclarationElementNotPermittedInAugmentation",",,,") ) /// Types cannot contain nested type definitions - /// (Originally from ..\FSComp.txt:745) + /// (Originally from ..\FSComp.txt:748) static member tcTypesCannotContainNestedTypes() = (913, GetStringFunc("tcTypesCannotContainNestedTypes",",,,") ) /// type, exception or module - /// (Originally from ..\FSComp.txt:746) + /// (Originally from ..\FSComp.txt:749) static member tcTypeExceptionOrModule() = (GetStringFunc("tcTypeExceptionOrModule",",,,") ) /// type or module - /// (Originally from ..\FSComp.txt:747) + /// (Originally from ..\FSComp.txt:750) static member tcTypeOrModule() = (GetStringFunc("tcTypeOrModule",",,,") ) /// The struct, record or union type '%s' implements the interface 'System.IStructuralEquatable' explicitly. Apply the 'CustomEquality' attribute to the type. - /// (Originally from ..\FSComp.txt:748) + /// (Originally from ..\FSComp.txt:751) static member tcImplementsIStructuralEquatableExplicitly(a0 : System.String) = (914, GetStringFunc("tcImplementsIStructuralEquatableExplicitly",",,,%s,,,") a0) /// The struct, record or union type '%s' implements the interface 'System.IEquatable<_>' explicitly. Apply the 'CustomEquality' attribute to the type and provide a consistent implementation of the non-generic override 'System.Object.Equals(obj)'. - /// (Originally from ..\FSComp.txt:749) + /// (Originally from ..\FSComp.txt:752) static member tcImplementsIEquatableExplicitly(a0 : System.String) = (915, GetStringFunc("tcImplementsIEquatableExplicitly",",,,%s,,,") a0) /// Explicit type specifications cannot be used for exception constructors - /// (Originally from ..\FSComp.txt:750) + /// (Originally from ..\FSComp.txt:753) static member tcExplicitTypeSpecificationCannotBeUsedForExceptionConstructors() = (916, GetStringFunc("tcExplicitTypeSpecificationCannotBeUsedForExceptionConstructors",",,,") ) /// Exception abbreviations should not have argument lists - /// (Originally from ..\FSComp.txt:751) + /// (Originally from ..\FSComp.txt:754) static member tcExceptionAbbreviationsShouldNotHaveArgumentList() = (917, GetStringFunc("tcExceptionAbbreviationsShouldNotHaveArgumentList",",,,") ) /// Abbreviations for Common IL exceptions cannot take arguments - /// (Originally from ..\FSComp.txt:752) + /// (Originally from ..\FSComp.txt:755) static member tcAbbreviationsFordotNetExceptionsCannotTakeArguments() = (918, GetStringFunc("tcAbbreviationsFordotNetExceptionsCannotTakeArguments",",,,") ) /// Exception abbreviations must refer to existing exceptions or F# types deriving from System.Exception - /// (Originally from ..\FSComp.txt:753) + /// (Originally from ..\FSComp.txt:756) static member tcExceptionAbbreviationsMustReferToValidExceptions() = (919, GetStringFunc("tcExceptionAbbreviationsMustReferToValidExceptions",",,,") ) /// Abbreviations for Common IL exception types must have a matching object constructor - /// (Originally from ..\FSComp.txt:754) + /// (Originally from ..\FSComp.txt:757) static member tcAbbreviationsFordotNetExceptionsMustHaveMatchingObjectConstructor() = (920, GetStringFunc("tcAbbreviationsFordotNetExceptionsMustHaveMatchingObjectConstructor",",,,") ) /// Not an exception - /// (Originally from ..\FSComp.txt:755) + /// (Originally from ..\FSComp.txt:758) static member tcNotAnException() = (921, GetStringFunc("tcNotAnException",",,,") ) /// Invalid module name - /// (Originally from ..\FSComp.txt:757) + /// (Originally from ..\FSComp.txt:760) static member tcInvalidModuleName() = (924, GetStringFunc("tcInvalidModuleName",",,,") ) /// Invalid type extension - /// (Originally from ..\FSComp.txt:758) + /// (Originally from ..\FSComp.txt:761) static member tcInvalidTypeExtension() = (925, GetStringFunc("tcInvalidTypeExtension",",,,") ) /// The attributes of this type specify multiple kinds for the type - /// (Originally from ..\FSComp.txt:759) + /// (Originally from ..\FSComp.txt:762) static member tcAttributesOfTypeSpecifyMultipleKindsForType() = (926, GetStringFunc("tcAttributesOfTypeSpecifyMultipleKindsForType",",,,") ) /// The kind of the type specified by its attributes does not match the kind implied by its definition - /// (Originally from ..\FSComp.txt:760) + /// (Originally from ..\FSComp.txt:763) static member tcKindOfTypeSpecifiedDoesNotMatchDefinition() = (927, GetStringFunc("tcKindOfTypeSpecifiedDoesNotMatchDefinition",",,,") ) /// Measure definitions cannot have type parameters - /// (Originally from ..\FSComp.txt:761) + /// (Originally from ..\FSComp.txt:764) static member tcMeasureDefinitionsCannotHaveTypeParameters() = (928, GetStringFunc("tcMeasureDefinitionsCannotHaveTypeParameters",",,,") ) /// This type requires a definition - /// (Originally from ..\FSComp.txt:762) + /// (Originally from ..\FSComp.txt:765) static member tcTypeRequiresDefinition() = (929, GetStringFunc("tcTypeRequiresDefinition",",,,") ) /// This type abbreviation has one or more declared type parameters that do not appear in the type being abbreviated. Type abbreviations must use all declared type parameters in the type being abbreviated. Consider removing one or more type parameters, or use a concrete type definition that wraps an underlying type, such as 'type C<'a> = C of ...'. - /// (Originally from ..\FSComp.txt:763) + /// (Originally from ..\FSComp.txt:766) static member tcTypeAbbreviationHasTypeParametersMissingOnType() = (GetStringFunc("tcTypeAbbreviationHasTypeParametersMissingOnType",",,,") ) /// Structs, interfaces, enums and delegates cannot inherit from other types - /// (Originally from ..\FSComp.txt:764) + /// (Originally from ..\FSComp.txt:767) static member tcStructsInterfacesEnumsDelegatesMayNotInheritFromOtherTypes() = (931, GetStringFunc("tcStructsInterfacesEnumsDelegatesMayNotInheritFromOtherTypes",",,,") ) /// Types cannot inherit from multiple concrete types - /// (Originally from ..\FSComp.txt:765) + /// (Originally from ..\FSComp.txt:768) static member tcTypesCannotInheritFromMultipleConcreteTypes() = (932, GetStringFunc("tcTypesCannotInheritFromMultipleConcreteTypes",",,,") ) /// Records, union, abbreviations and struct types cannot have the 'AllowNullLiteral' attribute - /// (Originally from ..\FSComp.txt:766) + /// (Originally from ..\FSComp.txt:769) static member tcRecordsUnionsAbbreviationsStructsMayNotHaveAllowNullLiteralAttribute() = (934, GetStringFunc("tcRecordsUnionsAbbreviationsStructsMayNotHaveAllowNullLiteralAttribute",",,,") ) /// Types with the 'AllowNullLiteral' attribute may only inherit from or implement types which also allow the use of the null literal - /// (Originally from ..\FSComp.txt:767) + /// (Originally from ..\FSComp.txt:770) static member tcAllowNullTypesMayOnlyInheritFromAllowNullTypes() = (935, GetStringFunc("tcAllowNullTypesMayOnlyInheritFromAllowNullTypes",",,,") ) /// Generic types cannot be given the 'StructLayout' attribute - /// (Originally from ..\FSComp.txt:768) + /// (Originally from ..\FSComp.txt:771) static member tcGenericTypesCannotHaveStructLayout() = (936, GetStringFunc("tcGenericTypesCannotHaveStructLayout",",,,") ) /// Only structs and classes without primary constructors may be given the 'StructLayout' attribute - /// (Originally from ..\FSComp.txt:769) + /// (Originally from ..\FSComp.txt:772) static member tcOnlyStructsCanHaveStructLayout() = (937, GetStringFunc("tcOnlyStructsCanHaveStructLayout",",,,") ) /// The representation of this type is hidden by the signature. It must be given an attribute such as [], [] or [] to indicate the characteristics of the type. - /// (Originally from ..\FSComp.txt:770) + /// (Originally from ..\FSComp.txt:773) static member tcRepresentationOfTypeHiddenBySignature() = (938, GetStringFunc("tcRepresentationOfTypeHiddenBySignature",",,,") ) /// Only classes may be given the 'AbstractClass' attribute - /// (Originally from ..\FSComp.txt:771) + /// (Originally from ..\FSComp.txt:774) static member tcOnlyClassesCanHaveAbstract() = (939, GetStringFunc("tcOnlyClassesCanHaveAbstract",",,,") ) /// Only types representing units-of-measure may be given the 'Measure' attribute - /// (Originally from ..\FSComp.txt:772) + /// (Originally from ..\FSComp.txt:775) static member tcOnlyTypesRepresentingUnitsOfMeasureCanHaveMeasure() = (940, GetStringFunc("tcOnlyTypesRepresentingUnitsOfMeasureCanHaveMeasure",",,,") ) /// Accessibility modifiers are not permitted on overrides or interface implementations - /// (Originally from ..\FSComp.txt:773) + /// (Originally from ..\FSComp.txt:776) static member tcOverridesCannotHaveVisibilityDeclarations() = (941, GetStringFunc("tcOverridesCannotHaveVisibilityDeclarations",",,,") ) /// Discriminated union types are always sealed - /// (Originally from ..\FSComp.txt:774) + /// (Originally from ..\FSComp.txt:777) static member tcTypesAreAlwaysSealedDU() = (942, GetStringFunc("tcTypesAreAlwaysSealedDU",",,,") ) /// Record types are always sealed - /// (Originally from ..\FSComp.txt:775) + /// (Originally from ..\FSComp.txt:778) static member tcTypesAreAlwaysSealedRecord() = (942, GetStringFunc("tcTypesAreAlwaysSealedRecord",",,,") ) /// Assembly code types are always sealed - /// (Originally from ..\FSComp.txt:776) + /// (Originally from ..\FSComp.txt:779) static member tcTypesAreAlwaysSealedAssemblyCode() = (942, GetStringFunc("tcTypesAreAlwaysSealedAssemblyCode",",,,") ) /// Struct types are always sealed - /// (Originally from ..\FSComp.txt:777) + /// (Originally from ..\FSComp.txt:780) static member tcTypesAreAlwaysSealedStruct() = (942, GetStringFunc("tcTypesAreAlwaysSealedStruct",",,,") ) /// Delegate types are always sealed - /// (Originally from ..\FSComp.txt:778) + /// (Originally from ..\FSComp.txt:781) static member tcTypesAreAlwaysSealedDelegate() = (942, GetStringFunc("tcTypesAreAlwaysSealedDelegate",",,,") ) /// Enum types are always sealed - /// (Originally from ..\FSComp.txt:779) + /// (Originally from ..\FSComp.txt:782) static member tcTypesAreAlwaysSealedEnum() = (942, GetStringFunc("tcTypesAreAlwaysSealedEnum",",,,") ) /// Interface types and delegate types cannot contain fields - /// (Originally from ..\FSComp.txt:780) + /// (Originally from ..\FSComp.txt:783) static member tcInterfaceTypesAndDelegatesCannotContainFields() = (943, GetStringFunc("tcInterfaceTypesAndDelegatesCannotContainFields",",,,") ) /// Abbreviated types cannot be given the 'Sealed' attribute - /// (Originally from ..\FSComp.txt:781) + /// (Originally from ..\FSComp.txt:784) static member tcAbbreviatedTypesCannotBeSealed() = (944, GetStringFunc("tcAbbreviatedTypesCannotBeSealed",",,,") ) /// Cannot inherit a sealed type - /// (Originally from ..\FSComp.txt:782) + /// (Originally from ..\FSComp.txt:785) static member tcCannotInheritFromSealedType() = (945, GetStringFunc("tcCannotInheritFromSealedType",",,,") ) /// Cannot inherit from interface type. Use interface ... with instead. - /// (Originally from ..\FSComp.txt:783) + /// (Originally from ..\FSComp.txt:786) static member tcCannotInheritFromInterfaceType() = (946, GetStringFunc("tcCannotInheritFromInterfaceType",",,,") ) /// Struct types cannot contain abstract members - /// (Originally from ..\FSComp.txt:784) + /// (Originally from ..\FSComp.txt:787) static member tcStructTypesCannotContainAbstractMembers() = (947, GetStringFunc("tcStructTypesCannotContainAbstractMembers",",,,") ) /// Interface types cannot be sealed - /// (Originally from ..\FSComp.txt:785) + /// (Originally from ..\FSComp.txt:788) static member tcInterfaceTypesCannotBeSealed() = (948, GetStringFunc("tcInterfaceTypesCannotBeSealed",",,,") ) /// Delegate specifications must be of the form 'typ -> typ' - /// (Originally from ..\FSComp.txt:786) + /// (Originally from ..\FSComp.txt:789) static member tcInvalidDelegateSpecification() = (949, GetStringFunc("tcInvalidDelegateSpecification",",,,") ) /// Delegate specifications must not be curried types. Use 'typ * ... * typ -> typ' for multi-argument delegates, and 'typ -> (typ -> typ)' for delegates returning function values. - /// (Originally from ..\FSComp.txt:787) + /// (Originally from ..\FSComp.txt:790) static member tcDelegatesCannotBeCurried() = (950, GetStringFunc("tcDelegatesCannotBeCurried",",,,") ) /// Literal enumerations must have type int, uint, int16, uint16, int64, uint64, byte, sbyte or char - /// (Originally from ..\FSComp.txt:788) + /// (Originally from ..\FSComp.txt:791) static member tcInvalidTypeForLiteralEnumeration() = (951, GetStringFunc("tcInvalidTypeForLiteralEnumeration",",,,") ) /// This type definition involves an immediate cyclic reference through an abbreviation - /// (Originally from ..\FSComp.txt:790) + /// (Originally from ..\FSComp.txt:793) static member tcTypeDefinitionIsCyclic() = (953, GetStringFunc("tcTypeDefinitionIsCyclic",",,,") ) /// This type definition involves an immediate cyclic reference through a struct field or inheritance relation - /// (Originally from ..\FSComp.txt:791) + /// (Originally from ..\FSComp.txt:794) static member tcTypeDefinitionIsCyclicThroughInheritance() = (954, GetStringFunc("tcTypeDefinitionIsCyclicThroughInheritance",",,,") ) /// The syntax 'type X with ...' is reserved for augmentations. Types whose representations are hidden but which have members are now declared in signatures using 'type X = ...'. You may also need to add the '[] attribute to the type definition in the signature - /// (Originally from ..\FSComp.txt:792) + /// (Originally from ..\FSComp.txt:795) static member tcReservedSyntaxForAugmentation() = (GetStringFunc("tcReservedSyntaxForAugmentation",",,,") ) /// Members that extend interface, delegate or enum types must be placed in a module separate to the definition of the type. This module must either have the AutoOpen attribute or be opened explicitly by client code to bring the extension members into scope. - /// (Originally from ..\FSComp.txt:793) + /// (Originally from ..\FSComp.txt:796) static member tcMembersThatExtendInterfaceMustBePlacedInSeparateModule() = (956, GetStringFunc("tcMembersThatExtendInterfaceMustBePlacedInSeparateModule",",,,") ) /// One or more of the declared type parameters for this type extension have a missing or wrong type constraint not matching the original type constraints on '%s' - /// (Originally from ..\FSComp.txt:794) + /// (Originally from ..\FSComp.txt:797) static member tcDeclaredTypeParametersForExtensionDoNotMatchOriginal(a0 : System.String) = (957, GetStringFunc("tcDeclaredTypeParametersForExtensionDoNotMatchOriginal",",,,%s,,,") a0) /// Type definitions may only have one 'inherit' specification and it must be the first declaration - /// (Originally from ..\FSComp.txt:795) + /// (Originally from ..\FSComp.txt:798) static member tcTypeDefinitionsWithImplicitConstructionMustHaveOneInherit() = (959, GetStringFunc("tcTypeDefinitionsWithImplicitConstructionMustHaveOneInherit",",,,") ) /// 'let' and 'do' bindings must come before member and interface definitions in type definitions - /// (Originally from ..\FSComp.txt:796) + /// (Originally from ..\FSComp.txt:799) static member tcTypeDefinitionsWithImplicitConstructionMustHaveLocalBindingsBeforeMembers() = (960, GetStringFunc("tcTypeDefinitionsWithImplicitConstructionMustHaveLocalBindingsBeforeMembers",",,,") ) /// This 'inherit' declaration specifies the inherited type but no arguments. Consider supplying arguments, e.g. 'inherit BaseType(args)'. - /// (Originally from ..\FSComp.txt:797) + /// (Originally from ..\FSComp.txt:800) static member tcInheritDeclarationMissingArguments() = (961, GetStringFunc("tcInheritDeclarationMissingArguments",",,,") ) /// This 'inherit' declaration has arguments, but is not in a type with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:798) + /// (Originally from ..\FSComp.txt:801) static member tcInheritConstructionCallNotPartOfImplicitSequence() = (962, GetStringFunc("tcInheritConstructionCallNotPartOfImplicitSequence",",,,") ) /// This definition may only be used in a type with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:799) + /// (Originally from ..\FSComp.txt:802) static member tcLetAndDoRequiresImplicitConstructionSequence() = (963, GetStringFunc("tcLetAndDoRequiresImplicitConstructionSequence",",,,") ) /// Type abbreviations cannot have augmentations - /// (Originally from ..\FSComp.txt:800) + /// (Originally from ..\FSComp.txt:803) static member tcTypeAbbreviationsCannotHaveAugmentations() = (964, GetStringFunc("tcTypeAbbreviationsCannotHaveAugmentations",",,,") ) /// The path '%s' is a namespace. A module abbreviation may not abbreviate a namespace. - /// (Originally from ..\FSComp.txt:801) + /// (Originally from ..\FSComp.txt:804) static member tcModuleAbbreviationForNamespace(a0 : System.String) = (965, GetStringFunc("tcModuleAbbreviationForNamespace",",,,%s,,,") a0) /// The type '%s' is used in an invalid way. A value prior to '%s' has an inferred type involving '%s', which is an invalid forward reference. - /// (Originally from ..\FSComp.txt:802) + /// (Originally from ..\FSComp.txt:805) static member tcTypeUsedInInvalidWay(a0 : System.String, a1 : System.String, a2 : System.String) = (966, GetStringFunc("tcTypeUsedInInvalidWay",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The member '%s' is used in an invalid way. A use of '%s' has been inferred prior to the definition of '%s', which is an invalid forward reference. - /// (Originally from ..\FSComp.txt:803) + /// (Originally from ..\FSComp.txt:806) static member tcMemberUsedInInvalidWay(a0 : System.String, a1 : System.String, a2 : System.String) = (967, GetStringFunc("tcMemberUsedInInvalidWay",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The attribute 'AutoOpen(\"%s\")' in the assembly '%s' did not refer to a valid module or namespace in that assembly and has been ignored - /// (Originally from ..\FSComp.txt:806) + /// (Originally from ..\FSComp.txt:809) static member tcAttributeAutoOpenWasIgnored(a0 : System.String, a1 : System.String) = (970, GetStringFunc("tcAttributeAutoOpenWasIgnored",",,,%s,,,%s,,,") a0 a1) /// Undefined value '%s' - /// (Originally from ..\FSComp.txt:807) + /// (Originally from ..\FSComp.txt:810) static member ilUndefinedValue(a0 : System.String) = (971, GetStringFunc("ilUndefinedValue",",,,%s,,,") a0) /// Label %s not found - /// (Originally from ..\FSComp.txt:808) + /// (Originally from ..\FSComp.txt:811) static member ilLabelNotFound(a0 : System.String) = (972, GetStringFunc("ilLabelNotFound",",,,%s,,,") a0) /// Incorrect number of type arguments to local call - /// (Originally from ..\FSComp.txt:809) + /// (Originally from ..\FSComp.txt:812) static member ilIncorrectNumberOfTypeArguments() = (973, GetStringFunc("ilIncorrectNumberOfTypeArguments",",,,") ) /// Dynamic invocation of %s is not supported - /// (Originally from ..\FSComp.txt:810) + /// (Originally from ..\FSComp.txt:813) static member ilDynamicInvocationNotSupported(a0 : System.String) = (GetStringFunc("ilDynamicInvocationNotSupported",",,,%s,,,") a0) /// Taking the address of a literal field is invalid - /// (Originally from ..\FSComp.txt:811) + /// (Originally from ..\FSComp.txt:814) static member ilAddressOfLiteralFieldIsInvalid() = (975, GetStringFunc("ilAddressOfLiteralFieldIsInvalid",",,,") ) /// This operation involves taking the address of a value '%s' represented using a local variable or other special representation. This is invalid. - /// (Originally from ..\FSComp.txt:812) + /// (Originally from ..\FSComp.txt:815) static member ilAddressOfValueHereIsInvalid(a0 : System.String) = (976, GetStringFunc("ilAddressOfValueHereIsInvalid",",,,%s,,,") a0) /// Custom marshallers cannot be specified in F# code. Consider using a C# helper function. - /// (Originally from ..\FSComp.txt:813) + /// (Originally from ..\FSComp.txt:816) static member ilCustomMarshallersCannotBeUsedInFSharp() = (980, GetStringFunc("ilCustomMarshallersCannotBeUsedInFSharp",",,,") ) /// The MarshalAs attribute could not be decoded - /// (Originally from ..\FSComp.txt:814) + /// (Originally from ..\FSComp.txt:817) static member ilMarshalAsAttributeCannotBeDecoded() = (981, GetStringFunc("ilMarshalAsAttributeCannotBeDecoded",",,,") ) /// The signature for this external function contains type parameters. Constrain the argument and return types to indicate the types of the corresponding C function. - /// (Originally from ..\FSComp.txt:815) + /// (Originally from ..\FSComp.txt:818) static member ilSignatureForExternalFunctionContainsTypeParameters() = (982, GetStringFunc("ilSignatureForExternalFunctionContainsTypeParameters",",,,") ) /// The DllImport attribute could not be decoded - /// (Originally from ..\FSComp.txt:816) + /// (Originally from ..\FSComp.txt:819) static member ilDllImportAttributeCouldNotBeDecoded() = (983, GetStringFunc("ilDllImportAttributeCouldNotBeDecoded",",,,") ) /// Literal fields cannot be set - /// (Originally from ..\FSComp.txt:817) + /// (Originally from ..\FSComp.txt:820) static member ilLiteralFieldsCannotBeSet() = (984, GetStringFunc("ilLiteralFieldsCannotBeSet",",,,") ) /// GenSetStorage: %s was represented as a static method but was not an appropriate lambda expression - /// (Originally from ..\FSComp.txt:818) + /// (Originally from ..\FSComp.txt:821) static member ilStaticMethodIsNotLambda(a0 : System.String) = (985, GetStringFunc("ilStaticMethodIsNotLambda",",,,%s,,,") a0) /// Mutable variables cannot escape their method - /// (Originally from ..\FSComp.txt:819) + /// (Originally from ..\FSComp.txt:822) static member ilMutableVariablesCannotEscapeMethod() = (986, GetStringFunc("ilMutableVariablesCannotEscapeMethod",",,,") ) /// Compiler error: unexpected unrealized value - /// (Originally from ..\FSComp.txt:820) + /// (Originally from ..\FSComp.txt:823) static member ilUnexpectedUnrealizedValue() = (987, GetStringFunc("ilUnexpectedUnrealizedValue",",,,") ) /// Main module of program is empty: nothing will happen when it is run - /// (Originally from ..\FSComp.txt:821) + /// (Originally from ..\FSComp.txt:824) static member ilMainModuleEmpty() = (988, GetStringFunc("ilMainModuleEmpty",",,,") ) /// This type cannot be used for a literal field - /// (Originally from ..\FSComp.txt:822) + /// (Originally from ..\FSComp.txt:825) static member ilTypeCannotBeUsedForLiteralField() = (989, GetStringFunc("ilTypeCannotBeUsedForLiteralField",",,,") ) /// Unexpected GetSet annotation on a property - /// (Originally from ..\FSComp.txt:823) + /// (Originally from ..\FSComp.txt:826) static member ilUnexpectedGetSetAnnotation() = (990, GetStringFunc("ilUnexpectedGetSetAnnotation",",,,") ) /// The FieldOffset attribute could not be decoded - /// (Originally from ..\FSComp.txt:824) + /// (Originally from ..\FSComp.txt:827) static member ilFieldOffsetAttributeCouldNotBeDecoded() = (991, GetStringFunc("ilFieldOffsetAttributeCouldNotBeDecoded",",,,") ) /// The StructLayout attribute could not be decoded - /// (Originally from ..\FSComp.txt:825) + /// (Originally from ..\FSComp.txt:828) static member ilStructLayoutAttributeCouldNotBeDecoded() = (992, GetStringFunc("ilStructLayoutAttributeCouldNotBeDecoded",",,,") ) /// The DefaultAugmentation attribute could not be decoded - /// (Originally from ..\FSComp.txt:826) + /// (Originally from ..\FSComp.txt:829) static member ilDefaultAugmentationAttributeCouldNotBeDecoded() = (993, GetStringFunc("ilDefaultAugmentationAttributeCouldNotBeDecoded",",,,") ) /// Reflected definitions cannot contain uses of the prefix splice operator '%%' - /// (Originally from ..\FSComp.txt:827) + /// (Originally from ..\FSComp.txt:830) static member ilReflectedDefinitionsCannotUseSliceOperator() = (994, GetStringFunc("ilReflectedDefinitionsCannotUseSliceOperator",",,,") ) /// Problem with codepage '%d': %s - /// (Originally from ..\FSComp.txt:828) + /// (Originally from ..\FSComp.txt:831) static member optsProblemWithCodepage(a0 : System.Int32, a1 : System.String) = (1000, GetStringFunc("optsProblemWithCodepage",",,,%d,,,%s,,,") a0 a1) /// Copyright (c) Microsoft Corporation. All Rights Reserved. - /// (Originally from ..\FSComp.txt:829) + /// (Originally from ..\FSComp.txt:832) static member optsCopyright() = (GetStringFunc("optsCopyright",",,,") ) /// Freely distributed under the MIT Open Source License. https://github.com/Microsoft/visualfsharp/blob/master/License.txt - /// (Originally from ..\FSComp.txt:830) + /// (Originally from ..\FSComp.txt:833) static member optsCopyrightCommunity() = (GetStringFunc("optsCopyrightCommunity",",,,") ) /// Name of the output file (Short form: -o) - /// (Originally from ..\FSComp.txt:831) + /// (Originally from ..\FSComp.txt:834) static member optsNameOfOutputFile() = (GetStringFunc("optsNameOfOutputFile",",,,") ) /// Build a console executable - /// (Originally from ..\FSComp.txt:832) + /// (Originally from ..\FSComp.txt:835) static member optsBuildConsole() = (GetStringFunc("optsBuildConsole",",,,") ) /// Build a Windows executable - /// (Originally from ..\FSComp.txt:833) + /// (Originally from ..\FSComp.txt:836) static member optsBuildWindows() = (GetStringFunc("optsBuildWindows",",,,") ) /// Build a library (Short form: -a) - /// (Originally from ..\FSComp.txt:834) + /// (Originally from ..\FSComp.txt:837) static member optsBuildLibrary() = (GetStringFunc("optsBuildLibrary",",,,") ) /// Build a module that can be added to another assembly - /// (Originally from ..\FSComp.txt:835) + /// (Originally from ..\FSComp.txt:838) static member optsBuildModule() = (GetStringFunc("optsBuildModule",",,,") ) /// Delay-sign the assembly using only the public portion of the strong name key - /// (Originally from ..\FSComp.txt:836) + /// (Originally from ..\FSComp.txt:839) static member optsDelaySign() = (GetStringFunc("optsDelaySign",",,,") ) /// Public-sign the assembly using only the public portion of the strong name key, and mark the assembly as signed - /// (Originally from ..\FSComp.txt:837) + /// (Originally from ..\FSComp.txt:840) static member optsPublicSign() = (GetStringFunc("optsPublicSign",",,,") ) /// Write the xmldoc of the assembly to the given file - /// (Originally from ..\FSComp.txt:838) + /// (Originally from ..\FSComp.txt:841) static member optsWriteXml() = (GetStringFunc("optsWriteXml",",,,") ) /// Specify a strong name key file - /// (Originally from ..\FSComp.txt:839) + /// (Originally from ..\FSComp.txt:842) static member optsStrongKeyFile() = (GetStringFunc("optsStrongKeyFile",",,,") ) /// Specify a strong name key container - /// (Originally from ..\FSComp.txt:840) + /// (Originally from ..\FSComp.txt:843) static member optsStrongKeyContainer() = (GetStringFunc("optsStrongKeyContainer",",,,") ) /// Limit which platforms this code can run on: x86, Itanium, x64, anycpu32bitpreferred, or anycpu. The default is anycpu. - /// (Originally from ..\FSComp.txt:841) + /// (Originally from ..\FSComp.txt:844) static member optsPlatform() = (GetStringFunc("optsPlatform",",,,") ) /// Only include optimization information essential for implementing inlined constructs. Inhibits cross-module inlining but improves binary compatibility. - /// (Originally from ..\FSComp.txt:842) + /// (Originally from ..\FSComp.txt:845) static member optsNoOpt() = (GetStringFunc("optsNoOpt",",,,") ) /// Don't add a resource to the generated assembly containing F#-specific metadata - /// (Originally from ..\FSComp.txt:843) + /// (Originally from ..\FSComp.txt:846) static member optsNoInterface() = (GetStringFunc("optsNoInterface",",,,") ) /// Print the inferred interface of the assembly to a file - /// (Originally from ..\FSComp.txt:844) + /// (Originally from ..\FSComp.txt:847) static member optsSig() = (GetStringFunc("optsSig",",,,") ) /// Reference an assembly (Short form: -r) - /// (Originally from ..\FSComp.txt:845) + /// (Originally from ..\FSComp.txt:848) static member optsReference() = (GetStringFunc("optsReference",",,,") ) /// Specify a Win32 resource file (.res) - /// (Originally from ..\FSComp.txt:846) + /// (Originally from ..\FSComp.txt:849) static member optsWin32res() = (GetStringFunc("optsWin32res",",,,") ) /// Specify a Win32 manifest file - /// (Originally from ..\FSComp.txt:847) + /// (Originally from ..\FSComp.txt:850) static member optsWin32manifest() = (GetStringFunc("optsWin32manifest",",,,") ) /// Do not include the default Win32 manifest - /// (Originally from ..\FSComp.txt:848) + /// (Originally from ..\FSComp.txt:851) static member optsNowin32manifest() = (GetStringFunc("optsNowin32manifest",",,,") ) /// Embed all source files in the portable PDB file - /// (Originally from ..\FSComp.txt:849) + /// (Originally from ..\FSComp.txt:852) static member optsEmbedAllSource() = (GetStringFunc("optsEmbedAllSource",",,,") ) /// Embed specific source files in the portable PDB file - /// (Originally from ..\FSComp.txt:850) + /// (Originally from ..\FSComp.txt:853) static member optsEmbedSource() = (GetStringFunc("optsEmbedSource",",,,") ) /// Source link information file to embed in the portable PDB file - /// (Originally from ..\FSComp.txt:851) + /// (Originally from ..\FSComp.txt:854) static member optsSourceLink() = (GetStringFunc("optsSourceLink",",,,") ) /// --embed switch only supported when emitting a Portable PDB (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:852) + /// (Originally from ..\FSComp.txt:855) static member optsEmbeddedSourceRequirePortablePDBs() = (1501, GetStringFunc("optsEmbeddedSourceRequirePortablePDBs",",,,") ) /// --sourcelink switch only supported when emitting a Portable PDB (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:853) + /// (Originally from ..\FSComp.txt:856) static member optsSourceLinkRequirePortablePDBs() = (1502, GetStringFunc("optsSourceLinkRequirePortablePDBs",",,,") ) /// Source file is too large to embed in a portable PDB - /// (Originally from ..\FSComp.txt:854) + /// (Originally from ..\FSComp.txt:857) static member srcFileTooLarge() = (GetStringFunc("srcFileTooLarge",",,,") ) /// Embed the specified managed resource - /// (Originally from ..\FSComp.txt:855) + /// (Originally from ..\FSComp.txt:858) static member optsResource() = (GetStringFunc("optsResource",",,,") ) /// Link the specified resource to this assembly where the resinfo format is [,[,public|private]] - /// (Originally from ..\FSComp.txt:856) + /// (Originally from ..\FSComp.txt:859) static member optsLinkresource() = (GetStringFunc("optsLinkresource",",,,") ) /// Emit debug information (Short form: -g) - /// (Originally from ..\FSComp.txt:857) + /// (Originally from ..\FSComp.txt:860) static member optsDebugPM() = (GetStringFunc("optsDebugPM",",,,") ) /// Specify debugging type: full, portable, embedded, pdbonly. ('%s' is the default if no debuggging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - /// (Originally from ..\FSComp.txt:858) + /// (Originally from ..\FSComp.txt:861) static member optsDebug(a0 : System.String) = (GetStringFunc("optsDebug",",,,%s,,,") a0) /// Enable optimizations (Short form: -O) - /// (Originally from ..\FSComp.txt:859) + /// (Originally from ..\FSComp.txt:862) static member optsOptimize() = (GetStringFunc("optsOptimize",",,,") ) /// Enable or disable tailcalls - /// (Originally from ..\FSComp.txt:860) + /// (Originally from ..\FSComp.txt:863) static member optsTailcalls() = (GetStringFunc("optsTailcalls",",,,") ) /// Produce a deterministic assembly (including module version GUID and timestamp) - /// (Originally from ..\FSComp.txt:861) + /// (Originally from ..\FSComp.txt:864) static member optsDeterministic() = (GetStringFunc("optsDeterministic",",,,") ) /// Enable or disable cross-module optimizations - /// (Originally from ..\FSComp.txt:862) + /// (Originally from ..\FSComp.txt:865) static member optsCrossoptimize() = (GetStringFunc("optsCrossoptimize",",,,") ) /// Report all warnings as errors - /// (Originally from ..\FSComp.txt:863) + /// (Originally from ..\FSComp.txt:866) static member optsWarnaserrorPM() = (GetStringFunc("optsWarnaserrorPM",",,,") ) /// Report specific warnings as errors - /// (Originally from ..\FSComp.txt:864) + /// (Originally from ..\FSComp.txt:867) static member optsWarnaserror() = (GetStringFunc("optsWarnaserror",",,,") ) /// Set a warning level (0-5) - /// (Originally from ..\FSComp.txt:865) + /// (Originally from ..\FSComp.txt:868) static member optsWarn() = (GetStringFunc("optsWarn",",,,") ) /// Disable specific warning messages - /// (Originally from ..\FSComp.txt:866) + /// (Originally from ..\FSComp.txt:869) static member optsNowarn() = (GetStringFunc("optsNowarn",",,,") ) /// Enable specific warnings that may be off by default - /// (Originally from ..\FSComp.txt:867) + /// (Originally from ..\FSComp.txt:870) static member optsWarnOn() = (GetStringFunc("optsWarnOn",",,,") ) /// Enable nullness declarations and checks - /// (Originally from ..\FSComp.txt:868) + /// (Originally from ..\FSComp.txt:871) static member optsCheckNulls() = (GetStringFunc("optsCheckNulls",",,,") ) /// Specify the language version - /// (Originally from ..\FSComp.txt:869) + /// (Originally from ..\FSComp.txt:872) static member optsLangVersion() = (GetStringFunc("optsLangVersion",",,,") ) /// Generate overflow checks - /// (Originally from ..\FSComp.txt:870) + /// (Originally from ..\FSComp.txt:873) static member optsChecked() = (GetStringFunc("optsChecked",",,,") ) /// Define conditional compilation symbols (Short form: -d) - /// (Originally from ..\FSComp.txt:871) + /// (Originally from ..\FSComp.txt:874) static member optsDefine() = (GetStringFunc("optsDefine",",,,") ) /// Ignore ML compatibility warnings - /// (Originally from ..\FSComp.txt:872) + /// (Originally from ..\FSComp.txt:875) static member optsMlcompatibility() = (GetStringFunc("optsMlcompatibility",",,,") ) /// Suppress compiler copyright message - /// (Originally from ..\FSComp.txt:873) + /// (Originally from ..\FSComp.txt:876) static member optsNologo() = (GetStringFunc("optsNologo",",,,") ) /// Display this usage message (Short form: -?) - /// (Originally from ..\FSComp.txt:874) + /// (Originally from ..\FSComp.txt:877) static member optsHelp() = (GetStringFunc("optsHelp",",,,") ) /// Read response file for more options - /// (Originally from ..\FSComp.txt:875) + /// (Originally from ..\FSComp.txt:878) static member optsResponseFile() = (GetStringFunc("optsResponseFile",",,,") ) /// Specify the codepage used to read source files - /// (Originally from ..\FSComp.txt:876) + /// (Originally from ..\FSComp.txt:879) static member optsCodepage() = (GetStringFunc("optsCodepage",",,,") ) /// Output messages in UTF-8 encoding - /// (Originally from ..\FSComp.txt:877) + /// (Originally from ..\FSComp.txt:880) static member optsUtf8output() = (GetStringFunc("optsUtf8output",",,,") ) /// Output messages with fully qualified paths - /// (Originally from ..\FSComp.txt:878) + /// (Originally from ..\FSComp.txt:881) static member optsFullpaths() = (GetStringFunc("optsFullpaths",",,,") ) /// Specify a directory for the include path which is used to resolve source files and assemblies (Short form: -I) - /// (Originally from ..\FSComp.txt:879) + /// (Originally from ..\FSComp.txt:882) static member optsLib() = (GetStringFunc("optsLib",",,,") ) /// Base address for the library to be built - /// (Originally from ..\FSComp.txt:880) + /// (Originally from ..\FSComp.txt:883) static member optsBaseaddress() = (GetStringFunc("optsBaseaddress",",,,") ) /// Do not reference the default CLI assemblies by default - /// (Originally from ..\FSComp.txt:881) + /// (Originally from ..\FSComp.txt:884) static member optsNoframework() = (GetStringFunc("optsNoframework",",,,") ) /// Statically link the F# library and all referenced DLLs that depend on it into the assembly being generated - /// (Originally from ..\FSComp.txt:882) + /// (Originally from ..\FSComp.txt:885) static member optsStandalone() = (GetStringFunc("optsStandalone",",,,") ) /// Statically link the given assembly and all referenced DLLs that depend on this assembly. Use an assembly name e.g. mylib, not a DLL name. - /// (Originally from ..\FSComp.txt:883) + /// (Originally from ..\FSComp.txt:886) static member optsStaticlink() = (GetStringFunc("optsStaticlink",",,,") ) /// Use a resident background compilation service to improve compiler startup times. - /// (Originally from ..\FSComp.txt:884) + /// (Originally from ..\FSComp.txt:887) static member optsResident() = (GetStringFunc("optsResident",",,,") ) /// Name the output debug file - /// (Originally from ..\FSComp.txt:885) + /// (Originally from ..\FSComp.txt:888) static member optsPdb() = (GetStringFunc("optsPdb",",,,") ) /// Resolve assembly references using directory-based rules rather than MSBuild resolution - /// (Originally from ..\FSComp.txt:886) + /// (Originally from ..\FSComp.txt:889) static member optsSimpleresolution() = (GetStringFunc("optsSimpleresolution",",,,") ) /// Unrecognized target '%s', expected 'exe', 'winexe', 'library' or 'module' - /// (Originally from ..\FSComp.txt:887) + /// (Originally from ..\FSComp.txt:890) static member optsUnrecognizedTarget(a0 : System.String) = (1048, GetStringFunc("optsUnrecognizedTarget",",,,%s,,,") a0) /// Unrecognized debug type '%s', expected 'pdbonly' or 'full' - /// (Originally from ..\FSComp.txt:888) + /// (Originally from ..\FSComp.txt:891) static member optsUnrecognizedDebugType(a0 : System.String) = (1049, GetStringFunc("optsUnrecognizedDebugType",",,,%s,,,") a0) /// Invalid warning level '%d' - /// (Originally from ..\FSComp.txt:889) + /// (Originally from ..\FSComp.txt:892) static member optsInvalidWarningLevel(a0 : System.Int32) = (1050, GetStringFunc("optsInvalidWarningLevel",",,,%d,,,") a0) /// Short form of '%s' - /// (Originally from ..\FSComp.txt:890) + /// (Originally from ..\FSComp.txt:893) static member optsShortFormOf(a0 : System.String) = (GetStringFunc("optsShortFormOf",",,,%s,,,") a0) /// The command-line option '--cliroot' has been deprecated. Use an explicit reference to a specific copy of mscorlib.dll instead. - /// (Originally from ..\FSComp.txt:891) + /// (Originally from ..\FSComp.txt:894) static member optsClirootDeprecatedMsg() = (GetStringFunc("optsClirootDeprecatedMsg",",,,") ) /// Use to override where the compiler looks for mscorlib.dll and framework components - /// (Originally from ..\FSComp.txt:892) + /// (Originally from ..\FSComp.txt:895) static member optsClirootDescription() = (GetStringFunc("optsClirootDescription",",,,") ) /// - OUTPUT FILES - - /// (Originally from ..\FSComp.txt:893) + /// (Originally from ..\FSComp.txt:896) static member optsHelpBannerOutputFiles() = (GetStringFunc("optsHelpBannerOutputFiles",",,,") ) /// - INPUT FILES - - /// (Originally from ..\FSComp.txt:894) + /// (Originally from ..\FSComp.txt:897) static member optsHelpBannerInputFiles() = (GetStringFunc("optsHelpBannerInputFiles",",,,") ) /// - RESOURCES - - /// (Originally from ..\FSComp.txt:895) + /// (Originally from ..\FSComp.txt:898) static member optsHelpBannerResources() = (GetStringFunc("optsHelpBannerResources",",,,") ) /// - CODE GENERATION - - /// (Originally from ..\FSComp.txt:896) + /// (Originally from ..\FSComp.txt:899) static member optsHelpBannerCodeGen() = (GetStringFunc("optsHelpBannerCodeGen",",,,") ) /// - ADVANCED - - /// (Originally from ..\FSComp.txt:897) + /// (Originally from ..\FSComp.txt:900) static member optsHelpBannerAdvanced() = (GetStringFunc("optsHelpBannerAdvanced",",,,") ) /// - MISCELLANEOUS - - /// (Originally from ..\FSComp.txt:898) + /// (Originally from ..\FSComp.txt:901) static member optsHelpBannerMisc() = (GetStringFunc("optsHelpBannerMisc",",,,") ) /// - LANGUAGE - - /// (Originally from ..\FSComp.txt:899) + /// (Originally from ..\FSComp.txt:902) static member optsHelpBannerLanguage() = (GetStringFunc("optsHelpBannerLanguage",",,,") ) /// - ERRORS AND WARNINGS - - /// (Originally from ..\FSComp.txt:900) + /// (Originally from ..\FSComp.txt:903) static member optsHelpBannerErrsAndWarns() = (GetStringFunc("optsHelpBannerErrsAndWarns",",,,") ) /// Unknown --test argument: '%s' - /// (Originally from ..\FSComp.txt:901) + /// (Originally from ..\FSComp.txt:904) static member optsUnknownArgumentToTheTestSwitch(a0 : System.String) = (1063, GetStringFunc("optsUnknownArgumentToTheTestSwitch",",,,%s,,,") a0) /// Unrecognized platform '%s', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu' - /// (Originally from ..\FSComp.txt:902) + /// (Originally from ..\FSComp.txt:905) static member optsUnknownPlatform(a0 : System.String) = (1064, GetStringFunc("optsUnknownPlatform",",,,%s,,,") a0) /// The command-line option '%s' is for test purposes only - /// (Originally from ..\FSComp.txt:903) + /// (Originally from ..\FSComp.txt:906) static member optsInternalNoDescription(a0 : System.String) = (GetStringFunc("optsInternalNoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated - /// (Originally from ..\FSComp.txt:904) + /// (Originally from ..\FSComp.txt:907) static member optsDCLONoDescription(a0 : System.String) = (GetStringFunc("optsDCLONoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated. Use '%s' instead. - /// (Originally from ..\FSComp.txt:905) + /// (Originally from ..\FSComp.txt:908) static member optsDCLODeprecatedSuggestAlternative(a0 : System.String, a1 : System.String) = (GetStringFunc("optsDCLODeprecatedSuggestAlternative",",,,%s,,,%s,,,") a0 a1) /// The command-line option '%s' has been deprecated. HTML document generation is now part of the F# Power Pack, via the tool FsHtmlDoc.exe. - /// (Originally from ..\FSComp.txt:906) + /// (Originally from ..\FSComp.txt:909) static member optsDCLOHtmlDoc(a0 : System.String) = (GetStringFunc("optsDCLOHtmlDoc",",,,%s,,,") a0) /// Output warning and error messages in color - /// (Originally from ..\FSComp.txt:907) + /// (Originally from ..\FSComp.txt:910) static member optsConsoleColors() = (GetStringFunc("optsConsoleColors",",,,") ) /// Enable high-entropy ASLR - /// (Originally from ..\FSComp.txt:908) + /// (Originally from ..\FSComp.txt:911) static member optsUseHighEntropyVA() = (GetStringFunc("optsUseHighEntropyVA",",,,") ) /// Specify subsystem version of this assembly - /// (Originally from ..\FSComp.txt:909) + /// (Originally from ..\FSComp.txt:912) static member optsSubSystemVersion() = (GetStringFunc("optsSubSystemVersion",",,,") ) /// Specify target framework profile of this assembly. Valid values are mscorlib, netcore or netstandard. Default - mscorlib - /// (Originally from ..\FSComp.txt:910) + /// (Originally from ..\FSComp.txt:913) static member optsTargetProfile() = (GetStringFunc("optsTargetProfile",",,,") ) /// Emit debug information in quotations - /// (Originally from ..\FSComp.txt:911) + /// (Originally from ..\FSComp.txt:914) static member optsEmitDebugInfoInQuotations() = (GetStringFunc("optsEmitDebugInfoInQuotations",",,,") ) /// Specify the preferred output language culture name (e.g. es-ES, ja-JP) - /// (Originally from ..\FSComp.txt:912) + /// (Originally from ..\FSComp.txt:915) static member optsPreferredUiLang() = (GetStringFunc("optsPreferredUiLang",",,,") ) /// Don't copy FSharp.Core.dll along the produced binaries - /// (Originally from ..\FSComp.txt:913) + /// (Originally from ..\FSComp.txt:916) static member optsNoCopyFsharpCore() = (GetStringFunc("optsNoCopyFsharpCore",",,,") ) /// Invalid version '%s' for '--subsystemversion'. The version must be 4.00 or greater. - /// (Originally from ..\FSComp.txt:914) + /// (Originally from ..\FSComp.txt:917) static member optsInvalidSubSystemVersion(a0 : System.String) = (1051, GetStringFunc("optsInvalidSubSystemVersion",",,,%s,,,") a0) /// Invalid value '%s' for '--targetprofile', valid values are 'mscorlib', 'netcore' or 'netstandard'. - /// (Originally from ..\FSComp.txt:915) + /// (Originally from ..\FSComp.txt:918) static member optsInvalidTargetProfile(a0 : System.String) = (1052, GetStringFunc("optsInvalidTargetProfile",",,,%s,,,") a0) /// Full name - /// (Originally from ..\FSComp.txt:916) + /// (Originally from ..\FSComp.txt:919) static member typeInfoFullName() = (GetStringFunc("typeInfoFullName",",,,") ) /// and %d other overloads - /// (Originally from ..\FSComp.txt:920) + /// (Originally from ..\FSComp.txt:923) static member typeInfoOtherOverloads(a0 : System.Int32) = (GetStringFunc("typeInfoOtherOverloads",",,,%d,,,") a0) /// union case - /// (Originally from ..\FSComp.txt:921) + /// (Originally from ..\FSComp.txt:924) static member typeInfoUnionCase() = (GetStringFunc("typeInfoUnionCase",",,,") ) /// active pattern result - /// (Originally from ..\FSComp.txt:922) + /// (Originally from ..\FSComp.txt:925) static member typeInfoActivePatternResult() = (GetStringFunc("typeInfoActivePatternResult",",,,") ) /// active recognizer - /// (Originally from ..\FSComp.txt:923) + /// (Originally from ..\FSComp.txt:926) static member typeInfoActiveRecognizer() = (GetStringFunc("typeInfoActiveRecognizer",",,,") ) /// field - /// (Originally from ..\FSComp.txt:924) + /// (Originally from ..\FSComp.txt:927) static member typeInfoField() = (GetStringFunc("typeInfoField",",,,") ) /// event - /// (Originally from ..\FSComp.txt:925) + /// (Originally from ..\FSComp.txt:928) static member typeInfoEvent() = (GetStringFunc("typeInfoEvent",",,,") ) /// property - /// (Originally from ..\FSComp.txt:926) + /// (Originally from ..\FSComp.txt:929) static member typeInfoProperty() = (GetStringFunc("typeInfoProperty",",,,") ) /// extension - /// (Originally from ..\FSComp.txt:927) + /// (Originally from ..\FSComp.txt:930) static member typeInfoExtension() = (GetStringFunc("typeInfoExtension",",,,") ) /// custom operation - /// (Originally from ..\FSComp.txt:928) + /// (Originally from ..\FSComp.txt:931) static member typeInfoCustomOperation() = (GetStringFunc("typeInfoCustomOperation",",,,") ) /// argument - /// (Originally from ..\FSComp.txt:929) + /// (Originally from ..\FSComp.txt:932) static member typeInfoArgument() = (GetStringFunc("typeInfoArgument",",,,") ) /// anonymous record field - /// (Originally from ..\FSComp.txt:930) + /// (Originally from ..\FSComp.txt:933) static member typeInfoAnonRecdField() = (GetStringFunc("typeInfoAnonRecdField",",,,") ) /// patvar - /// (Originally from ..\FSComp.txt:931) + /// (Originally from ..\FSComp.txt:934) static member typeInfoPatternVariable() = (GetStringFunc("typeInfoPatternVariable",",,,") ) /// namespace - /// (Originally from ..\FSComp.txt:932) + /// (Originally from ..\FSComp.txt:935) static member typeInfoNamespace() = (GetStringFunc("typeInfoNamespace",",,,") ) /// module - /// (Originally from ..\FSComp.txt:933) + /// (Originally from ..\FSComp.txt:936) static member typeInfoModule() = (GetStringFunc("typeInfoModule",",,,") ) /// namespace/module - /// (Originally from ..\FSComp.txt:934) + /// (Originally from ..\FSComp.txt:937) static member typeInfoNamespaceOrModule() = (GetStringFunc("typeInfoNamespaceOrModule",",,,") ) /// from %s - /// (Originally from ..\FSComp.txt:935) + /// (Originally from ..\FSComp.txt:938) static member typeInfoFromFirst(a0 : System.String) = (GetStringFunc("typeInfoFromFirst",",,,%s,,,") a0) /// also from %s - /// (Originally from ..\FSComp.txt:936) + /// (Originally from ..\FSComp.txt:939) static member typeInfoFromNext(a0 : System.String) = (GetStringFunc("typeInfoFromNext",",,,%s,,,") a0) /// generated property - /// (Originally from ..\FSComp.txt:937) + /// (Originally from ..\FSComp.txt:940) static member typeInfoGeneratedProperty() = (GetStringFunc("typeInfoGeneratedProperty",",,,") ) /// generated type - /// (Originally from ..\FSComp.txt:938) + /// (Originally from ..\FSComp.txt:941) static member typeInfoGeneratedType() = (GetStringFunc("typeInfoGeneratedType",",,,") ) /// Found by AssemblyFolders registry key - /// (Originally from ..\FSComp.txt:939) + /// (Originally from ..\FSComp.txt:942) static member assemblyResolutionFoundByAssemblyFoldersKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersKey",",,,") ) /// Found by AssemblyFoldersEx registry key - /// (Originally from ..\FSComp.txt:940) + /// (Originally from ..\FSComp.txt:943) static member assemblyResolutionFoundByAssemblyFoldersExKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersExKey",",,,") ) /// .NET Framework - /// (Originally from ..\FSComp.txt:941) + /// (Originally from ..\FSComp.txt:944) static member assemblyResolutionNetFramework() = (GetStringFunc("assemblyResolutionNetFramework",",,,") ) /// Global Assembly Cache - /// (Originally from ..\FSComp.txt:942) + /// (Originally from ..\FSComp.txt:945) static member assemblyResolutionGAC() = (GetStringFunc("assemblyResolutionGAC",",,,") ) /// Recursive class hierarchy in type '%s' - /// (Originally from ..\FSComp.txt:943) + /// (Originally from ..\FSComp.txt:946) static member recursiveClassHierarchy(a0 : System.String) = (1089, GetStringFunc("recursiveClassHierarchy",",,,%s,,,") a0) /// Invalid recursive reference to an abstract slot - /// (Originally from ..\FSComp.txt:944) + /// (Originally from ..\FSComp.txt:947) static member InvalidRecursiveReferenceToAbstractSlot() = (1090, GetStringFunc("InvalidRecursiveReferenceToAbstractSlot",",,,") ) /// The event '%s' has a non-standard type. If this event is declared in another CLI language, you may need to access this event using the explicit %s and %s methods for the event. If this event is declared in F#, make the type of the event an instantiation of either 'IDelegateEvent<_>' or 'IEvent<_,_>'. - /// (Originally from ..\FSComp.txt:945) + /// (Originally from ..\FSComp.txt:948) static member eventHasNonStandardType(a0 : System.String, a1 : System.String, a2 : System.String) = (1091, GetStringFunc("eventHasNonStandardType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:946) + /// (Originally from ..\FSComp.txt:949) static member typeIsNotAccessible(a0 : System.String) = (1092, GetStringFunc("typeIsNotAccessible",",,,%s,,,") a0) /// The union cases or fields of the type '%s' are not accessible from this code location - /// (Originally from ..\FSComp.txt:947) + /// (Originally from ..\FSComp.txt:950) static member unionCasesAreNotAccessible(a0 : System.String) = (1093, GetStringFunc("unionCasesAreNotAccessible",",,,%s,,,") a0) /// The value '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:948) + /// (Originally from ..\FSComp.txt:951) static member valueIsNotAccessible(a0 : System.String) = (1094, GetStringFunc("valueIsNotAccessible",",,,%s,,,") a0) /// The union case '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:949) + /// (Originally from ..\FSComp.txt:952) static member unionCaseIsNotAccessible(a0 : System.String) = (1095, GetStringFunc("unionCaseIsNotAccessible",",,,%s,,,") a0) /// The record, struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:950) + /// (Originally from ..\FSComp.txt:953) static member fieldIsNotAccessible(a0 : System.String) = (1096, GetStringFunc("fieldIsNotAccessible",",,,%s,,,") a0) /// The struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:951) + /// (Originally from ..\FSComp.txt:954) static member structOrClassFieldIsNotAccessible(a0 : System.String) = (1097, GetStringFunc("structOrClassFieldIsNotAccessible",",,,%s,,,") a0) /// This construct is experimental - /// (Originally from ..\FSComp.txt:952) + /// (Originally from ..\FSComp.txt:955) static member experimentalConstruct() = (GetStringFunc("experimentalConstruct",",,,") ) /// No Invoke methods found for delegate type - /// (Originally from ..\FSComp.txt:953) + /// (Originally from ..\FSComp.txt:956) static member noInvokeMethodsFound() = (1099, GetStringFunc("noInvokeMethodsFound",",,,") ) /// More than one Invoke method found for delegate type - /// (Originally from ..\FSComp.txt:954) + /// (Originally from ..\FSComp.txt:957) static member moreThanOneInvokeMethodFound() = (GetStringFunc("moreThanOneInvokeMethodFound",",,,") ) /// Delegates are not allowed to have curried signatures - /// (Originally from ..\FSComp.txt:955) + /// (Originally from ..\FSComp.txt:958) static member delegatesNotAllowedToHaveCurriedSignatures() = (1101, GetStringFunc("delegatesNotAllowedToHaveCurriedSignatures",",,,") ) /// Unexpected Expr.TyChoose - /// (Originally from ..\FSComp.txt:956) + /// (Originally from ..\FSComp.txt:959) static member tlrUnexpectedTExpr() = (1102, GetStringFunc("tlrUnexpectedTExpr",",,,") ) /// Note: Lambda-lifting optimizations have not been applied because of the use of this local constrained generic function as a first class value. Adding type constraints may resolve this condition. - /// (Originally from ..\FSComp.txt:957) + /// (Originally from ..\FSComp.txt:960) static member tlrLambdaLiftingOptimizationsNotApplied() = (1103, GetStringFunc("tlrLambdaLiftingOptimizationsNotApplied",",,,") ) /// Identifiers containing '@' are reserved for use in F# code generation - /// (Originally from ..\FSComp.txt:958) + /// (Originally from ..\FSComp.txt:961) static member lexhlpIdentifiersContainingAtSymbolReserved() = (1104, GetStringFunc("lexhlpIdentifiersContainingAtSymbolReserved",",,,") ) /// The identifier '%s' is reserved for future use by F# - /// (Originally from ..\FSComp.txt:959) + /// (Originally from ..\FSComp.txt:962) static member lexhlpIdentifierReserved(a0 : System.String) = (GetStringFunc("lexhlpIdentifierReserved",",,,%s,,,") a0) /// Missing variable '%s' - /// (Originally from ..\FSComp.txt:960) + /// (Originally from ..\FSComp.txt:963) static member patcMissingVariable(a0 : System.String) = (1106, GetStringFunc("patcMissingVariable",",,,%s,,,") a0) /// Partial active patterns may only generate one result - /// (Originally from ..\FSComp.txt:961) + /// (Originally from ..\FSComp.txt:964) static member patcPartialActivePatternsGenerateOneResult() = (1107, GetStringFunc("patcPartialActivePatternsGenerateOneResult",",,,") ) /// The type '%s' is required here and is unavailable. You must add a reference to assembly '%s'. - /// (Originally from ..\FSComp.txt:962) + /// (Originally from ..\FSComp.txt:965) static member impTypeRequiredUnavailable(a0 : System.String, a1 : System.String) = (1108, GetStringFunc("impTypeRequiredUnavailable",",,,%s,,,%s,,,") a0 a1) /// A reference to the type '%s' in assembly '%s' was found, but the type could not be found in that assembly - /// (Originally from ..\FSComp.txt:963) + /// (Originally from ..\FSComp.txt:966) static member impReferencedTypeCouldNotBeFoundInAssembly(a0 : System.String, a1 : System.String) = (1109, GetStringFunc("impReferencedTypeCouldNotBeFoundInAssembly",",,,%s,,,%s,,,") a0 a1) /// Internal error or badly formed metadata: not enough type parameters were in scope while importing - /// (Originally from ..\FSComp.txt:964) + /// (Originally from ..\FSComp.txt:967) static member impNotEnoughTypeParamsInScopeWhileImporting() = (1110, GetStringFunc("impNotEnoughTypeParamsInScopeWhileImporting",",,,") ) /// A reference to the DLL %s is required by assembly %s. The imported type %s is located in the first assembly and could not be resolved. - /// (Originally from ..\FSComp.txt:965) + /// (Originally from ..\FSComp.txt:968) static member impReferenceToDllRequiredByAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (1111, GetStringFunc("impReferenceToDllRequiredByAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// An imported assembly uses the type '%s' but that type is not public - /// (Originally from ..\FSComp.txt:966) + /// (Originally from ..\FSComp.txt:969) static member impImportedAssemblyUsesNotPublicType(a0 : System.String) = (1112, GetStringFunc("impImportedAssemblyUsesNotPublicType",",,,%s,,,") a0) /// The value '%s' was marked inline but its implementation makes use of an internal or private function which is not sufficiently accessible - /// (Originally from ..\FSComp.txt:967) + /// (Originally from ..\FSComp.txt:970) static member optValueMarkedInlineButIncomplete(a0 : System.String) = (1113, GetStringFunc("optValueMarkedInlineButIncomplete",",,,%s,,,") a0) /// The value '%s' was marked inline but was not bound in the optimization environment - /// (Originally from ..\FSComp.txt:968) + /// (Originally from ..\FSComp.txt:971) static member optValueMarkedInlineButWasNotBoundInTheOptEnv(a0 : System.String) = (1114, GetStringFunc("optValueMarkedInlineButWasNotBoundInTheOptEnv",",,,%s,,,") a0) /// Local value %s not found during optimization - /// (Originally from ..\FSComp.txt:969) + /// (Originally from ..\FSComp.txt:972) static member optLocalValueNotFoundDuringOptimization(a0 : System.String) = (1115, GetStringFunc("optLocalValueNotFoundDuringOptimization",",,,%s,,,") a0) /// A value marked as 'inline' has an unexpected value - /// (Originally from ..\FSComp.txt:970) + /// (Originally from ..\FSComp.txt:973) static member optValueMarkedInlineHasUnexpectedValue() = (1116, GetStringFunc("optValueMarkedInlineHasUnexpectedValue",",,,") ) /// A value marked as 'inline' could not be inlined - /// (Originally from ..\FSComp.txt:971) + /// (Originally from ..\FSComp.txt:974) static member optValueMarkedInlineCouldNotBeInlined() = (1117, GetStringFunc("optValueMarkedInlineCouldNotBeInlined",",,,") ) /// Failed to inline the value '%s' marked 'inline', perhaps because a recursive value was marked 'inline' - /// (Originally from ..\FSComp.txt:972) + /// (Originally from ..\FSComp.txt:975) static member optFailedToInlineValue(a0 : System.String) = (1118, GetStringFunc("optFailedToInlineValue",",,,%s,,,") a0) /// Recursive ValValue %s - /// (Originally from ..\FSComp.txt:973) + /// (Originally from ..\FSComp.txt:976) static member optRecursiveValValue(a0 : System.String) = (1119, GetStringFunc("optRecursiveValValue",",,,%s,,,") a0) /// The indentation of this 'in' token is incorrect with respect to the corresponding 'let' - /// (Originally from ..\FSComp.txt:974) + /// (Originally from ..\FSComp.txt:977) static member lexfltIncorrentIndentationOfIn() = (GetStringFunc("lexfltIncorrentIndentationOfIn",",,,") ) /// Possible incorrect indentation: this token is offside of context started at position %s. Try indenting this token further or using standard formatting conventions. - /// (Originally from ..\FSComp.txt:975) + /// (Originally from ..\FSComp.txt:978) static member lexfltTokenIsOffsideOfContextStartedEarlier(a0 : System.String) = (GetStringFunc("lexfltTokenIsOffsideOfContextStartedEarlier",",,,%s,,,") a0) /// The '|' tokens separating rules of this pattern match are misaligned by one column. Consider realigning your code or using further indentation. - /// (Originally from ..\FSComp.txt:976) + /// (Originally from ..\FSComp.txt:979) static member lexfltSeparatorTokensOfPatternMatchMisaligned() = (GetStringFunc("lexfltSeparatorTokensOfPatternMatchMisaligned",",,,") ) /// Invalid module/expression/type - /// (Originally from ..\FSComp.txt:977) + /// (Originally from ..\FSComp.txt:980) static member nrInvalidModuleExprType() = (1123, GetStringFunc("nrInvalidModuleExprType",",,,") ) /// Multiple types exist called '%s', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. '%s'. - /// (Originally from ..\FSComp.txt:978) + /// (Originally from ..\FSComp.txt:981) static member nrTypeInstantiationNeededToDisambiguateTypesWithSameName(a0 : System.String, a1 : System.String) = (1124, GetStringFunc("nrTypeInstantiationNeededToDisambiguateTypesWithSameName",",,,%s,,,%s,,,") a0 a1) /// The instantiation of the generic type '%s' is missing and can't be inferred from the arguments or return type of this member. Consider providing a type instantiation when accessing this type, e.g. '%s'. - /// (Originally from ..\FSComp.txt:979) + /// (Originally from ..\FSComp.txt:982) static member nrTypeInstantiationIsMissingAndCouldNotBeInferred(a0 : System.String, a1 : System.String) = (1125, GetStringFunc("nrTypeInstantiationIsMissingAndCouldNotBeInferred",",,,%s,,,%s,,,") a0 a1) /// 'global' may only be used as the first name in a qualified path - /// (Originally from ..\FSComp.txt:980) + /// (Originally from ..\FSComp.txt:983) static member nrGlobalUsedOnlyAsFirstName() = (1126, GetStringFunc("nrGlobalUsedOnlyAsFirstName",",,,") ) /// This is not a constructor or literal, or a constructor is being used incorrectly - /// (Originally from ..\FSComp.txt:981) + /// (Originally from ..\FSComp.txt:984) static member nrIsNotConstructorOrLiteral() = (1127, GetStringFunc("nrIsNotConstructorOrLiteral",",,,") ) /// Unexpected empty long identifier - /// (Originally from ..\FSComp.txt:982) + /// (Originally from ..\FSComp.txt:985) static member nrUnexpectedEmptyLongId() = (1128, GetStringFunc("nrUnexpectedEmptyLongId",",,,") ) /// The record type '%s' does not contain a label '%s'. - /// (Originally from ..\FSComp.txt:983) + /// (Originally from ..\FSComp.txt:986) static member nrRecordDoesNotContainSuchLabel(a0 : System.String, a1 : System.String) = (1129, GetStringFunc("nrRecordDoesNotContainSuchLabel",",,,%s,,,%s,,,") a0 a1) /// Invalid field label - /// (Originally from ..\FSComp.txt:984) + /// (Originally from ..\FSComp.txt:987) static member nrInvalidFieldLabel() = (1130, GetStringFunc("nrInvalidFieldLabel",",,,") ) /// Invalid expression '%s' - /// (Originally from ..\FSComp.txt:985) + /// (Originally from ..\FSComp.txt:988) static member nrInvalidExpression(a0 : System.String) = (1132, GetStringFunc("nrInvalidExpression",",,,%s,,,") a0) /// No constructors are available for the type '%s' - /// (Originally from ..\FSComp.txt:986) + /// (Originally from ..\FSComp.txt:989) static member nrNoConstructorsAvailableForType(a0 : System.String) = (1133, GetStringFunc("nrNoConstructorsAvailableForType",",,,%s,,,") a0) /// The union type for union case '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the union type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:987) + /// (Originally from ..\FSComp.txt:990) static member nrUnionTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1134, GetStringFunc("nrUnionTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// The record type for the record field '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the record type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:988) + /// (Originally from ..\FSComp.txt:991) static member nrRecordTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1135, GetStringFunc("nrRecordTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// Unexpected error creating debug information file '%s' - /// (Originally from ..\FSComp.txt:989) + /// (Originally from ..\FSComp.txt:992) static member ilwriteErrorCreatingPdb(a0 : System.String) = (1136, GetStringFunc("ilwriteErrorCreatingPdb",",,,%s,,,") a0) /// This number is outside the allowable range for this integer type - /// (Originally from ..\FSComp.txt:990) + /// (Originally from ..\FSComp.txt:993) static member lexOutsideIntegerRange() = (1138, GetStringFunc("lexOutsideIntegerRange",",,,") ) /// '%s' is not permitted as a character in operator names and is reserved for future use - /// (Originally from ..\FSComp.txt:994) + /// (Originally from ..\FSComp.txt:997) static member lexCharNotAllowedInOperatorNames(a0 : System.String) = (GetStringFunc("lexCharNotAllowedInOperatorNames",",,,%s,,,") a0) /// Unexpected character '%s' - /// (Originally from ..\FSComp.txt:995) + /// (Originally from ..\FSComp.txt:998) static member lexUnexpectedChar(a0 : System.String) = (GetStringFunc("lexUnexpectedChar",",,,%s,,,") a0) /// This byte array literal contains characters that do not encode as a single byte - /// (Originally from ..\FSComp.txt:996) + /// (Originally from ..\FSComp.txt:999) static member lexByteArrayCannotEncode() = (1140, GetStringFunc("lexByteArrayCannotEncode",",,,") ) /// Identifiers followed by '%s' are reserved for future use - /// (Originally from ..\FSComp.txt:997) + /// (Originally from ..\FSComp.txt:1000) static member lexIdentEndInMarkReserved(a0 : System.String) = (1141, GetStringFunc("lexIdentEndInMarkReserved",",,,%s,,,") a0) /// This number is outside the allowable range for 8-bit signed integers - /// (Originally from ..\FSComp.txt:998) + /// (Originally from ..\FSComp.txt:1001) static member lexOutsideEightBitSigned() = (1142, GetStringFunc("lexOutsideEightBitSigned",",,,") ) /// This number is outside the allowable range for hexadecimal 8-bit signed integers - /// (Originally from ..\FSComp.txt:999) + /// (Originally from ..\FSComp.txt:1002) static member lexOutsideEightBitSignedHex() = (1143, GetStringFunc("lexOutsideEightBitSignedHex",",,,") ) /// This number is outside the allowable range for 8-bit unsigned integers - /// (Originally from ..\FSComp.txt:1000) + /// (Originally from ..\FSComp.txt:1003) static member lexOutsideEightBitUnsigned() = (1144, GetStringFunc("lexOutsideEightBitUnsigned",",,,") ) /// This number is outside the allowable range for 16-bit signed integers - /// (Originally from ..\FSComp.txt:1001) + /// (Originally from ..\FSComp.txt:1004) static member lexOutsideSixteenBitSigned() = (1145, GetStringFunc("lexOutsideSixteenBitSigned",",,,") ) /// This number is outside the allowable range for 16-bit unsigned integers - /// (Originally from ..\FSComp.txt:1002) + /// (Originally from ..\FSComp.txt:1005) static member lexOutsideSixteenBitUnsigned() = (1146, GetStringFunc("lexOutsideSixteenBitUnsigned",",,,") ) /// This number is outside the allowable range for 32-bit signed integers - /// (Originally from ..\FSComp.txt:1003) + /// (Originally from ..\FSComp.txt:1006) static member lexOutsideThirtyTwoBitSigned() = (1147, GetStringFunc("lexOutsideThirtyTwoBitSigned",",,,") ) /// This number is outside the allowable range for 32-bit unsigned integers - /// (Originally from ..\FSComp.txt:1004) + /// (Originally from ..\FSComp.txt:1007) static member lexOutsideThirtyTwoBitUnsigned() = (1148, GetStringFunc("lexOutsideThirtyTwoBitUnsigned",",,,") ) /// This number is outside the allowable range for 64-bit signed integers - /// (Originally from ..\FSComp.txt:1005) + /// (Originally from ..\FSComp.txt:1008) static member lexOutsideSixtyFourBitSigned() = (1149, GetStringFunc("lexOutsideSixtyFourBitSigned",",,,") ) /// This number is outside the allowable range for 64-bit unsigned integers - /// (Originally from ..\FSComp.txt:1006) + /// (Originally from ..\FSComp.txt:1009) static member lexOutsideSixtyFourBitUnsigned() = (1150, GetStringFunc("lexOutsideSixtyFourBitUnsigned",",,,") ) /// This number is outside the allowable range for signed native integers - /// (Originally from ..\FSComp.txt:1007) + /// (Originally from ..\FSComp.txt:1010) static member lexOutsideNativeSigned() = (1151, GetStringFunc("lexOutsideNativeSigned",",,,") ) /// This number is outside the allowable range for unsigned native integers - /// (Originally from ..\FSComp.txt:1008) + /// (Originally from ..\FSComp.txt:1011) static member lexOutsideNativeUnsigned() = (1152, GetStringFunc("lexOutsideNativeUnsigned",",,,") ) /// Invalid floating point number - /// (Originally from ..\FSComp.txt:1009) + /// (Originally from ..\FSComp.txt:1012) static member lexInvalidFloat() = (1153, GetStringFunc("lexInvalidFloat",",,,") ) /// This number is outside the allowable range for decimal literals - /// (Originally from ..\FSComp.txt:1010) + /// (Originally from ..\FSComp.txt:1013) static member lexOusideDecimal() = (1154, GetStringFunc("lexOusideDecimal",",,,") ) /// This number is outside the allowable range for 32-bit floats - /// (Originally from ..\FSComp.txt:1011) + /// (Originally from ..\FSComp.txt:1014) static member lexOusideThirtyTwoBitFloat() = (1155, GetStringFunc("lexOusideThirtyTwoBitFloat",",,,") ) /// This is not a valid numeric literal. Valid numeric literals include 1, 0x1, 0b0001 (int), 1u (uint32), 1L (int64), 1UL (uint64), 1s (int16), 1y (sbyte), 1uy (byte), 1.0 (float), 1.0f (float32), 1.0m (decimal), 1I (BigInteger). - /// (Originally from ..\FSComp.txt:1012) + /// (Originally from ..\FSComp.txt:1015) static member lexInvalidNumericLiteral() = (1156, GetStringFunc("lexInvalidNumericLiteral",",,,") ) /// This is not a valid byte literal - /// (Originally from ..\FSComp.txt:1013) + /// (Originally from ..\FSComp.txt:1016) static member lexInvalidByteLiteral() = (1157, GetStringFunc("lexInvalidByteLiteral",",,,") ) /// This is not a valid character literal - /// (Originally from ..\FSComp.txt:1014) + /// (Originally from ..\FSComp.txt:1017) static member lexInvalidCharLiteral() = (1158, GetStringFunc("lexInvalidCharLiteral",",,,") ) /// This Unicode encoding is only valid in string literals - /// (Originally from ..\FSComp.txt:1015) + /// (Originally from ..\FSComp.txt:1018) static member lexThisUnicodeOnlyInStringLiterals() = (1159, GetStringFunc("lexThisUnicodeOnlyInStringLiterals",",,,") ) /// This token is reserved for future use - /// (Originally from ..\FSComp.txt:1016) + /// (Originally from ..\FSComp.txt:1019) static member lexTokenReserved() = (1160, GetStringFunc("lexTokenReserved",",,,") ) /// TABs are not allowed in F# code unless the #indent \"off\" option is used - /// (Originally from ..\FSComp.txt:1017) + /// (Originally from ..\FSComp.txt:1020) static member lexTabsNotAllowed() = (1161, GetStringFunc("lexTabsNotAllowed",",,,") ) /// Invalid line number: '%s' - /// (Originally from ..\FSComp.txt:1018) + /// (Originally from ..\FSComp.txt:1021) static member lexInvalidLineNumber(a0 : System.String) = (1162, GetStringFunc("lexInvalidLineNumber",",,,%s,,,") a0) /// #if directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1019) + /// (Originally from ..\FSComp.txt:1022) static member lexHashIfMustBeFirst() = (1163, GetStringFunc("lexHashIfMustBeFirst",",,,") ) /// #else has no matching #if - /// (Originally from ..\FSComp.txt:1020) + /// (Originally from ..\FSComp.txt:1023) static member lexHashElseNoMatchingIf() = (GetStringFunc("lexHashElseNoMatchingIf",",,,") ) /// #endif required for #else - /// (Originally from ..\FSComp.txt:1021) + /// (Originally from ..\FSComp.txt:1024) static member lexHashEndifRequiredForElse() = (GetStringFunc("lexHashEndifRequiredForElse",",,,") ) /// #else directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1022) + /// (Originally from ..\FSComp.txt:1025) static member lexHashElseMustBeFirst() = (1166, GetStringFunc("lexHashElseMustBeFirst",",,,") ) /// #endif has no matching #if - /// (Originally from ..\FSComp.txt:1023) + /// (Originally from ..\FSComp.txt:1026) static member lexHashEndingNoMatchingIf() = (GetStringFunc("lexHashEndingNoMatchingIf",",,,") ) /// #endif directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1024) + /// (Originally from ..\FSComp.txt:1027) static member lexHashEndifMustBeFirst() = (1168, GetStringFunc("lexHashEndifMustBeFirst",",,,") ) /// #if directive should be immediately followed by an identifier - /// (Originally from ..\FSComp.txt:1025) + /// (Originally from ..\FSComp.txt:1028) static member lexHashIfMustHaveIdent() = (1169, GetStringFunc("lexHashIfMustHaveIdent",",,,") ) /// Syntax error. Wrong nested #endif, unexpected tokens before it. - /// (Originally from ..\FSComp.txt:1026) + /// (Originally from ..\FSComp.txt:1029) static member lexWrongNestedHashEndif() = (1170, GetStringFunc("lexWrongNestedHashEndif",",,,") ) /// #! may only appear as the first line at the start of a file. - /// (Originally from ..\FSComp.txt:1027) + /// (Originally from ..\FSComp.txt:1030) static member lexHashBangMustBeFirstInFile() = (GetStringFunc("lexHashBangMustBeFirstInFile",",,,") ) /// Expected single line comment or end of line - /// (Originally from ..\FSComp.txt:1028) + /// (Originally from ..\FSComp.txt:1031) static member pplexExpectedSingleLineComment() = (1171, GetStringFunc("pplexExpectedSingleLineComment",",,,") ) /// Infix operator member '%s' has no arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1029) + /// (Originally from ..\FSComp.txt:1032) static member memberOperatorDefinitionWithNoArguments(a0 : System.String) = (1172, GetStringFunc("memberOperatorDefinitionWithNoArguments",",,,%s,,,") a0) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1030) + /// (Originally from ..\FSComp.txt:1033) static member memberOperatorDefinitionWithNonPairArgument(a0 : System.String, a1 : System.Int32) = (1173, GetStringFunc("memberOperatorDefinitionWithNonPairArgument",",,,%s,,,%d,,,") a0 a1) /// Infix operator member '%s' has extra curried arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1031) + /// (Originally from ..\FSComp.txt:1034) static member memberOperatorDefinitionWithCurriedArguments(a0 : System.String) = (1174, GetStringFunc("memberOperatorDefinitionWithCurriedArguments",",,,%s,,,") a0) /// All record, union and struct types in FSharp.Core.dll must be explicitly labelled with 'StructuralComparison' or 'NoComparison' - /// (Originally from ..\FSComp.txt:1032) + /// (Originally from ..\FSComp.txt:1035) static member tcFSharpCoreRequiresExplicit() = (1175, GetStringFunc("tcFSharpCoreRequiresExplicit",",,,") ) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the type parameter '%s' does not satisfy the 'comparison' constraint. Consider adding the 'comparison' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1033) + /// (Originally from ..\FSComp.txt:1036) static member tcStructuralComparisonNotSatisfied1(a0 : System.String, a1 : System.String) = (1176, GetStringFunc("tcStructuralComparisonNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the component type '%s' does not satisfy the 'comparison' constraint - /// (Originally from ..\FSComp.txt:1034) + /// (Originally from ..\FSComp.txt:1037) static member tcStructuralComparisonNotSatisfied2(a0 : System.String, a1 : System.String) = (1177, GetStringFunc("tcStructuralComparisonNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' is not structurally comparable because the type parameter %s does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1035) + /// (Originally from ..\FSComp.txt:1038) static member tcNoComparisonNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' is not structurally comparable because the type '%s' does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1036) + /// (Originally from ..\FSComp.txt:1039) static member tcNoComparisonNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type parameter %s does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1037) + /// (Originally from ..\FSComp.txt:1040) static member tcNoEqualityNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type '%s' does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1038) + /// (Originally from ..\FSComp.txt:1041) static member tcNoEqualityNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the type parameter '%s' does not satisfy the 'equality' constraint. Consider adding the 'equality' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1039) + /// (Originally from ..\FSComp.txt:1042) static member tcStructuralEqualityNotSatisfied1(a0 : System.String, a1 : System.String) = (1179, GetStringFunc("tcStructuralEqualityNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the component type '%s' does not satisfy the 'equality' constraint - /// (Originally from ..\FSComp.txt:1040) + /// (Originally from ..\FSComp.txt:1043) static member tcStructuralEqualityNotSatisfied2(a0 : System.String, a1 : System.String) = (1180, GetStringFunc("tcStructuralEqualityNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// Each argument of the primary constructor for a struct must be given a type, for example 'type S(x1:int, x2: int) = ...'. These arguments determine the fields of the struct. - /// (Originally from ..\FSComp.txt:1041) + /// (Originally from ..\FSComp.txt:1044) static member tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly() = (1181, GetStringFunc("tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly",",,,") ) /// The value '%s' is unused - /// (Originally from ..\FSComp.txt:1042) + /// (Originally from ..\FSComp.txt:1045) static member chkUnusedValue(a0 : System.String) = (1182, GetStringFunc("chkUnusedValue",",,,%s,,,") a0) /// The recursive object reference '%s' is unused. The presence of a recursive object reference adds runtime initialization checks to members in this and derived types. Consider removing this recursive object reference. - /// (Originally from ..\FSComp.txt:1043) + /// (Originally from ..\FSComp.txt:1046) static member chkUnusedThisVariable(a0 : System.String) = (1183, GetStringFunc("chkUnusedThisVariable",",,,%s,,,") a0) /// A getter property may have at most one argument group - /// (Originally from ..\FSComp.txt:1044) + /// (Originally from ..\FSComp.txt:1047) static member parsGetterAtMostOneArgument() = (1184, GetStringFunc("parsGetterAtMostOneArgument",",,,") ) /// A setter property may have at most two argument groups - /// (Originally from ..\FSComp.txt:1045) + /// (Originally from ..\FSComp.txt:1048) static member parsSetterAtMostTwoArguments() = (1185, GetStringFunc("parsSetterAtMostTwoArguments",",,,") ) /// Invalid property getter or setter - /// (Originally from ..\FSComp.txt:1046) + /// (Originally from ..\FSComp.txt:1049) static member parsInvalidProperty() = (1186, GetStringFunc("parsInvalidProperty",",,,") ) /// An indexer property must be given at least one argument - /// (Originally from ..\FSComp.txt:1047) + /// (Originally from ..\FSComp.txt:1050) static member parsIndexerPropertyRequiresAtLeastOneArgument() = (1187, GetStringFunc("parsIndexerPropertyRequiresAtLeastOneArgument",",,,") ) /// This operation accesses a mutable top-level value defined in another assembly in an unsupported way. The value cannot be accessed through its address. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...', and if necessary assigning the value back after the completion of the operation - /// (Originally from ..\FSComp.txt:1048) + /// (Originally from ..\FSComp.txt:1051) static member tastInvalidAddressOfMutableAcrossAssemblyBoundary() = (1188, GetStringFunc("tastInvalidAddressOfMutableAcrossAssemblyBoundary",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"type C<'T>\", not type \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1049) + /// (Originally from ..\FSComp.txt:1052) static member parsNonAdjacentTypars() = (1189, GetStringFunc("parsNonAdjacentTypars",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"C<'T>\", not \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1050) + /// (Originally from ..\FSComp.txt:1053) static member parsNonAdjacentTyargs() = (1190, GetStringFunc("parsNonAdjacentTyargs",",,,") ) /// The use of the type syntax 'int C' and 'C ' is not permitted here. Consider adjusting this type to be written in the form 'C' - /// (Originally from ..\FSComp.txt:1051) + /// (Originally from ..\FSComp.txt:1054) static member parsNonAtomicType() = (GetStringFunc("parsNonAtomicType",",,,") ) /// The module/namespace '%s' from compilation unit '%s' did not contain the module/namespace '%s' - /// (Originally from ..\FSComp.txt:1054) + /// (Originally from ..\FSComp.txt:1057) static member tastUndefinedItemRefModuleNamespace(a0 : System.String, a1 : System.String, a2 : System.String) = (1193, GetStringFunc("tastUndefinedItemRefModuleNamespace",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the val '%s' - /// (Originally from ..\FSComp.txt:1055) + /// (Originally from ..\FSComp.txt:1058) static member tastUndefinedItemRefVal(a0 : System.String, a1 : System.String, a2 : System.String) = (1194, GetStringFunc("tastUndefinedItemRefVal",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the namespace, module or type '%s' - /// (Originally from ..\FSComp.txt:1056) + /// (Originally from ..\FSComp.txt:1059) static member tastUndefinedItemRefModuleNamespaceType(a0 : System.String, a1 : System.String, a2 : System.String) = (1195, GetStringFunc("tastUndefinedItemRefModuleNamespaceType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The 'UseNullAsTrueValue' attribute flag may only be used with union types that have one nullary case and at least one non-nullary case - /// (Originally from ..\FSComp.txt:1057) + /// (Originally from ..\FSComp.txt:1060) static member tcInvalidUseNullAsTrueValue() = (1196, GetStringFunc("tcInvalidUseNullAsTrueValue",",,,") ) /// The parameter '%s' was inferred to have byref type. Parameters of byref type must be given an explicit type annotation, e.g. 'x1: byref'. When used, a byref parameter is implicitly dereferenced. - /// (Originally from ..\FSComp.txt:1058) + /// (Originally from ..\FSComp.txt:1061) static member tcParameterInferredByref(a0 : System.String) = (1197, GetStringFunc("tcParameterInferredByref",",,,%s,,,") a0) /// The generic member '%s' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints. - /// (Originally from ..\FSComp.txt:1059) + /// (Originally from ..\FSComp.txt:1062) static member tcNonUniformMemberUse(a0 : System.String) = (1198, GetStringFunc("tcNonUniformMemberUse",",,,%s,,,") a0) /// The attribute '%s' appears in both the implementation and the signature, but the attribute arguments differ. Only the attribute from the signature will be included in the compiled code. - /// (Originally from ..\FSComp.txt:1060) + /// (Originally from ..\FSComp.txt:1063) static member tcAttribArgsDiffer(a0 : System.String) = (1200, GetStringFunc("tcAttribArgsDiffer",",,,%s,,,") a0) /// Cannot call an abstract base member: '%s' - /// (Originally from ..\FSComp.txt:1061) + /// (Originally from ..\FSComp.txt:1064) static member tcCannotCallAbstractBaseMember(a0 : System.String) = (1201, GetStringFunc("tcCannotCallAbstractBaseMember",",,,%s,,,") a0) /// Could not resolve the ambiguity in the use of a generic construct with an 'unmanaged' constraint at or near this position - /// (Originally from ..\FSComp.txt:1062) + /// (Originally from ..\FSComp.txt:1065) static member typrelCannotResolveAmbiguityInUnmanaged() = (1202, GetStringFunc("typrelCannotResolveAmbiguityInUnmanaged",",,,") ) /// This construct is for ML compatibility. %s. You can disable this warning by using '--mlcompatibility' or '--nowarn:62'. - /// (Originally from ..\FSComp.txt:1065) + /// (Originally from ..\FSComp.txt:1068) static member mlCompatMessage(a0 : System.String) = (GetStringFunc("mlCompatMessage",",,,%s,,,") a0) /// The type '%s' has been marked as having an Explicit layout, but the field '%s' has not been marked with the 'FieldOffset' attribute - /// (Originally from ..\FSComp.txt:1067) + /// (Originally from ..\FSComp.txt:1070) static member ilFieldDoesNotHaveValidOffsetForStructureLayout(a0 : System.String, a1 : System.String) = (1206, GetStringFunc("ilFieldDoesNotHaveValidOffsetForStructureLayout",",,,%s,,,%s,,,") a0 a1) /// Interfaces inherited by other interfaces should be declared using 'inherit ...' instead of 'interface ...' - /// (Originally from ..\FSComp.txt:1068) + /// (Originally from ..\FSComp.txt:1071) static member tcInterfacesShouldUseInheritNotInterface() = (1207, GetStringFunc("tcInterfacesShouldUseInheritNotInterface",",,,") ) /// Invalid prefix operator - /// (Originally from ..\FSComp.txt:1069) + /// (Originally from ..\FSComp.txt:1072) static member parsInvalidPrefixOperator() = (1208, GetStringFunc("parsInvalidPrefixOperator",",,,") ) /// Invalid operator definition. Prefix operator definitions must use a valid prefix operator name. - /// (Originally from ..\FSComp.txt:1070) + /// (Originally from ..\FSComp.txt:1073) static member parsInvalidPrefixOperatorDefinition() = (1208, GetStringFunc("parsInvalidPrefixOperatorDefinition",",,,") ) /// The file extensions '.ml' and '.mli' are for ML compatibility - /// (Originally from ..\FSComp.txt:1071) + /// (Originally from ..\FSComp.txt:1074) static member buildCompilingExtensionIsForML() = (GetStringFunc("buildCompilingExtensionIsForML",",,,") ) /// Consider using a file with extension '.ml' or '.mli' instead - /// (Originally from ..\FSComp.txt:1072) + /// (Originally from ..\FSComp.txt:1075) static member lexIndentOffForML() = (GetStringFunc("lexIndentOffForML",",,,") ) /// Active pattern '%s' is not a function - /// (Originally from ..\FSComp.txt:1073) + /// (Originally from ..\FSComp.txt:1076) static member activePatternIdentIsNotFunctionTyped(a0 : System.String) = (1209, GetStringFunc("activePatternIdentIsNotFunctionTyped",",,,%s,,,") a0) /// Active pattern '%s' has a result type containing type variables that are not determined by the input. The common cause is a when a result case is not mentioned, e.g. 'let (|A|B|) (x:int) = A x'. This can be fixed with a type constraint, e.g. 'let (|A|B|) (x:int) : Choice = A x' - /// (Originally from ..\FSComp.txt:1074) + /// (Originally from ..\FSComp.txt:1077) static member activePatternChoiceHasFreeTypars(a0 : System.String) = (1210, GetStringFunc("activePatternChoiceHasFreeTypars",",,,%s,,,") a0) /// The FieldOffset attribute can only be placed on members of types marked with the StructLayout(LayoutKind.Explicit) - /// (Originally from ..\FSComp.txt:1075) + /// (Originally from ..\FSComp.txt:1078) static member ilFieldHasOffsetForSequentialLayout() = (1211, GetStringFunc("ilFieldHasOffsetForSequentialLayout",",,,") ) /// Optional arguments must come at the end of the argument list, after any non-optional arguments - /// (Originally from ..\FSComp.txt:1076) + /// (Originally from ..\FSComp.txt:1079) static member tcOptionalArgsMustComeAfterNonOptionalArgs() = (1212, GetStringFunc("tcOptionalArgsMustComeAfterNonOptionalArgs",",,,") ) /// Attribute 'System.Diagnostics.ConditionalAttribute' is only valid on methods or attribute classes - /// (Originally from ..\FSComp.txt:1077) + /// (Originally from ..\FSComp.txt:1080) static member tcConditionalAttributeUsage() = (1213, GetStringFunc("tcConditionalAttributeUsage",",,,") ) /// Extension members cannot provide operator overloads. Consider defining the operator as part of the type definition instead. - /// (Originally from ..\FSComp.txt:1079) + /// (Originally from ..\FSComp.txt:1082) static member tcMemberOperatorDefinitionInExtrinsic() = (1215, GetStringFunc("tcMemberOperatorDefinitionInExtrinsic",",,,") ) /// The name of the MDB file must be .mdb. The --pdb option will be ignored. - /// (Originally from ..\FSComp.txt:1080) + /// (Originally from ..\FSComp.txt:1083) static member ilwriteMDBFileNameCannotBeChangedWarning() = (1216, GetStringFunc("ilwriteMDBFileNameCannotBeChangedWarning",",,,") ) /// MDB generation failed. Could not find compatible member %s - /// (Originally from ..\FSComp.txt:1081) + /// (Originally from ..\FSComp.txt:1084) static member ilwriteMDBMemberMissing(a0 : System.String) = (1217, GetStringFunc("ilwriteMDBMemberMissing",",,,%s,,,") a0) /// Cannot generate MDB debug information. Failed to load the 'MonoSymbolWriter' type from the 'Mono.CompilerServices.SymbolWriter.dll' assembly. - /// (Originally from ..\FSComp.txt:1082) + /// (Originally from ..\FSComp.txt:1085) static member ilwriteErrorCreatingMdb() = (1218, GetStringFunc("ilwriteErrorCreatingMdb",",,,") ) /// The union case named '%s' conflicts with the generated type '%s' - /// (Originally from ..\FSComp.txt:1083) + /// (Originally from ..\FSComp.txt:1086) static member tcUnionCaseNameConflictsWithGeneratedType(a0 : System.String, a1 : System.String) = (1219, GetStringFunc("tcUnionCaseNameConflictsWithGeneratedType",",,,%s,,,%s,,,") a0 a1) /// ReflectedDefinitionAttribute may not be applied to an instance member on a struct type, because the instance member takes an implicit 'this' byref parameter - /// (Originally from ..\FSComp.txt:1084) + /// (Originally from ..\FSComp.txt:1087) static member chkNoReflectedDefinitionOnStructMember() = (1220, GetStringFunc("chkNoReflectedDefinitionOnStructMember",",,,") ) /// DLLImport bindings must be static members in a class or function definitions in a module - /// (Originally from ..\FSComp.txt:1085) + /// (Originally from ..\FSComp.txt:1088) static member tcDllImportNotAllowed() = (1221, GetStringFunc("tcDllImportNotAllowed",",,,") ) /// When mscorlib.dll or FSharp.Core.dll is explicitly referenced the %s option must also be passed - /// (Originally from ..\FSComp.txt:1086) + /// (Originally from ..\FSComp.txt:1089) static member buildExplicitCoreLibRequiresNoFramework(a0 : System.String) = (1222, GetStringFunc("buildExplicitCoreLibRequiresNoFramework",",,,%s,,,") a0) /// FSharp.Core.sigdata not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1087) + /// (Originally from ..\FSComp.txt:1090) static member buildExpectedSigdataFile(a0 : System.String) = (1223, GetStringFunc("buildExpectedSigdataFile",",,,%s,,,") a0) /// File '%s' not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1088) + /// (Originally from ..\FSComp.txt:1091) static member buildExpectedFileAlongSideFSharpCore(a0 : System.String, a1 : System.String) = (1225, GetStringFunc("buildExpectedFileAlongSideFSharpCore",",,,%s,,,%s,,,") a0 a1) /// Filename '%s' contains invalid character '%s' - /// (Originally from ..\FSComp.txt:1089) + /// (Originally from ..\FSComp.txt:1092) static member buildUnexpectedFileNameCharacter(a0 : System.String, a1 : System.String) = (1227, GetStringFunc("buildUnexpectedFileNameCharacter",",,,%s,,,%s,,,") a0 a1) /// 'use!' bindings must be of the form 'use! = ' - /// (Originally from ..\FSComp.txt:1090) + /// (Originally from ..\FSComp.txt:1093) static member tcInvalidUseBangBinding() = (1228, GetStringFunc("tcInvalidUseBangBinding",",,,") ) /// Inner generic functions are not permitted in quoted expressions. Consider adding some type constraints until this function is no longer generic. - /// (Originally from ..\FSComp.txt:1091) + /// (Originally from ..\FSComp.txt:1094) static member crefNoInnerGenericsInQuotations() = (1230, GetStringFunc("crefNoInnerGenericsInQuotations",",,,") ) /// The type '%s' is not a valid enumerator type , i.e. does not have a 'MoveNext()' method returning a bool, and a 'Current' property - /// (Originally from ..\FSComp.txt:1092) + /// (Originally from ..\FSComp.txt:1095) static member tcEnumTypeCannotBeEnumerated(a0 : System.String) = (1231, GetStringFunc("tcEnumTypeCannotBeEnumerated",",,,%s,,,") a0) /// End of file in triple-quote string begun at or before here - /// (Originally from ..\FSComp.txt:1093) + /// (Originally from ..\FSComp.txt:1096) static member parsEofInTripleQuoteString() = (1232, GetStringFunc("parsEofInTripleQuoteString",",,,") ) /// End of file in triple-quote string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:1094) + /// (Originally from ..\FSComp.txt:1097) static member parsEofInTripleQuoteStringInComment() = (1233, GetStringFunc("parsEofInTripleQuoteStringInComment",",,,") ) /// This type test or downcast will ignore the unit-of-measure '%s' - /// (Originally from ..\FSComp.txt:1095) + /// (Originally from ..\FSComp.txt:1098) static member tcTypeTestLosesMeasures(a0 : System.String) = (1240, GetStringFunc("tcTypeTestLosesMeasures",",,,%s,,,") a0) /// Expected type argument or static argument - /// (Originally from ..\FSComp.txt:1096) + /// (Originally from ..\FSComp.txt:1099) static member parsMissingTypeArgs() = (1241, GetStringFunc("parsMissingTypeArgs",",,,") ) /// Unmatched '<'. Expected closing '>' - /// (Originally from ..\FSComp.txt:1097) + /// (Originally from ..\FSComp.txt:1100) static member parsMissingGreaterThan() = (1242, GetStringFunc("parsMissingGreaterThan",",,,") ) /// Unexpected quotation operator '<@' in type definition. If you intend to pass a verbatim string as a static argument to a type provider, put a space between the '<' and '@' characters. - /// (Originally from ..\FSComp.txt:1098) + /// (Originally from ..\FSComp.txt:1101) static member parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString() = (1243, GetStringFunc("parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString",",,,") ) /// Attempted to parse this as an operator name, but failed - /// (Originally from ..\FSComp.txt:1099) + /// (Originally from ..\FSComp.txt:1102) static member parsErrorParsingAsOperatorName() = (1244, GetStringFunc("parsErrorParsingAsOperatorName",",,,") ) /// \U%s is not a valid Unicode character escape sequence - /// (Originally from ..\FSComp.txt:1100) + /// (Originally from ..\FSComp.txt:1103) static member lexInvalidUnicodeLiteral(a0 : System.String) = (1245, GetStringFunc("lexInvalidUnicodeLiteral",",,,%s,,,") a0) /// '%s' must be applied to an argument of type '%s', but has been applied to an argument of type '%s' - /// (Originally from ..\FSComp.txt:1101) + /// (Originally from ..\FSComp.txt:1104) static member tcCallerInfoWrongType(a0 : System.String, a1 : System.String, a2 : System.String) = (1246, GetStringFunc("tcCallerInfoWrongType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// '%s' can only be applied to optional arguments - /// (Originally from ..\FSComp.txt:1102) + /// (Originally from ..\FSComp.txt:1105) static member tcCallerInfoNotOptional(a0 : System.String) = (1247, GetStringFunc("tcCallerInfoNotOptional",",,,%s,,,") a0) /// The specified .NET Framework version '%s' is not supported. Please specify a value from the enumeration Microsoft.Build.Utilities.TargetDotNetFrameworkVersion. - /// (Originally from ..\FSComp.txt:1104) + /// (Originally from ..\FSComp.txt:1107) static member toolLocationHelperUnsupportedFrameworkVersion(a0 : System.String) = (1300, GetStringFunc("toolLocationHelperUnsupportedFrameworkVersion",",,,%s,,,") a0) /// Invalid Magic value in CLR Header - /// (Originally from ..\FSComp.txt:1108) + /// (Originally from ..\FSComp.txt:1111) static member ilSignInvalidMagicValue() = (1301, GetStringFunc("ilSignInvalidMagicValue",",,,") ) /// Bad image format - /// (Originally from ..\FSComp.txt:1109) + /// (Originally from ..\FSComp.txt:1112) static member ilSignBadImageFormat() = (1302, GetStringFunc("ilSignBadImageFormat",",,,") ) /// Private key expected - /// (Originally from ..\FSComp.txt:1110) + /// (Originally from ..\FSComp.txt:1113) static member ilSignPrivateKeyExpected() = (1303, GetStringFunc("ilSignPrivateKeyExpected",",,,") ) /// RSA key expected - /// (Originally from ..\FSComp.txt:1111) + /// (Originally from ..\FSComp.txt:1114) static member ilSignRsaKeyExpected() = (1304, GetStringFunc("ilSignRsaKeyExpected",",,,") ) /// Invalid bit Length - /// (Originally from ..\FSComp.txt:1112) + /// (Originally from ..\FSComp.txt:1115) static member ilSignInvalidBitLen() = (1305, GetStringFunc("ilSignInvalidBitLen",",,,") ) /// Invalid RSAParameters structure - '{0}' expected - /// (Originally from ..\FSComp.txt:1113) + /// (Originally from ..\FSComp.txt:1116) static member ilSignInvalidRSAParams() = (1306, GetStringFunc("ilSignInvalidRSAParams",",,,") ) /// Invalid algId - 'Exponent' expected - /// (Originally from ..\FSComp.txt:1114) + /// (Originally from ..\FSComp.txt:1117) static member ilSignInvalidAlgId() = (1307, GetStringFunc("ilSignInvalidAlgId",",,,") ) /// Invalid signature size - /// (Originally from ..\FSComp.txt:1115) + /// (Originally from ..\FSComp.txt:1118) static member ilSignInvalidSignatureSize() = (1308, GetStringFunc("ilSignInvalidSignatureSize",",,,") ) /// No signature directory - /// (Originally from ..\FSComp.txt:1116) + /// (Originally from ..\FSComp.txt:1119) static member ilSignNoSignatureDirectory() = (1309, GetStringFunc("ilSignNoSignatureDirectory",",,,") ) /// Invalid Public Key blob - /// (Originally from ..\FSComp.txt:1117) + /// (Originally from ..\FSComp.txt:1120) static member ilSignInvalidPKBlob() = (1310, GetStringFunc("ilSignInvalidPKBlob",",,,") ) /// Exiting - too many errors - /// (Originally from ..\FSComp.txt:1119) + /// (Originally from ..\FSComp.txt:1122) static member fscTooManyErrors() = (GetStringFunc("fscTooManyErrors",",,,") ) /// The documentation file has no .xml suffix - /// (Originally from ..\FSComp.txt:1120) + /// (Originally from ..\FSComp.txt:1123) static member docfileNoXmlSuffix() = (2001, GetStringFunc("docfileNoXmlSuffix",",,,") ) /// No implementation files specified - /// (Originally from ..\FSComp.txt:1121) + /// (Originally from ..\FSComp.txt:1124) static member fscNoImplementationFiles() = (2002, GetStringFunc("fscNoImplementationFiles",",,,") ) /// The attribute %s specified version '%s', but this value is invalid and has been ignored - /// (Originally from ..\FSComp.txt:1122) + /// (Originally from ..\FSComp.txt:1125) static member fscBadAssemblyVersion(a0 : System.String, a1 : System.String) = (2003, GetStringFunc("fscBadAssemblyVersion",",,,%s,,,%s,,,") a0 a1) /// Conflicting options specified: 'win32manifest' and 'win32res'. Only one of these can be used. - /// (Originally from ..\FSComp.txt:1123) + /// (Originally from ..\FSComp.txt:1126) static member fscTwoResourceManifests() = (2004, GetStringFunc("fscTwoResourceManifests",",,,") ) /// The code in assembly '%s' makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1124) + /// (Originally from ..\FSComp.txt:1127) static member fscQuotationLiteralsStaticLinking(a0 : System.String) = (2005, GetStringFunc("fscQuotationLiteralsStaticLinking",",,,%s,,,") a0) /// Code in this assembly makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1125) + /// (Originally from ..\FSComp.txt:1128) static member fscQuotationLiteralsStaticLinking0() = (2006, GetStringFunc("fscQuotationLiteralsStaticLinking0",",,,") ) /// Static linking may not include a .EXE - /// (Originally from ..\FSComp.txt:1126) + /// (Originally from ..\FSComp.txt:1129) static member fscStaticLinkingNoEXE() = (2007, GetStringFunc("fscStaticLinkingNoEXE",",,,") ) /// Static linking may not include a mixed managed/unmanaged DLL - /// (Originally from ..\FSComp.txt:1127) + /// (Originally from ..\FSComp.txt:1130) static member fscStaticLinkingNoMixedDLL() = (2008, GetStringFunc("fscStaticLinkingNoMixedDLL",",,,") ) /// Ignoring mixed managed/unmanaged assembly '%s' during static linking - /// (Originally from ..\FSComp.txt:1128) + /// (Originally from ..\FSComp.txt:1131) static member fscIgnoringMixedWhenLinking(a0 : System.String) = (2009, GetStringFunc("fscIgnoringMixedWhenLinking",",,,%s,,,") a0) /// Assembly '%s' was referenced transitively and the assembly could not be resolved automatically. Static linking will assume this DLL has no dependencies on the F# library or other statically linked DLLs. Consider adding an explicit reference to this DLL. - /// (Originally from ..\FSComp.txt:1129) + /// (Originally from ..\FSComp.txt:1132) static member fscAssumeStaticLinkContainsNoDependencies(a0 : System.String) = (2011, GetStringFunc("fscAssumeStaticLinkContainsNoDependencies",",,,%s,,,") a0) /// Assembly '%s' not found in dependency set of target binary. Statically linked roots should be specified using an assembly name, without a DLL or EXE extension. If this assembly was referenced explicitly then it is possible the assembly was not actually required by the generated binary, in which case it should not be statically linked. - /// (Originally from ..\FSComp.txt:1130) + /// (Originally from ..\FSComp.txt:1133) static member fscAssemblyNotFoundInDependencySet(a0 : System.String) = (2012, GetStringFunc("fscAssemblyNotFoundInDependencySet",",,,%s,,,") a0) /// The key file '%s' could not be opened - /// (Originally from ..\FSComp.txt:1131) + /// (Originally from ..\FSComp.txt:1134) static member fscKeyFileCouldNotBeOpened(a0 : System.String) = (2013, GetStringFunc("fscKeyFileCouldNotBeOpened",",,,%s,,,") a0) /// A problem occurred writing the binary '%s': %s - /// (Originally from ..\FSComp.txt:1132) + /// (Originally from ..\FSComp.txt:1135) static member fscProblemWritingBinary(a0 : System.String, a1 : System.String) = (2014, GetStringFunc("fscProblemWritingBinary",",,,%s,,,%s,,,") a0 a1) /// The 'AssemblyVersionAttribute' has been ignored because a version was given using a command line option - /// (Originally from ..\FSComp.txt:1133) + /// (Originally from ..\FSComp.txt:1136) static member fscAssemblyVersionAttributeIgnored() = (2015, GetStringFunc("fscAssemblyVersionAttributeIgnored",",,,") ) /// Error emitting 'System.Reflection.AssemblyCultureAttribute' attribute -- 'Executables cannot be satellite assemblies, Culture should always be empty' - /// (Originally from ..\FSComp.txt:1134) + /// (Originally from ..\FSComp.txt:1137) static member fscAssemblyCultureAttributeError() = (2016, GetStringFunc("fscAssemblyCultureAttributeError",",,,") ) /// Option '--delaysign' overrides attribute 'System.Reflection.AssemblyDelaySignAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1135) + /// (Originally from ..\FSComp.txt:1138) static member fscDelaySignWarning() = (2017, GetStringFunc("fscDelaySignWarning",",,,") ) /// Option '--keyfile' overrides attribute 'System.Reflection.AssemblyKeyFileAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1136) + /// (Originally from ..\FSComp.txt:1139) static member fscKeyFileWarning() = (2018, GetStringFunc("fscKeyFileWarning",",,,") ) /// Option '--keycontainer' overrides attribute 'System.Reflection.AssemblyNameAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1137) + /// (Originally from ..\FSComp.txt:1140) static member fscKeyNameWarning() = (2019, GetStringFunc("fscKeyNameWarning",",,,") ) /// The assembly '%s' is listed on the command line. Assemblies should be referenced using a command line flag such as '-r'. - /// (Originally from ..\FSComp.txt:1138) + /// (Originally from ..\FSComp.txt:1141) static member fscReferenceOnCommandLine(a0 : System.String) = (2020, GetStringFunc("fscReferenceOnCommandLine",",,,%s,,,") a0) /// The resident compilation service was not used because a problem occured in communicating with the server. - /// (Originally from ..\FSComp.txt:1139) + /// (Originally from ..\FSComp.txt:1142) static member fscRemotingError() = (2021, GetStringFunc("fscRemotingError",",,,") ) /// Problem with filename '%s': Illegal characters in path. - /// (Originally from ..\FSComp.txt:1140) + /// (Originally from ..\FSComp.txt:1143) static member pathIsInvalid(a0 : System.String) = (2022, GetStringFunc("pathIsInvalid",",,,%s,,,") a0) /// Passing a .resx file (%s) as a source file to the compiler is deprecated. Use resgen.exe to transform the .resx file into a .resources file to pass as a --resource option. If you are using MSBuild, this can be done via an item in the .fsproj project file. - /// (Originally from ..\FSComp.txt:1141) + /// (Originally from ..\FSComp.txt:1144) static member fscResxSourceFileDeprecated(a0 : System.String) = (2023, GetStringFunc("fscResxSourceFileDeprecated",",,,%s,,,") a0) /// Static linking may not be used on an assembly referencing mscorlib (e.g. a .NET Framework assembly) when generating an assembly that references System.Runtime (e.g. a .NET Core or Portable assembly). - /// (Originally from ..\FSComp.txt:1142) + /// (Originally from ..\FSComp.txt:1145) static member fscStaticLinkingNoProfileMismatches() = (2024, GetStringFunc("fscStaticLinkingNoProfileMismatches",",,,") ) /// An %s specified version '%s', but this value is a wildcard, and you have requested a deterministic build, these are in conflict. - /// (Originally from ..\FSComp.txt:1143) + /// (Originally from ..\FSComp.txt:1146) static member fscAssemblyWildcardAndDeterminism(a0 : System.String, a1 : System.String) = (2025, GetStringFunc("fscAssemblyWildcardAndDeterminism",",,,%s,,,%s,,,") a0 a1) /// Determinstic builds only support portable PDBs (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:1144) + /// (Originally from ..\FSComp.txt:1147) static member fscDeterministicDebugRequiresPortablePdb() = (2026, GetStringFunc("fscDeterministicDebugRequiresPortablePdb",",,,") ) /// Character '%s' is not allowed in provided namespace name '%s' - /// (Originally from ..\FSComp.txt:1145) + /// (Originally from ..\FSComp.txt:1148) static member etIllegalCharactersInNamespaceName(a0 : System.String, a1 : System.String) = (3000, GetStringFunc("etIllegalCharactersInNamespaceName",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' returned a member with a null or empty member name - /// (Originally from ..\FSComp.txt:1146) + /// (Originally from ..\FSComp.txt:1149) static member etNullOrEmptyMemberName(a0 : System.String) = (3001, GetStringFunc("etNullOrEmptyMemberName",",,,%s,,,") a0) /// The provided type '%s' returned a null member - /// (Originally from ..\FSComp.txt:1147) + /// (Originally from ..\FSComp.txt:1150) static member etNullMember(a0 : System.String) = (3002, GetStringFunc("etNullMember",",,,%s,,,") a0) /// The provided type '%s' member info '%s' has null declaring type - /// (Originally from ..\FSComp.txt:1148) + /// (Originally from ..\FSComp.txt:1151) static member etNullMemberDeclaringType(a0 : System.String, a1 : System.String) = (3003, GetStringFunc("etNullMemberDeclaringType",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' has member '%s' which has declaring type '%s'. Expected declaring type to be the same as provided type. - /// (Originally from ..\FSComp.txt:1149) + /// (Originally from ..\FSComp.txt:1152) static member etNullMemberDeclaringTypeDifferentFromProvidedType(a0 : System.String, a1 : System.String, a2 : System.String) = (3004, GetStringFunc("etNullMemberDeclaringTypeDifferentFromProvidedType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Referenced assembly '%s' has assembly level attribute '%s' but no public type provider classes were found - /// (Originally from ..\FSComp.txt:1150) + /// (Originally from ..\FSComp.txt:1153) static member etHostingAssemblyFoundWithoutHosts(a0 : System.String, a1 : System.String) = (3005, GetStringFunc("etHostingAssemblyFoundWithoutHosts",",,,%s,,,%s,,,") a0 a1) /// Type '%s' from type provider '%s' has an empty namespace. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1151) + /// (Originally from ..\FSComp.txt:1154) static member etEmptyNamespaceOfTypeNotAllowed(a0 : System.String, a1 : System.String) = (3006, GetStringFunc("etEmptyNamespaceOfTypeNotAllowed",",,,%s,,,%s,,,") a0 a1) /// Empty namespace found from the type provider '%s'. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1152) + /// (Originally from ..\FSComp.txt:1155) static member etEmptyNamespaceNotAllowed(a0 : System.String) = (3007, GetStringFunc("etEmptyNamespaceNotAllowed",",,,%s,,,") a0) /// Provided type '%s' has 'IsGenericType' as true, but generic types are not supported. - /// (Originally from ..\FSComp.txt:1153) + /// (Originally from ..\FSComp.txt:1156) static member etMustNotBeGeneric(a0 : System.String) = (3011, GetStringFunc("etMustNotBeGeneric",",,,%s,,,") a0) /// Provided type '%s' has 'IsArray' as true, but array types are not supported. - /// (Originally from ..\FSComp.txt:1154) + /// (Originally from ..\FSComp.txt:1157) static member etMustNotBeAnArray(a0 : System.String) = (3013, GetStringFunc("etMustNotBeAnArray",",,,%s,,,") a0) /// Invalid member '%s' on provided type '%s'. Provided type members must be public, and not be generic, virtual, or abstract. - /// (Originally from ..\FSComp.txt:1155) + /// (Originally from ..\FSComp.txt:1158) static member etMethodHasRequirements(a0 : System.String, a1 : System.String) = (3014, GetStringFunc("etMethodHasRequirements",",,,%s,,,%s,,,") a0 a1) /// Invalid member '%s' on provided type '%s'. Only properties, methods and constructors are allowed - /// (Originally from ..\FSComp.txt:1156) + /// (Originally from ..\FSComp.txt:1159) static member etUnsupportedMemberKind(a0 : System.String, a1 : System.String) = (3015, GetStringFunc("etUnsupportedMemberKind",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=true but there was no value from GetGetMethod() - /// (Originally from ..\FSComp.txt:1157) + /// (Originally from ..\FSComp.txt:1160) static member etPropertyCanReadButHasNoGetter(a0 : System.String, a1 : System.String) = (3016, GetStringFunc("etPropertyCanReadButHasNoGetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=false but GetGetMethod() returned a method - /// (Originally from ..\FSComp.txt:1158) + /// (Originally from ..\FSComp.txt:1161) static member etPropertyHasGetterButNoCanRead(a0 : System.String, a1 : System.String) = (3017, GetStringFunc("etPropertyHasGetterButNoCanRead",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=true but there was no value from GetSetMethod() - /// (Originally from ..\FSComp.txt:1159) + /// (Originally from ..\FSComp.txt:1162) static member etPropertyCanWriteButHasNoSetter(a0 : System.String, a1 : System.String) = (3018, GetStringFunc("etPropertyCanWriteButHasNoSetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=false but GetSetMethod() returned a method - /// (Originally from ..\FSComp.txt:1160) + /// (Originally from ..\FSComp.txt:1163) static member etPropertyHasSetterButNoCanWrite(a0 : System.String, a1 : System.String) = (3019, GetStringFunc("etPropertyHasSetterButNoCanWrite",",,,%s,,,%s,,,") a0 a1) /// One or more errors seen during provided type setup - /// (Originally from ..\FSComp.txt:1161) + /// (Originally from ..\FSComp.txt:1164) static member etOneOrMoreErrorsSeenDuringExtensionTypeSetting() = (3020, GetStringFunc("etOneOrMoreErrorsSeenDuringExtensionTypeSetting",",,,") ) /// Unexpected exception from provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1162) + /// (Originally from ..\FSComp.txt:1165) static member etUnexpectedExceptionFromProvidedTypeMember(a0 : System.String, a1 : System.String, a2 : System.String) = (3021, GetStringFunc("etUnexpectedExceptionFromProvidedTypeMember",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Unsupported constant type '%s'. Quotations provided by type providers can only contain simple constants. The implementation of the type provider may need to be adjusted by moving a value declared outside a provided quotation literal to be a 'let' binding inside the quotation literal. - /// (Originally from ..\FSComp.txt:1163) + /// (Originally from ..\FSComp.txt:1166) static member etUnsupportedConstantType(a0 : System.String) = (3022, GetStringFunc("etUnsupportedConstantType",",,,%s,,,") a0) /// Unsupported expression '%s' from type provider. If you are the author of this type provider, consider adjusting it to provide a different provided expression. - /// (Originally from ..\FSComp.txt:1164) + /// (Originally from ..\FSComp.txt:1167) static member etUnsupportedProvidedExpression(a0 : System.String) = (3025, GetStringFunc("etUnsupportedProvidedExpression",",,,%s,,,") a0) /// Expected provided type named '%s' but provided type has 'Name' with value '%s' - /// (Originally from ..\FSComp.txt:1165) + /// (Originally from ..\FSComp.txt:1168) static member etProvidedTypeHasUnexpectedName(a0 : System.String, a1 : System.String) = (3028, GetStringFunc("etProvidedTypeHasUnexpectedName",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetAddMethod() - /// (Originally from ..\FSComp.txt:1166) + /// (Originally from ..\FSComp.txt:1169) static member etEventNoAdd(a0 : System.String, a1 : System.String) = (3029, GetStringFunc("etEventNoAdd",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetRemoveMethod() - /// (Originally from ..\FSComp.txt:1167) + /// (Originally from ..\FSComp.txt:1170) static member etEventNoRemove(a0 : System.String, a1 : System.String) = (3030, GetStringFunc("etEventNoRemove",",,,%s,,,%s,,,") a0 a1) /// Assembly attribute '%s' refers to a designer assembly '%s' which cannot be loaded or doesn't exist. %s - /// (Originally from ..\FSComp.txt:1168) + /// (Originally from ..\FSComp.txt:1171) static member etProviderHasWrongDesignerAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (3031, GetStringFunc("etProviderHasWrongDesignerAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider does not have a valid constructor. A constructor taking either no arguments or one argument of type 'TypeProviderConfig' was expected. - /// (Originally from ..\FSComp.txt:1169) + /// (Originally from ..\FSComp.txt:1172) static member etProviderDoesNotHaveValidConstructor() = (3032, GetStringFunc("etProviderDoesNotHaveValidConstructor",",,,") ) /// The type provider '%s' reported an error: %s - /// (Originally from ..\FSComp.txt:1170) + /// (Originally from ..\FSComp.txt:1173) static member etProviderError(a0 : System.String, a1 : System.String) = (3033, GetStringFunc("etProviderError",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' used an invalid parameter in the ParameterExpression: %s - /// (Originally from ..\FSComp.txt:1171) + /// (Originally from ..\FSComp.txt:1174) static member etIncorrectParameterExpression(a0 : System.String, a1 : System.String) = (3034, GetStringFunc("etIncorrectParameterExpression",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' provided a method with a name '%s' and metadata token '%d', which is not reported among its methods of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1172) + /// (Originally from ..\FSComp.txt:1175) static member etIncorrectProvidedMethod(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.String) = (3035, GetStringFunc("etIncorrectProvidedMethod",",,,%s,,,%s,,,%d,,,%s,,,") a0 a1 a2 a3) /// The type provider '%s' provided a constructor which is not reported among the constructors of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1173) + /// (Originally from ..\FSComp.txt:1176) static member etIncorrectProvidedConstructor(a0 : System.String, a1 : System.String) = (3036, GetStringFunc("etIncorrectProvidedConstructor",",,,%s,,,%s,,,") a0 a1) /// A direct reference to the generated type '%s' is not permitted. Instead, use a type definition, e.g. 'type TypeAlias = '. This indicates that a type provider adds generated types to your assembly. - /// (Originally from ..\FSComp.txt:1174) + /// (Originally from ..\FSComp.txt:1177) static member etDirectReferenceToGeneratedTypeNotAllowed(a0 : System.String) = (3039, GetStringFunc("etDirectReferenceToGeneratedTypeNotAllowed",",,,%s,,,") a0) /// Expected provided type with path '%s' but provided type has path '%s' - /// (Originally from ..\FSComp.txt:1175) + /// (Originally from ..\FSComp.txt:1178) static member etProvidedTypeHasUnexpectedPath(a0 : System.String, a1 : System.String) = (3041, GetStringFunc("etProvidedTypeHasUnexpectedPath",",,,%s,,,%s,,,") a0 a1) /// Unexpected 'null' return value from provided type '%s' member '%s' - /// (Originally from ..\FSComp.txt:1176) + /// (Originally from ..\FSComp.txt:1179) static member etUnexpectedNullFromProvidedTypeMember(a0 : System.String, a1 : System.String) = (3042, GetStringFunc("etUnexpectedNullFromProvidedTypeMember",",,,%s,,,%s,,,") a0 a1) /// Unexpected exception from member '%s' of provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1177) + /// (Originally from ..\FSComp.txt:1180) static member etUnexpectedExceptionFromProvidedMemberMember(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3043, GetStringFunc("etUnexpectedExceptionFromProvidedMemberMember",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// Nested provided types do not take static arguments or generic parameters - /// (Originally from ..\FSComp.txt:1178) + /// (Originally from ..\FSComp.txt:1181) static member etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters() = (3044, GetStringFunc("etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters",",,,") ) /// Invalid static argument to provided type. Expected an argument of kind '%s'. - /// (Originally from ..\FSComp.txt:1179) + /// (Originally from ..\FSComp.txt:1182) static member etInvalidStaticArgument(a0 : System.String) = (3045, GetStringFunc("etInvalidStaticArgument",",,,%s,,,") a0) /// An error occured applying the static arguments to a provided type - /// (Originally from ..\FSComp.txt:1180) + /// (Originally from ..\FSComp.txt:1183) static member etErrorApplyingStaticArgumentsToType() = (3046, GetStringFunc("etErrorApplyingStaticArgumentsToType",",,,") ) /// Unknown static argument kind '%s' when resolving a reference to a provided type or method '%s' - /// (Originally from ..\FSComp.txt:1181) + /// (Originally from ..\FSComp.txt:1184) static member etUnknownStaticArgumentKind(a0 : System.String, a1 : System.String) = (3047, GetStringFunc("etUnknownStaticArgumentKind",",,,%s,,,%s,,,") a0 a1) /// invalid namespace for provided type - /// (Originally from ..\FSComp.txt:1182) + /// (Originally from ..\FSComp.txt:1185) static member invalidNamespaceForProvidedType() = (GetStringFunc("invalidNamespaceForProvidedType",",,,") ) /// invalid full name for provided type - /// (Originally from ..\FSComp.txt:1183) + /// (Originally from ..\FSComp.txt:1186) static member invalidFullNameForProvidedType() = (GetStringFunc("invalidFullNameForProvidedType",",,,") ) /// The type provider returned 'null', which is not a valid return value from '%s' - /// (Originally from ..\FSComp.txt:1185) + /// (Originally from ..\FSComp.txt:1188) static member etProviderReturnedNull(a0 : System.String) = (3051, GetStringFunc("etProviderReturnedNull",",,,%s,,,") a0) /// The type provider constructor has thrown an exception: %s - /// (Originally from ..\FSComp.txt:1186) + /// (Originally from ..\FSComp.txt:1189) static member etTypeProviderConstructorException(a0 : System.String) = (3053, GetStringFunc("etTypeProviderConstructorException",",,,%s,,,") a0) /// Type provider '%s' returned null from GetInvokerExpression. - /// (Originally from ..\FSComp.txt:1187) + /// (Originally from ..\FSComp.txt:1190) static member etNullProvidedExpression(a0 : System.String) = (3056, GetStringFunc("etNullProvidedExpression",",,,%s,,,") a0) /// The type provider '%s' returned an invalid type from 'ApplyStaticArguments'. A type with name '%s' was expected, but a type with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1188) + /// (Originally from ..\FSComp.txt:1191) static member etProvidedAppliedTypeHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3057, GetStringFunc("etProvidedAppliedTypeHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider '%s' returned an invalid method from 'ApplyStaticArgumentsForMethod'. A method with name '%s' was expected, but a method with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1189) + /// (Originally from ..\FSComp.txt:1192) static member etProvidedAppliedMethodHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3058, GetStringFunc("etProvidedAppliedMethodHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// This type test or downcast will erase the provided type '%s' to the type '%s' - /// (Originally from ..\FSComp.txt:1190) + /// (Originally from ..\FSComp.txt:1193) static member tcTypeTestLossy(a0 : System.String, a1 : System.String) = (3060, GetStringFunc("tcTypeTestLossy",",,,%s,,,%s,,,") a0 a1) /// This downcast will erase the provided type '%s' to the type '%s'. - /// (Originally from ..\FSComp.txt:1191) + /// (Originally from ..\FSComp.txt:1194) static member tcTypeCastErased(a0 : System.String, a1 : System.String) = (3061, GetStringFunc("tcTypeCastErased",",,,%s,,,%s,,,") a0 a1) /// This type test with a provided type '%s' is not allowed because this provided type will be erased to '%s' at runtime. - /// (Originally from ..\FSComp.txt:1192) + /// (Originally from ..\FSComp.txt:1195) static member tcTypeTestErased(a0 : System.String, a1 : System.String) = (3062, GetStringFunc("tcTypeTestErased",",,,%s,,,%s,,,") a0 a1) /// Cannot inherit from erased provided type - /// (Originally from ..\FSComp.txt:1193) + /// (Originally from ..\FSComp.txt:1196) static member tcCannotInheritFromErasedType() = (3063, GetStringFunc("tcCannotInheritFromErasedType",",,,") ) /// Assembly '%s' hase TypeProviderAssembly attribute with invalid value '%s'. The value should be a valid assembly name - /// (Originally from ..\FSComp.txt:1194) + /// (Originally from ..\FSComp.txt:1197) static member etInvalidTypeProviderAssemblyName(a0 : System.String, a1 : System.String) = (3065, GetStringFunc("etInvalidTypeProviderAssemblyName",",,,%s,,,%s,,,") a0 a1) /// Invalid member name. Members may not have name '.ctor' or '.cctor' - /// (Originally from ..\FSComp.txt:1195) + /// (Originally from ..\FSComp.txt:1198) static member tcInvalidMemberNameCtor() = (3066, GetStringFunc("tcInvalidMemberNameCtor",",,,") ) /// The function or member '%s' is used in a way that requires further type annotations at its definition to ensure consistency of inferred types. The inferred signature is '%s'. - /// (Originally from ..\FSComp.txt:1196) + /// (Originally from ..\FSComp.txt:1199) static member tcInferredGenericTypeGivesRiseToInconsistency(a0 : System.String, a1 : System.String) = (3068, GetStringFunc("tcInferredGenericTypeGivesRiseToInconsistency",",,,%s,,,%s,,,") a0 a1) /// The number of type arguments did not match: '%d' given, '%d' expected. This may be related to a previously reported error. - /// (Originally from ..\FSComp.txt:1197) + /// (Originally from ..\FSComp.txt:1200) static member tcInvalidTypeArgumentCount(a0 : System.Int32, a1 : System.Int32) = (3069, GetStringFunc("tcInvalidTypeArgumentCount",",,,%d,,,%d,,,") a0 a1) /// Cannot override inherited member '%s' because it is sealed - /// (Originally from ..\FSComp.txt:1198) + /// (Originally from ..\FSComp.txt:1201) static member tcCannotOverrideSealedMethod(a0 : System.String) = (3070, GetStringFunc("tcCannotOverrideSealedMethod",",,,%s,,,") a0) /// The type provider '%s' reported an error in the context of provided type '%s', member '%s'. The error: %s - /// (Originally from ..\FSComp.txt:1199) + /// (Originally from ..\FSComp.txt:1202) static member etProviderErrorWithContext(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3071, GetStringFunc("etProviderErrorWithContext",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// An exception occurred when accessing the '%s' of a provided type: %s - /// (Originally from ..\FSComp.txt:1200) + /// (Originally from ..\FSComp.txt:1203) static member etProvidedTypeWithNameException(a0 : System.String, a1 : System.String) = (3072, GetStringFunc("etProvidedTypeWithNameException",",,,%s,,,%s,,,") a0 a1) /// The '%s' of a provided type was null or empty. - /// (Originally from ..\FSComp.txt:1201) + /// (Originally from ..\FSComp.txt:1204) static member etProvidedTypeWithNullOrEmptyName(a0 : System.String) = (3073, GetStringFunc("etProvidedTypeWithNullOrEmptyName",",,,%s,,,") a0) /// Character '%s' is not allowed in provided type name '%s' - /// (Originally from ..\FSComp.txt:1202) + /// (Originally from ..\FSComp.txt:1205) static member etIllegalCharactersInTypeName(a0 : System.String, a1 : System.String) = (3075, GetStringFunc("etIllegalCharactersInTypeName",",,,%s,,,%s,,,") a0 a1) /// In queries, '%s' must use a simple pattern - /// (Originally from ..\FSComp.txt:1203) + /// (Originally from ..\FSComp.txt:1206) static member tcJoinMustUseSimplePattern(a0 : System.String) = (3077, GetStringFunc("tcJoinMustUseSimplePattern",",,,%s,,,") a0) /// A custom query operation for '%s' is required but not specified - /// (Originally from ..\FSComp.txt:1204) + /// (Originally from ..\FSComp.txt:1207) static member tcMissingCustomOperation(a0 : System.String) = (3078, GetStringFunc("tcMissingCustomOperation",",,,%s,,,") a0) /// Named static arguments must come after all unnamed static arguments - /// (Originally from ..\FSComp.txt:1205) + /// (Originally from ..\FSComp.txt:1208) static member etBadUnnamedStaticArgs() = (3080, GetStringFunc("etBadUnnamedStaticArgs",",,,") ) /// The static parameter '%s' of the provided type or method '%s' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. '%s<%s=...>'. - /// (Originally from ..\FSComp.txt:1206) + /// (Originally from ..\FSComp.txt:1209) static member etStaticParameterRequiresAValue(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3081, GetStringFunc("etStaticParameterRequiresAValue",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// No static parameter exists with name '%s' - /// (Originally from ..\FSComp.txt:1207) + /// (Originally from ..\FSComp.txt:1210) static member etNoStaticParameterWithName(a0 : System.String) = (3082, GetStringFunc("etNoStaticParameterWithName",",,,%s,,,") a0) /// The static parameter '%s' has already been given a value - /// (Originally from ..\FSComp.txt:1208) + /// (Originally from ..\FSComp.txt:1211) static member etStaticParameterAlreadyHasValue(a0 : System.String) = (3083, GetStringFunc("etStaticParameterAlreadyHasValue",",,,%s,,,") a0) /// Multiple static parameters exist with name '%s' - /// (Originally from ..\FSComp.txt:1209) + /// (Originally from ..\FSComp.txt:1212) static member etMultipleStaticParameterWithName(a0 : System.String) = (3084, GetStringFunc("etMultipleStaticParameterWithName",",,,%s,,,") a0) /// A custom operation may not be used in conjunction with a non-value or recursive 'let' binding in another part of this computation expression - /// (Originally from ..\FSComp.txt:1210) + /// (Originally from ..\FSComp.txt:1213) static member tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings() = (3085, GetStringFunc("tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings",",,,") ) /// A custom operation may not be used in conjunction with 'use', 'try/with', 'try/finally', 'if/then/else' or 'match' operators within this computation expression - /// (Originally from ..\FSComp.txt:1211) + /// (Originally from ..\FSComp.txt:1214) static member tcCustomOperationMayNotBeUsedHere() = (3086, GetStringFunc("tcCustomOperationMayNotBeUsedHere",",,,") ) /// The custom operation '%s' refers to a method which is overloaded. The implementations of custom operations may not be overloaded. - /// (Originally from ..\FSComp.txt:1212) + /// (Originally from ..\FSComp.txt:1215) static member tcCustomOperationMayNotBeOverloaded(a0 : System.String) = (3087, GetStringFunc("tcCustomOperationMayNotBeOverloaded",",,,%s,,,") a0) /// An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead. - /// (Originally from ..\FSComp.txt:1213) + /// (Originally from ..\FSComp.txt:1216) static member tcIfThenElseMayNotBeUsedWithinQueries() = (3090, GetStringFunc("tcIfThenElseMayNotBeUsedWithinQueries",",,,") ) /// Invalid argument to 'methodhandleof' during codegen - /// (Originally from ..\FSComp.txt:1214) + /// (Originally from ..\FSComp.txt:1217) static member ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen() = (3091, GetStringFunc("ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen",",,,") ) /// A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1215) + /// (Originally from ..\FSComp.txt:1218) static member etProvidedTypeReferenceMissingArgument(a0 : System.String) = (3092, GetStringFunc("etProvidedTypeReferenceMissingArgument",",,,%s,,,") a0) /// A reference to a provided type had an invalid value '%s' for a static parameter. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1216) + /// (Originally from ..\FSComp.txt:1219) static member etProvidedTypeReferenceInvalidText(a0 : System.String) = (3093, GetStringFunc("etProvidedTypeReferenceInvalidText",",,,%s,,,") a0) /// '%s' is not used correctly. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1217) + /// (Originally from ..\FSComp.txt:1220) static member tcCustomOperationNotUsedCorrectly(a0 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly",",,,%s,,,") a0) /// '%s' is not used correctly. Usage: %s. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1218) + /// (Originally from ..\FSComp.txt:1221) static member tcCustomOperationNotUsedCorrectly2(a0 : System.String, a1 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly2",",,,%s,,,%s,,,") a0 a1) /// %s var in collection %s (outerKey = innerKey). Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1219) + /// (Originally from ..\FSComp.txt:1222) static member customOperationTextLikeJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection %s (outerKey = innerKey) into group. Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1220) + /// (Originally from ..\FSComp.txt:1223) static member customOperationTextLikeGroupJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeGroupJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection - /// (Originally from ..\FSComp.txt:1221) + /// (Originally from ..\FSComp.txt:1224) static member customOperationTextLikeZip(a0 : System.String) = (GetStringFunc("customOperationTextLikeZip",",,,%s,,,") a0) /// '%s' must be followed by a variable name. Usage: %s. - /// (Originally from ..\FSComp.txt:1222) + /// (Originally from ..\FSComp.txt:1225) static member tcBinaryOperatorRequiresVariable(a0 : System.String, a1 : System.String) = (3096, GetStringFunc("tcBinaryOperatorRequiresVariable",",,,%s,,,%s,,,") a0 a1) /// Incorrect syntax for '%s'. Usage: %s. - /// (Originally from ..\FSComp.txt:1223) + /// (Originally from ..\FSComp.txt:1226) static member tcOperatorIncorrectSyntax(a0 : System.String, a1 : System.String) = (3097, GetStringFunc("tcOperatorIncorrectSyntax",",,,%s,,,%s,,,") a0 a1) /// '%s' must come after a 'for' selection clause and be followed by the rest of the query. Syntax: ... %s ... - /// (Originally from ..\FSComp.txt:1224) + /// (Originally from ..\FSComp.txt:1227) static member tcBinaryOperatorRequiresBody(a0 : System.String, a1 : System.String) = (3098, GetStringFunc("tcBinaryOperatorRequiresBody",",,,%s,,,%s,,,") a0 a1) /// '%s' is used with an incorrect number of arguments. This is a custom operation in this query or computation expression. Expected %d argument(s), but given %d. - /// (Originally from ..\FSComp.txt:1225) + /// (Originally from ..\FSComp.txt:1228) static member tcCustomOperationHasIncorrectArgCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3099, GetStringFunc("tcCustomOperationHasIncorrectArgCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Expected an expression after this point - /// (Originally from ..\FSComp.txt:1226) + /// (Originally from ..\FSComp.txt:1229) static member parsExpectedExpressionAfterToken() = (3100, GetStringFunc("parsExpectedExpressionAfterToken",",,,") ) /// Expected a type after this point - /// (Originally from ..\FSComp.txt:1227) + /// (Originally from ..\FSComp.txt:1230) static member parsExpectedTypeAfterToken() = (3101, GetStringFunc("parsExpectedTypeAfterToken",",,,") ) /// Unmatched '[<'. Expected closing '>]' - /// (Originally from ..\FSComp.txt:1228) + /// (Originally from ..\FSComp.txt:1231) static member parsUnmatchedLBrackLess() = (3102, GetStringFunc("parsUnmatchedLBrackLess",",,,") ) /// Unexpected end of input in 'match' expression. Expected 'match with | -> | -> ...'. - /// (Originally from ..\FSComp.txt:1229) + /// (Originally from ..\FSComp.txt:1232) static member parsUnexpectedEndOfFileMatch() = (3103, GetStringFunc("parsUnexpectedEndOfFileMatch",",,,") ) /// Unexpected end of input in 'try' expression. Expected 'try with ' or 'try finally '. - /// (Originally from ..\FSComp.txt:1230) + /// (Originally from ..\FSComp.txt:1233) static member parsUnexpectedEndOfFileTry() = (3104, GetStringFunc("parsUnexpectedEndOfFileTry",",,,") ) /// Unexpected end of input in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1231) + /// (Originally from ..\FSComp.txt:1234) static member parsUnexpectedEndOfFileWhile() = (3105, GetStringFunc("parsUnexpectedEndOfFileWhile",",,,") ) /// Unexpected end of input in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1232) + /// (Originally from ..\FSComp.txt:1235) static member parsUnexpectedEndOfFileFor() = (3106, GetStringFunc("parsUnexpectedEndOfFileFor",",,,") ) /// Unexpected end of input in 'match' or 'try' expression - /// (Originally from ..\FSComp.txt:1233) + /// (Originally from ..\FSComp.txt:1236) static member parsUnexpectedEndOfFileWith() = (3107, GetStringFunc("parsUnexpectedEndOfFileWith",",,,") ) /// Unexpected end of input in 'then' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1234) + /// (Originally from ..\FSComp.txt:1237) static member parsUnexpectedEndOfFileThen() = (3108, GetStringFunc("parsUnexpectedEndOfFileThen",",,,") ) /// Unexpected end of input in 'else' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1235) + /// (Originally from ..\FSComp.txt:1238) static member parsUnexpectedEndOfFileElse() = (3109, GetStringFunc("parsUnexpectedEndOfFileElse",",,,") ) /// Unexpected end of input in body of lambda expression. Expected 'fun ... -> '. - /// (Originally from ..\FSComp.txt:1236) + /// (Originally from ..\FSComp.txt:1239) static member parsUnexpectedEndOfFileFunBody() = (3110, GetStringFunc("parsUnexpectedEndOfFileFunBody",",,,") ) /// Unexpected end of input in type arguments - /// (Originally from ..\FSComp.txt:1237) + /// (Originally from ..\FSComp.txt:1240) static member parsUnexpectedEndOfFileTypeArgs() = (3111, GetStringFunc("parsUnexpectedEndOfFileTypeArgs",",,,") ) /// Unexpected end of input in type signature - /// (Originally from ..\FSComp.txt:1238) + /// (Originally from ..\FSComp.txt:1241) static member parsUnexpectedEndOfFileTypeSignature() = (3112, GetStringFunc("parsUnexpectedEndOfFileTypeSignature",",,,") ) /// Unexpected end of input in type definition - /// (Originally from ..\FSComp.txt:1239) + /// (Originally from ..\FSComp.txt:1242) static member parsUnexpectedEndOfFileTypeDefinition() = (3113, GetStringFunc("parsUnexpectedEndOfFileTypeDefinition",",,,") ) /// Unexpected end of input in object members - /// (Originally from ..\FSComp.txt:1240) + /// (Originally from ..\FSComp.txt:1243) static member parsUnexpectedEndOfFileObjectMembers() = (3114, GetStringFunc("parsUnexpectedEndOfFileObjectMembers",",,,") ) /// Unexpected end of input in value, function or member definition - /// (Originally from ..\FSComp.txt:1241) + /// (Originally from ..\FSComp.txt:1244) static member parsUnexpectedEndOfFileDefinition() = (3115, GetStringFunc("parsUnexpectedEndOfFileDefinition",",,,") ) /// Unexpected end of input in expression - /// (Originally from ..\FSComp.txt:1242) + /// (Originally from ..\FSComp.txt:1245) static member parsUnexpectedEndOfFileExpression() = (3116, GetStringFunc("parsUnexpectedEndOfFileExpression",",,,") ) /// Unexpected end of type. Expected a name after this point. - /// (Originally from ..\FSComp.txt:1243) + /// (Originally from ..\FSComp.txt:1246) static member parsExpectedNameAfterToken() = (3117, GetStringFunc("parsExpectedNameAfterToken",",,,") ) /// Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword. - /// (Originally from ..\FSComp.txt:1244) + /// (Originally from ..\FSComp.txt:1247) static member parsUnmatchedLet() = (3118, GetStringFunc("parsUnmatchedLet",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let!' keyword. - /// (Originally from ..\FSComp.txt:1245) + /// (Originally from ..\FSComp.txt:1248) static member parsUnmatchedLetBang() = (3119, GetStringFunc("parsUnmatchedLetBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use!' keyword. - /// (Originally from ..\FSComp.txt:1246) + /// (Originally from ..\FSComp.txt:1249) static member parsUnmatchedUseBang() = (3120, GetStringFunc("parsUnmatchedUseBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use' keyword. - /// (Originally from ..\FSComp.txt:1247) + /// (Originally from ..\FSComp.txt:1250) static member parsUnmatchedUse() = (3121, GetStringFunc("parsUnmatchedUse",",,,") ) /// Missing 'do' in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1248) + /// (Originally from ..\FSComp.txt:1251) static member parsWhileDoExpected() = (3122, GetStringFunc("parsWhileDoExpected",",,,") ) /// Missing 'do' in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1249) + /// (Originally from ..\FSComp.txt:1252) static member parsForDoExpected() = (3123, GetStringFunc("parsForDoExpected",",,,") ) /// Invalid join relation in '%s'. Expected 'expr expr', where is =, =?, ?= or ?=?. - /// (Originally from ..\FSComp.txt:1250) + /// (Originally from ..\FSComp.txt:1253) static member tcInvalidRelationInJoin(a0 : System.String) = (3125, GetStringFunc("tcInvalidRelationInJoin",",,,%s,,,") a0) /// Calls - /// (Originally from ..\FSComp.txt:1251) + /// (Originally from ..\FSComp.txt:1254) static member typeInfoCallsWord() = (GetStringFunc("typeInfoCallsWord",",,,") ) /// Invalid number of generic arguments to type '%s' in provided type. Expected '%d' arguments, given '%d'. - /// (Originally from ..\FSComp.txt:1252) + /// (Originally from ..\FSComp.txt:1255) static member impInvalidNumberOfGenericArguments(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3126, GetStringFunc("impInvalidNumberOfGenericArguments",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Invalid value '%s' for unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1253) + /// (Originally from ..\FSComp.txt:1256) static member impInvalidMeasureArgument1(a0 : System.String, a1 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument1",",,,%s,,,%s,,,") a0 a1) /// Invalid value unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1254) + /// (Originally from ..\FSComp.txt:1257) static member impInvalidMeasureArgument2(a0 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument2",",,,%s,,,") a0) /// Property '%s' on provided type '%s' is neither readable nor writable as it has CanRead=false and CanWrite=false - /// (Originally from ..\FSComp.txt:1255) + /// (Originally from ..\FSComp.txt:1258) static member etPropertyNeedsCanWriteOrCanRead(a0 : System.String, a1 : System.String) = (3128, GetStringFunc("etPropertyNeedsCanWriteOrCanRead",",,,%s,,,%s,,,") a0 a1) /// A use of 'into' must be followed by the remainder of the computation - /// (Originally from ..\FSComp.txt:1256) + /// (Originally from ..\FSComp.txt:1259) static member tcIntoNeedsRestOfQuery() = (3129, GetStringFunc("tcIntoNeedsRestOfQuery",",,,") ) /// The operator '%s' does not accept the use of 'into' - /// (Originally from ..\FSComp.txt:1257) + /// (Originally from ..\FSComp.txt:1260) static member tcOperatorDoesntAcceptInto(a0 : System.String) = (3130, GetStringFunc("tcOperatorDoesntAcceptInto",",,,%s,,,") a0) /// The definition of the custom operator '%s' does not use a valid combination of attribute flags - /// (Originally from ..\FSComp.txt:1258) + /// (Originally from ..\FSComp.txt:1261) static member tcCustomOperationInvalid(a0 : System.String) = (3131, GetStringFunc("tcCustomOperationInvalid",",,,%s,,,") a0) /// This type definition may not have the 'CLIMutable' attribute. Only record types may have this attribute. - /// (Originally from ..\FSComp.txt:1259) + /// (Originally from ..\FSComp.txt:1262) static member tcThisTypeMayNotHaveACLIMutableAttribute() = (3132, GetStringFunc("tcThisTypeMayNotHaveACLIMutableAttribute",",,,") ) /// 'member val' definitions are only permitted in types with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:1260) + /// (Originally from ..\FSComp.txt:1263) static member tcAutoPropertyRequiresImplicitConstructionSequence() = (3133, GetStringFunc("tcAutoPropertyRequiresImplicitConstructionSequence",",,,") ) /// Property definitions may not be declared mutable. To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1261) + /// (Originally from ..\FSComp.txt:1264) static member parsMutableOnAutoPropertyShouldBeGetSet() = (3134, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSet",",,,") ) /// To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1262) + /// (Originally from ..\FSComp.txt:1265) static member parsMutableOnAutoPropertyShouldBeGetSetNotJustSet() = (3135, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSetNotJustSet",",,,") ) /// Type '%s' is illegal because in byref, T cannot contain byref types. - /// (Originally from ..\FSComp.txt:1263) + /// (Originally from ..\FSComp.txt:1266) static member chkNoByrefsOfByrefs(a0 : System.String) = (3136, GetStringFunc("chkNoByrefsOfByrefs",",,,%s,,,") a0) /// F# supports array ranks between 1 and 32. The value %d is not allowed. - /// (Originally from ..\FSComp.txt:1264) + /// (Originally from ..\FSComp.txt:1267) static member tastopsMaxArrayThirtyTwo(a0 : System.Int32) = (3138, GetStringFunc("tastopsMaxArrayThirtyTwo",",,,%d,,,") a0) /// In queries, use the form 'for x in n .. m do ...' for ranging over integers - /// (Originally from ..\FSComp.txt:1265) + /// (Originally from ..\FSComp.txt:1268) static member tcNoIntegerForLoopInQuery() = (3139, GetStringFunc("tcNoIntegerForLoopInQuery",",,,") ) /// 'while' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1266) + /// (Originally from ..\FSComp.txt:1269) static member tcNoWhileInQuery() = (3140, GetStringFunc("tcNoWhileInQuery",",,,") ) /// 'try/finally' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1267) + /// (Originally from ..\FSComp.txt:1270) static member tcNoTryFinallyInQuery() = (3141, GetStringFunc("tcNoTryFinallyInQuery",",,,") ) /// 'use' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1268) + /// (Originally from ..\FSComp.txt:1271) static member tcUseMayNotBeUsedInQueries() = (3142, GetStringFunc("tcUseMayNotBeUsedInQueries",",,,") ) /// 'let!', 'use!' and 'do!' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1269) + /// (Originally from ..\FSComp.txt:1272) static member tcBindMayNotBeUsedInQueries() = (3143, GetStringFunc("tcBindMayNotBeUsedInQueries",",,,") ) /// 'return' and 'return!' may not be used in queries - /// (Originally from ..\FSComp.txt:1270) + /// (Originally from ..\FSComp.txt:1273) static member tcReturnMayNotBeUsedInQueries() = (3144, GetStringFunc("tcReturnMayNotBeUsedInQueries",",,,") ) /// This is not a known query operator. Query operators are identifiers such as 'select', 'where', 'sortBy', 'thenBy', 'groupBy', 'groupValBy', 'join', 'groupJoin', 'sumBy' and 'averageBy', defined using corresponding methods on the 'QueryBuilder' type. - /// (Originally from ..\FSComp.txt:1271) + /// (Originally from ..\FSComp.txt:1274) static member tcUnrecognizedQueryOperator() = (3145, GetStringFunc("tcUnrecognizedQueryOperator",",,,") ) /// 'try/with' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1272) + /// (Originally from ..\FSComp.txt:1275) static member tcTryWithMayNotBeUsedInQueries() = (3146, GetStringFunc("tcTryWithMayNotBeUsedInQueries",",,,") ) /// This 'let' definition may not be used in a query. Only simple value definitions may be used in queries. - /// (Originally from ..\FSComp.txt:1273) + /// (Originally from ..\FSComp.txt:1276) static member tcNonSimpleLetBindingInQuery() = (3147, GetStringFunc("tcNonSimpleLetBindingInQuery",",,,") ) /// Too many static parameters. Expected at most %d parameters, but got %d unnamed and %d named parameters. - /// (Originally from ..\FSComp.txt:1274) + /// (Originally from ..\FSComp.txt:1277) static member etTooManyStaticParameters(a0 : System.Int32, a1 : System.Int32, a2 : System.Int32) = (3148, GetStringFunc("etTooManyStaticParameters",",,,%d,,,%d,,,%d,,,") a0 a1 a2) /// Invalid provided literal value '%s' - /// (Originally from ..\FSComp.txt:1275) + /// (Originally from ..\FSComp.txt:1278) static member infosInvalidProvidedLiteralValue(a0 : System.String) = (3149, GetStringFunc("infosInvalidProvidedLiteralValue",",,,%s,,,") a0) /// The 'anycpu32bitpreferred' platform can only be used with EXE targets. You must use 'anycpu' instead. - /// (Originally from ..\FSComp.txt:1276) + /// (Originally from ..\FSComp.txt:1279) static member invalidPlatformTarget() = (3150, GetStringFunc("invalidPlatformTarget",",,,") ) /// This member, function or value declaration may not be declared 'inline' - /// (Originally from ..\FSComp.txt:1277) + /// (Originally from ..\FSComp.txt:1280) static member tcThisValueMayNotBeInlined() = (3151, GetStringFunc("tcThisValueMayNotBeInlined",",,,") ) /// The provider '%s' returned a non-generated type '%s' in the context of a set of generated types. Consider adjusting the type provider to only return generated types. - /// (Originally from ..\FSComp.txt:1278) + /// (Originally from ..\FSComp.txt:1281) static member etErasedTypeUsedInGeneration(a0 : System.String, a1 : System.String) = (3152, GetStringFunc("etErasedTypeUsedInGeneration",",,,%s,,,%s,,,") a0 a1) /// Arguments to query operators may require parentheses, e.g. 'where (x > y)' or 'groupBy (x.Length / 10)' - /// (Originally from ..\FSComp.txt:1279) + /// (Originally from ..\FSComp.txt:1282) static member tcUnrecognizedQueryBinaryOperator() = (3153, GetStringFunc("tcUnrecognizedQueryBinaryOperator",",,,") ) /// A quotation may not involve an assignment to or taking the address of a captured local variable - /// (Originally from ..\FSComp.txt:1280) + /// (Originally from ..\FSComp.txt:1283) static member crefNoSetOfHole() = (3155, GetStringFunc("crefNoSetOfHole",",,,") ) /// + 1 overload - /// (Originally from ..\FSComp.txt:1281) + /// (Originally from ..\FSComp.txt:1284) static member nicePrintOtherOverloads1() = (GetStringFunc("nicePrintOtherOverloads1",",,,") ) /// + %d overloads - /// (Originally from ..\FSComp.txt:1282) + /// (Originally from ..\FSComp.txt:1285) static member nicePrintOtherOverloadsN(a0 : System.Int32) = (GetStringFunc("nicePrintOtherOverloadsN",",,,%d,,,") a0) /// Erased to - /// (Originally from ..\FSComp.txt:1283) + /// (Originally from ..\FSComp.txt:1286) static member erasedTo() = (GetStringFunc("erasedTo",",,,") ) /// Unexpected token '%s' or incomplete expression - /// (Originally from ..\FSComp.txt:1284) + /// (Originally from ..\FSComp.txt:1287) static member parsUnfinishedExpression(a0 : System.String) = (3156, GetStringFunc("parsUnfinishedExpression",",,,%s,,,") a0) /// Cannot find code target for this attribute, possibly because the code after the attribute is incomplete. - /// (Originally from ..\FSComp.txt:1285) + /// (Originally from ..\FSComp.txt:1288) static member parsAttributeOnIncompleteCode() = (3158, GetStringFunc("parsAttributeOnIncompleteCode",",,,") ) /// Type name cannot be empty. - /// (Originally from ..\FSComp.txt:1286) + /// (Originally from ..\FSComp.txt:1289) static member parsTypeNameCannotBeEmpty() = (3159, GetStringFunc("parsTypeNameCannotBeEmpty",",,,") ) /// Problem reading assembly '%s': %s - /// (Originally from ..\FSComp.txt:1287) + /// (Originally from ..\FSComp.txt:1290) static member buildProblemReadingAssembly(a0 : System.String, a1 : System.String) = (3160, GetStringFunc("buildProblemReadingAssembly",",,,%s,,,%s,,,") a0 a1) /// Invalid provided field. Provided fields of erased provided types must be literals. - /// (Originally from ..\FSComp.txt:1288) + /// (Originally from ..\FSComp.txt:1291) static member tcTPFieldMustBeLiteral() = (3161, GetStringFunc("tcTPFieldMustBeLiteral",",,,") ) /// (loading description...) - /// (Originally from ..\FSComp.txt:1289) + /// (Originally from ..\FSComp.txt:1292) static member loadingDescription() = (GetStringFunc("loadingDescription",",,,") ) /// (description unavailable...) - /// (Originally from ..\FSComp.txt:1290) + /// (Originally from ..\FSComp.txt:1293) static member descriptionUnavailable() = (GetStringFunc("descriptionUnavailable",",,,") ) /// A type variable has been constrained by multiple different class types. A type variable may only have one class constraint. - /// (Originally from ..\FSComp.txt:1291) + /// (Originally from ..\FSComp.txt:1294) static member chkTyparMultipleClassConstraints() = (3162, GetStringFunc("chkTyparMultipleClassConstraints",",,,") ) /// 'match' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1292) + /// (Originally from ..\FSComp.txt:1295) static member tcMatchMayNotBeUsedWithQuery() = (3163, GetStringFunc("tcMatchMayNotBeUsedWithQuery",",,,") ) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 3 arguments - /// (Originally from ..\FSComp.txt:1293) + /// (Originally from ..\FSComp.txt:1296) static member memberOperatorDefinitionWithNonTripleArgument(a0 : System.String, a1 : System.Int32) = (3164, GetStringFunc("memberOperatorDefinitionWithNonTripleArgument",",,,%s,,,%d,,,") a0 a1) /// The operator '%s' cannot be resolved. Consider opening the module 'Microsoft.FSharp.Linq.NullableOperators'. - /// (Originally from ..\FSComp.txt:1294) + /// (Originally from ..\FSComp.txt:1297) static member cannotResolveNullableOperators(a0 : System.String) = (3165, GetStringFunc("cannotResolveNullableOperators",",,,%s,,,") a0) /// '%s' must be followed by 'in'. Usage: %s. - /// (Originally from ..\FSComp.txt:1295) + /// (Originally from ..\FSComp.txt:1298) static member tcOperatorRequiresIn(a0 : System.String, a1 : System.String) = (3167, GetStringFunc("tcOperatorRequiresIn",",,,%s,,,%s,,,") a0 a1) /// Neither 'member val' nor 'override val' definitions are permitted in object expressions. - /// (Originally from ..\FSComp.txt:1296) + /// (Originally from ..\FSComp.txt:1299) static member parsIllegalMemberVarInObjectImplementation() = (3168, GetStringFunc("parsIllegalMemberVarInObjectImplementation",",,,") ) /// Copy-and-update record expressions must include at least one field. - /// (Originally from ..\FSComp.txt:1297) + /// (Originally from ..\FSComp.txt:1300) static member tcEmptyCopyAndUpdateRecordInvalid() = (3169, GetStringFunc("tcEmptyCopyAndUpdateRecordInvalid",",,,") ) /// '_' cannot be used as field name - /// (Originally from ..\FSComp.txt:1298) + /// (Originally from ..\FSComp.txt:1301) static member parsUnderscoreInvalidFieldName() = (3170, GetStringFunc("parsUnderscoreInvalidFieldName",",,,") ) /// The provided types generated by this use of a type provider may not be used from other F# assemblies and should be marked internal or private. Consider using 'type internal TypeName = ...' or 'type private TypeName = ...'. - /// (Originally from ..\FSComp.txt:1299) + /// (Originally from ..\FSComp.txt:1302) static member tcGeneratedTypesShouldBeInternalOrPrivate() = (3171, GetStringFunc("tcGeneratedTypesShouldBeInternalOrPrivate",",,,") ) /// A property's getter and setter must have the same type. Property '%s' has getter of type '%s' but setter of type '%s'. - /// (Originally from ..\FSComp.txt:1300) + /// (Originally from ..\FSComp.txt:1303) static member chkGetterAndSetterHaveSamePropertyType(a0 : System.String, a1 : System.String, a2 : System.String) = (3172, GetStringFunc("chkGetterAndSetterHaveSamePropertyType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Array method '%s' is supplied by the runtime and cannot be directly used in code. For operations with array elements consider using family of GetArray/SetArray functions from LanguagePrimitives.IntrinsicFunctions module. - /// (Originally from ..\FSComp.txt:1301) + /// (Originally from ..\FSComp.txt:1304) static member tcRuntimeSuppliedMethodCannotBeUsedInUserCode(a0 : System.String) = (3173, GetStringFunc("tcRuntimeSuppliedMethodCannotBeUsedInUserCode",",,,%s,,,") a0) /// The union case '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1302) + /// (Originally from ..\FSComp.txt:1305) static member tcUnionCaseConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcUnionCaseConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// The exception '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1303) + /// (Originally from ..\FSComp.txt:1306) static member tcExceptionConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcExceptionConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// Active patterns do not have fields. This syntax is invalid. - /// (Originally from ..\FSComp.txt:1304) + /// (Originally from ..\FSComp.txt:1307) static member tcActivePatternsDoNotHaveFields() = (3174, GetStringFunc("tcActivePatternsDoNotHaveFields",",,,") ) /// The constructor does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1305) + /// (Originally from ..\FSComp.txt:1308) static member tcConstructorDoesNotHaveFieldWithGivenName(a0 : System.String) = (3174, GetStringFunc("tcConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,") a0) /// Union case/exception field '%s' cannot be used more than once. - /// (Originally from ..\FSComp.txt:1306) + /// (Originally from ..\FSComp.txt:1309) static member tcUnionCaseFieldCannotBeUsedMoreThanOnce(a0 : System.String) = (3175, GetStringFunc("tcUnionCaseFieldCannotBeUsedMoreThanOnce",",,,%s,,,") a0) /// Named field '%s' is used more than once. - /// (Originally from ..\FSComp.txt:1307) + /// (Originally from ..\FSComp.txt:1310) static member tcFieldNameIsUsedModeThanOnce(a0 : System.String) = (3176, GetStringFunc("tcFieldNameIsUsedModeThanOnce",",,,%s,,,") a0) /// Named field '%s' conflicts with autogenerated name for anonymous field. - /// (Originally from ..\FSComp.txt:1308) + /// (Originally from ..\FSComp.txt:1311) static member tcFieldNameConflictsWithGeneratedNameForAnonymousField(a0 : System.String) = (3176, GetStringFunc("tcFieldNameConflictsWithGeneratedNameForAnonymousField",",,,%s,,,") a0) /// This literal expression or attribute argument results in an arithmetic overflow. - /// (Originally from ..\FSComp.txt:1309) + /// (Originally from ..\FSComp.txt:1312) static member tastConstantExpressionOverflow() = (3177, GetStringFunc("tastConstantExpressionOverflow",",,,") ) /// This is not valid literal expression. The [] attribute will be ignored. - /// (Originally from ..\FSComp.txt:1310) + /// (Originally from ..\FSComp.txt:1313) static member tcIllegalStructTypeForConstantExpression() = (3178, GetStringFunc("tcIllegalStructTypeForConstantExpression",",,,") ) /// System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes. - /// (Originally from ..\FSComp.txt:1311) + /// (Originally from ..\FSComp.txt:1314) static member fscSystemRuntimeInteropServicesIsRequired() = (3179, GetStringFunc("fscSystemRuntimeInteropServicesIsRequired",",,,") ) /// The mutable local '%s' is implicitly allocated as a reference cell because it has been captured by a closure. This warning is for informational purposes only to indicate where implicit allocations are performed. - /// (Originally from ..\FSComp.txt:1312) + /// (Originally from ..\FSComp.txt:1315) static member abImplicitHeapAllocation(a0 : System.String) = (3180, GetStringFunc("abImplicitHeapAllocation",",,,%s,,,") a0) /// A type provider implemented GetStaticParametersForMethod, but ApplyStaticArgumentsForMethod was not implemented or invalid - /// (Originally from ..\FSComp.txt:1313) + /// (Originally from ..\FSComp.txt:1316) static member estApplyStaticArgumentsForMethodNotImplemented() = (GetStringFunc("estApplyStaticArgumentsForMethodNotImplemented",",,,") ) /// An error occured applying the static arguments to a provided method - /// (Originally from ..\FSComp.txt:1314) + /// (Originally from ..\FSComp.txt:1317) static member etErrorApplyingStaticArgumentsToMethod() = (3181, GetStringFunc("etErrorApplyingStaticArgumentsToMethod",",,,") ) /// Unexpected character '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1315) + /// (Originally from ..\FSComp.txt:1318) static member pplexUnexpectedChar(a0 : System.String) = (3182, GetStringFunc("pplexUnexpectedChar",",,,%s,,,") a0) /// Unexpected token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1316) + /// (Originally from ..\FSComp.txt:1319) static member ppparsUnexpectedToken(a0 : System.String) = (3183, GetStringFunc("ppparsUnexpectedToken",",,,%s,,,") a0) /// Incomplete preprocessor expression - /// (Originally from ..\FSComp.txt:1317) + /// (Originally from ..\FSComp.txt:1320) static member ppparsIncompleteExpression() = (3184, GetStringFunc("ppparsIncompleteExpression",",,,") ) /// Missing token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1318) + /// (Originally from ..\FSComp.txt:1321) static member ppparsMissingToken(a0 : System.String) = (3185, GetStringFunc("ppparsMissingToken",",,,%s,,,") a0) /// An error occurred while reading the F# metadata node at position %d in table '%s' of assembly '%s'. The node had no matching declaration. Please report this warning. You may need to recompile the F# assembly you are using. - /// (Originally from ..\FSComp.txt:1319) + /// (Originally from ..\FSComp.txt:1322) static member pickleMissingDefinition(a0 : System.Int32, a1 : System.String, a2 : System.String) = (3186, GetStringFunc("pickleMissingDefinition",",,,%d,,,%s,,,%s,,,") a0 a1 a2) /// Type inference caused the type variable %s to escape its scope. Consider adding an explicit type parameter declaration or adjusting your code to be less generic. - /// (Originally from ..\FSComp.txt:1320) + /// (Originally from ..\FSComp.txt:1323) static member checkNotSufficientlyGenericBecauseOfScope(a0 : System.String) = (3187, GetStringFunc("checkNotSufficientlyGenericBecauseOfScope",",,,%s,,,") a0) /// Type inference caused an inference type variable to escape its scope. Consider adding type annotations to make your code less generic. - /// (Originally from ..\FSComp.txt:1321) + /// (Originally from ..\FSComp.txt:1324) static member checkNotSufficientlyGenericBecauseOfScopeAnon() = (3188, GetStringFunc("checkNotSufficientlyGenericBecauseOfScopeAnon",",,,") ) /// Redundant arguments are being ignored in function '%s'. Expected %d but got %d arguments. - /// (Originally from ..\FSComp.txt:1322) + /// (Originally from ..\FSComp.txt:1325) static member checkRaiseFamilyFunctionArgumentCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3189, GetStringFunc("checkRaiseFamilyFunctionArgumentCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Lowercase literal '%s' is being shadowed by a new pattern with the same name. Only uppercase and module-prefixed literals can be used as named patterns. - /// (Originally from ..\FSComp.txt:1323) + /// (Originally from ..\FSComp.txt:1326) static member checkLowercaseLiteralBindingInPattern(a0 : System.String) = (3190, GetStringFunc("checkLowercaseLiteralBindingInPattern",",,,%s,,,") a0) /// This literal pattern does not take arguments - /// (Originally from ..\FSComp.txt:1324) + /// (Originally from ..\FSComp.txt:1327) static member tcLiteralDoesNotTakeArguments() = (3191, GetStringFunc("tcLiteralDoesNotTakeArguments",",,,") ) /// Constructors are not permitted as extension members - they must be defined as part of the original definition of the type - /// (Originally from ..\FSComp.txt:1325) + /// (Originally from ..\FSComp.txt:1328) static member tcConstructorsIllegalInAugmentation() = (3192, GetStringFunc("tcConstructorsIllegalInAugmentation",",,,") ) /// Invalid response file '%s' ( '%s' ) - /// (Originally from ..\FSComp.txt:1326) + /// (Originally from ..\FSComp.txt:1329) static member optsInvalidResponseFile(a0 : System.String, a1 : System.String) = (3193, GetStringFunc("optsInvalidResponseFile",",,,%s,,,%s,,,") a0 a1) /// Response file '%s' not found in '%s' - /// (Originally from ..\FSComp.txt:1327) + /// (Originally from ..\FSComp.txt:1330) static member optsResponseFileNotFound(a0 : System.String, a1 : System.String) = (3194, GetStringFunc("optsResponseFileNotFound",",,,%s,,,%s,,,") a0 a1) /// Response file name '%s' is empty, contains invalid characters, has a drive specification without an absolute path, or is too long - /// (Originally from ..\FSComp.txt:1328) + /// (Originally from ..\FSComp.txt:1331) static member optsResponseFileNameInvalid(a0 : System.String) = (3195, GetStringFunc("optsResponseFileNameInvalid",",,,%s,,,") a0) /// Cannot find FSharp.Core.dll in compiler's directory - /// (Originally from ..\FSComp.txt:1329) + /// (Originally from ..\FSComp.txt:1332) static member fsharpCoreNotFoundToBeCopied() = (3196, GetStringFunc("fsharpCoreNotFoundToBeCopied",",,,") ) /// One tuple type is a struct tuple, the other is a reference tuple - /// (Originally from ..\FSComp.txt:1330) + /// (Originally from ..\FSComp.txt:1333) static member tcTupleStructMismatch() = (GetStringFunc("tcTupleStructMismatch",",,,") ) /// This provided method requires static parameters - /// (Originally from ..\FSComp.txt:1331) + /// (Originally from ..\FSComp.txt:1334) static member etMissingStaticArgumentsToMethod() = (3197, GetStringFunc("etMissingStaticArgumentsToMethod",",,,") ) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using 'upcast' instead of 'downcast'. - /// (Originally from ..\FSComp.txt:1332) + /// (Originally from ..\FSComp.txt:1335) static member considerUpcast(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcast",",,,%s,,,%s,,,") a0 a1) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using the :> (upcast) operator instead of the :?> (downcast) operator. - /// (Originally from ..\FSComp.txt:1333) + /// (Originally from ..\FSComp.txt:1336) static member considerUpcastOperator(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcastOperator",",,,%s,,,%s,,,") a0 a1) /// The 'rec' on this module is implied by an outer 'rec' declaration and is being ignored - /// (Originally from ..\FSComp.txt:1334) + /// (Originally from ..\FSComp.txt:1337) static member tcRecImplied() = (3199, GetStringFunc("tcRecImplied",",,,") ) /// In a recursive declaration group, 'open' declarations must come first in each module - /// (Originally from ..\FSComp.txt:1335) + /// (Originally from ..\FSComp.txt:1338) static member tcOpenFirstInMutRec() = (3200, GetStringFunc("tcOpenFirstInMutRec",",,,") ) /// In a recursive declaration group, module abbreviations must come after all 'open' declarations and before other declarations - /// (Originally from ..\FSComp.txt:1336) + /// (Originally from ..\FSComp.txt:1339) static member tcModuleAbbrevFirstInMutRec() = (3201, GetStringFunc("tcModuleAbbrevFirstInMutRec",",,,") ) /// This declaration is not supported in recursive declaration groups - /// (Originally from ..\FSComp.txt:1337) + /// (Originally from ..\FSComp.txt:1340) static member tcUnsupportedMutRecDecl() = (3202, GetStringFunc("tcUnsupportedMutRecDecl",",,,") ) /// Invalid use of 'rec' keyword - /// (Originally from ..\FSComp.txt:1338) + /// (Originally from ..\FSComp.txt:1341) static member parsInvalidUseOfRec() = (3203, GetStringFunc("parsInvalidUseOfRec",",,,") ) /// If a union type has more than one case and is a struct, then all fields within the union type must be given unique names. - /// (Originally from ..\FSComp.txt:1339) + /// (Originally from ..\FSComp.txt:1342) static member tcStructUnionMultiCaseDistinctFields() = (3204, GetStringFunc("tcStructUnionMultiCaseDistinctFields",",,,") ) /// The CallerMemberNameAttribute applied to parameter '%s' will have no effect. It is overridden by the CallerFilePathAttribute. - /// (Originally from ..\FSComp.txt:1340) + /// (Originally from ..\FSComp.txt:1343) static member CallerMemberNameIsOverriden(a0 : System.String) = (3206, GetStringFunc("CallerMemberNameIsOverriden",",,,%s,,,") a0) /// Invalid use of 'fixed'. 'fixed' may only be used in a declaration of the form 'use x = fixed expr' where the expression is an array, the address of a field, the address of an array element or a string' - /// (Originally from ..\FSComp.txt:1341) + /// (Originally from ..\FSComp.txt:1344) static member tcFixedNotAllowed() = (3207, GetStringFunc("tcFixedNotAllowed",",,,") ) /// Could not find method System.Runtime.CompilerServices.OffsetToStringData in references when building 'fixed' expression. - /// (Originally from ..\FSComp.txt:1342) + /// (Originally from ..\FSComp.txt:1345) static member tcCouldNotFindOffsetToStringData() = (3208, GetStringFunc("tcCouldNotFindOffsetToStringData",",,,") ) /// The address of the variable '%s' or a related expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1343) + /// (Originally from ..\FSComp.txt:1346) static member chkNoByrefAddressOfLocal(a0 : System.String) = (3209, GetStringFunc("chkNoByrefAddressOfLocal",",,,%s,,,") a0) /// %s is an active pattern and cannot be treated as a discriminated union case with named fields. - /// (Originally from ..\FSComp.txt:1344) + /// (Originally from ..\FSComp.txt:1347) static member tcNamedActivePattern(a0 : System.String) = (3210, GetStringFunc("tcNamedActivePattern",",,,%s,,,") a0) /// The default value does not have the same type as the argument. The DefaultParameterValue attribute and any Optional attribute will be ignored. Note: 'null' needs to be annotated with the correct type, e.g. 'DefaultParameterValue(null:obj)'. - /// (Originally from ..\FSComp.txt:1345) + /// (Originally from ..\FSComp.txt:1348) static member DefaultParameterValueNotAppropriateForArgument() = (3211, GetStringFunc("DefaultParameterValueNotAppropriateForArgument",",,,") ) /// The system type '%s' was required but no referenced system DLL contained this type - /// (Originally from ..\FSComp.txt:1346) + /// (Originally from ..\FSComp.txt:1349) static member tcGlobalsSystemTypeNotFound(a0 : System.String) = (GetStringFunc("tcGlobalsSystemTypeNotFound",",,,%s,,,") a0) /// The member '%s' matches multiple overloads of the same method.\nPlease restrict it to one of the following:%s. - /// (Originally from ..\FSComp.txt:1347) + /// (Originally from ..\FSComp.txt:1350) static member typrelMemberHasMultiplePossibleDispatchSlots(a0 : System.String, a1 : System.String) = (3213, GetStringFunc("typrelMemberHasMultiplePossibleDispatchSlots",",,,%s,,,%s,,,") a0 a1) /// Method or object constructor '%s' is not static - /// (Originally from ..\FSComp.txt:1348) + /// (Originally from ..\FSComp.txt:1351) static member methodIsNotStatic(a0 : System.String) = (3214, GetStringFunc("methodIsNotStatic",",,,%s,,,") a0) /// Unexpected symbol '=' in expression. Did you intend to use 'for x in y .. z do' instead? - /// (Originally from ..\FSComp.txt:1349) + /// (Originally from ..\FSComp.txt:1352) static member parsUnexpectedSymbolEqualsInsteadOfIn() = (3215, GetStringFunc("parsUnexpectedSymbolEqualsInsteadOfIn",",,,") ) /// Two anonymous record types are from different assemblies '%s' and '%s' - /// (Originally from ..\FSComp.txt:1350) + /// (Originally from ..\FSComp.txt:1353) static member tcAnonRecdCcuMismatch(a0 : System.String, a1 : System.String) = (GetStringFunc("tcAnonRecdCcuMismatch",",,,%s,,,%s,,,") a0 a1) /// Two anonymous record types have mismatched sets of field names '%s' and '%s' - /// (Originally from ..\FSComp.txt:1351) + /// (Originally from ..\FSComp.txt:1354) static member tcAnonRecdFieldNameMismatch(a0 : System.String, a1 : System.String) = (GetStringFunc("tcAnonRecdFieldNameMismatch",",,,%s,,,%s,,,") a0 a1) /// Indicates a method that either has no implementation in the type in which it is declared or that is virtual and has a default implementation. - /// (Originally from ..\FSComp.txt:1352) + /// (Originally from ..\FSComp.txt:1355) static member keywordDescriptionAbstract() = (GetStringFunc("keywordDescriptionAbstract",",,,") ) /// Used in mutually recursive bindings, in property declarations, and with multiple constraints on generic parameters. - /// (Originally from ..\FSComp.txt:1353) + /// (Originally from ..\FSComp.txt:1356) static member keyworkDescriptionAnd() = (GetStringFunc("keyworkDescriptionAnd",",,,") ) /// Used to give the current class object an object name. Also used to give a name to a whole pattern within a pattern match. - /// (Originally from ..\FSComp.txt:1354) + /// (Originally from ..\FSComp.txt:1357) static member keywordDescriptionAs() = (GetStringFunc("keywordDescriptionAs",",,,") ) /// Used to verify code during debugging. - /// (Originally from ..\FSComp.txt:1355) + /// (Originally from ..\FSComp.txt:1358) static member keywordDescriptionAssert() = (GetStringFunc("keywordDescriptionAssert",",,,") ) /// Used as the name of the base class object. - /// (Originally from ..\FSComp.txt:1356) + /// (Originally from ..\FSComp.txt:1359) static member keywordDescriptionBase() = (GetStringFunc("keywordDescriptionBase",",,,") ) /// In verbose syntax, indicates the start of a code block. - /// (Originally from ..\FSComp.txt:1357) + /// (Originally from ..\FSComp.txt:1360) static member keywordDescriptionBegin() = (GetStringFunc("keywordDescriptionBegin",",,,") ) /// In verbose syntax, indicates the start of a class definition. - /// (Originally from ..\FSComp.txt:1358) + /// (Originally from ..\FSComp.txt:1361) static member keywordDescriptionClass() = (GetStringFunc("keywordDescriptionClass",",,,") ) /// Indicates an implementation of an abstract method; used together with an abstract method declaration to create a virtual method. - /// (Originally from ..\FSComp.txt:1359) + /// (Originally from ..\FSComp.txt:1362) static member keywordDescriptionDefault() = (GetStringFunc("keywordDescriptionDefault",",,,") ) /// Used to declare a delegate. - /// (Originally from ..\FSComp.txt:1360) + /// (Originally from ..\FSComp.txt:1363) static member keywordDescriptionDelegate() = (GetStringFunc("keywordDescriptionDelegate",",,,") ) /// Used in looping constructs or to execute imperative code. - /// (Originally from ..\FSComp.txt:1361) + /// (Originally from ..\FSComp.txt:1364) static member keywordDescriptionDo() = (GetStringFunc("keywordDescriptionDo",",,,") ) /// In verbose syntax, indicates the end of a block of code in a looping expression. - /// (Originally from ..\FSComp.txt:1362) + /// (Originally from ..\FSComp.txt:1365) static member keywordDescriptionDone() = (GetStringFunc("keywordDescriptionDone",",,,") ) /// Used to convert to a type that is lower in the inheritance chain. - /// (Originally from ..\FSComp.txt:1363) + /// (Originally from ..\FSComp.txt:1366) static member keywordDescriptionDowncast() = (GetStringFunc("keywordDescriptionDowncast",",,,") ) /// In a for expression, used when counting in reverse. - /// (Originally from ..\FSComp.txt:1364) + /// (Originally from ..\FSComp.txt:1367) static member keywordDescriptionDownto() = (GetStringFunc("keywordDescriptionDownto",",,,") ) /// Used in conditional branching. A short form of else if. - /// (Originally from ..\FSComp.txt:1365) + /// (Originally from ..\FSComp.txt:1368) static member keywordDescriptionElif() = (GetStringFunc("keywordDescriptionElif",",,,") ) /// Used in conditional branching. - /// (Originally from ..\FSComp.txt:1366) + /// (Originally from ..\FSComp.txt:1369) static member keywordDescriptionElse() = (GetStringFunc("keywordDescriptionElse",",,,") ) /// In type definitions and type extensions, indicates the end of a section of member definitions. In verbose syntax, used to specify the end of a code block that starts with the begin keyword. - /// (Originally from ..\FSComp.txt:1367) + /// (Originally from ..\FSComp.txt:1370) static member keywordDescriptionEnd() = (GetStringFunc("keywordDescriptionEnd",",,,") ) /// Used to declare an exception type. - /// (Originally from ..\FSComp.txt:1368) + /// (Originally from ..\FSComp.txt:1371) static member keywordDescriptionException() = (GetStringFunc("keywordDescriptionException",",,,") ) /// Indicates that a declared program element is defined in another binary or assembly. - /// (Originally from ..\FSComp.txt:1369) + /// (Originally from ..\FSComp.txt:1372) static member keywordDescriptionExtern() = (GetStringFunc("keywordDescriptionExtern",",,,") ) /// Used as a Boolean literal. - /// (Originally from ..\FSComp.txt:1370) + /// (Originally from ..\FSComp.txt:1373) static member keywordDescriptionTrueFalse() = (GetStringFunc("keywordDescriptionTrueFalse",",,,") ) /// Used together with try to introduce a block of code that executes regardless of whether an exception occurs. - /// (Originally from ..\FSComp.txt:1371) + /// (Originally from ..\FSComp.txt:1374) static member keywordDescriptionFinally() = (GetStringFunc("keywordDescriptionFinally",",,,") ) /// Used in looping constructs. - /// (Originally from ..\FSComp.txt:1372) + /// (Originally from ..\FSComp.txt:1375) static member keywordDescriptionFor() = (GetStringFunc("keywordDescriptionFor",",,,") ) /// Used in lambda expressions, also known as anonymous functions. - /// (Originally from ..\FSComp.txt:1373) + /// (Originally from ..\FSComp.txt:1376) static member keywordDescriptionFun() = (GetStringFunc("keywordDescriptionFun",",,,") ) /// Used as a shorter alternative to the fun keyword and a match expression in a lambda expression that has pattern matching on a single argument. - /// (Originally from ..\FSComp.txt:1374) + /// (Originally from ..\FSComp.txt:1377) static member keywordDescriptionFunction() = (GetStringFunc("keywordDescriptionFunction",",,,") ) /// Used to reference the top-level .NET namespace. - /// (Originally from ..\FSComp.txt:1375) + /// (Originally from ..\FSComp.txt:1378) static member keywordDescriptionGlobal() = (GetStringFunc("keywordDescriptionGlobal",",,,") ) /// Used in conditional branching constructs. - /// (Originally from ..\FSComp.txt:1376) + /// (Originally from ..\FSComp.txt:1379) static member keywordDescriptionIf() = (GetStringFunc("keywordDescriptionIf",",,,") ) /// Used for sequence expressions and, in verbose syntax, to separate expressions from bindings. - /// (Originally from ..\FSComp.txt:1377) + /// (Originally from ..\FSComp.txt:1380) static member keywordDescriptionIn() = (GetStringFunc("keywordDescriptionIn",",,,") ) /// Used to specify a base class or base interface. - /// (Originally from ..\FSComp.txt:1378) + /// (Originally from ..\FSComp.txt:1381) static member keywordDescriptionInherit() = (GetStringFunc("keywordDescriptionInherit",",,,") ) /// Used to indicate a function that should be integrated directly into the caller's code. - /// (Originally from ..\FSComp.txt:1379) + /// (Originally from ..\FSComp.txt:1382) static member keywordDescriptionInline() = (GetStringFunc("keywordDescriptionInline",",,,") ) /// Used to declare and implement interfaces. - /// (Originally from ..\FSComp.txt:1380) + /// (Originally from ..\FSComp.txt:1383) static member keywordDescriptionInterface() = (GetStringFunc("keywordDescriptionInterface",",,,") ) /// Used to specify that a member is visible inside an assembly but not outside it. - /// (Originally from ..\FSComp.txt:1381) + /// (Originally from ..\FSComp.txt:1384) static member keywordDescriptionInternal() = (GetStringFunc("keywordDescriptionInternal",",,,") ) /// Used to specify a computation that is to be performed only when a result is needed. - /// (Originally from ..\FSComp.txt:1382) + /// (Originally from ..\FSComp.txt:1385) static member keywordDescriptionLazy() = (GetStringFunc("keywordDescriptionLazy",",,,") ) /// Used to associate, or bind, a name to a value or function. - /// (Originally from ..\FSComp.txt:1383) + /// (Originally from ..\FSComp.txt:1386) static member keywordDescriptionLet() = (GetStringFunc("keywordDescriptionLet",",,,") ) /// Used in computation expressions to bind a name to the result of another computation expression. - /// (Originally from ..\FSComp.txt:1384) + /// (Originally from ..\FSComp.txt:1387) static member keywordDescriptionLetBang() = (GetStringFunc("keywordDescriptionLetBang",",,,") ) /// Used to branch by comparing a value to a pattern. - /// (Originally from ..\FSComp.txt:1385) + /// (Originally from ..\FSComp.txt:1388) static member keywordDescriptionMatch() = (GetStringFunc("keywordDescriptionMatch",",,,") ) /// Used in computation expressions to pattern match directly over the result of another computation expression. - /// (Originally from ..\FSComp.txt:1386) + /// (Originally from ..\FSComp.txt:1389) static member keywordDescriptionMatchBang() = (GetStringFunc("keywordDescriptionMatchBang",",,,") ) /// Used to declare a property or method in an object type. - /// (Originally from ..\FSComp.txt:1387) + /// (Originally from ..\FSComp.txt:1390) static member keywordDescriptionMember() = (GetStringFunc("keywordDescriptionMember",",,,") ) /// Used to associate a name with a group of related types, values, and functions, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1388) + /// (Originally from ..\FSComp.txt:1391) static member keywordDescriptionModule() = (GetStringFunc("keywordDescriptionModule",",,,") ) /// Used to declare a variable, that is, a value that can be changed. - /// (Originally from ..\FSComp.txt:1389) + /// (Originally from ..\FSComp.txt:1392) static member keywordDescriptionMutable() = (GetStringFunc("keywordDescriptionMutable",",,,") ) /// Used to associate a name with a group of related types and modules, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1390) + /// (Originally from ..\FSComp.txt:1393) static member keywordDescriptionNamespace() = (GetStringFunc("keywordDescriptionNamespace",",,,") ) /// Used to declare, define, or invoke a constructor that creates or that can create an object. Also used in generic parameter constraints to indicate that a type must have a certain constructor. - /// (Originally from ..\FSComp.txt:1391) + /// (Originally from ..\FSComp.txt:1394) static member keywordDescriptionNew() = (GetStringFunc("keywordDescriptionNew",",,,") ) /// Not actually a keyword. However, not struct in combination is used as a generic parameter constraint. - /// (Originally from ..\FSComp.txt:1392) + /// (Originally from ..\FSComp.txt:1395) static member keywordDescriptionNot() = (GetStringFunc("keywordDescriptionNot",",,,") ) /// Indicates the absence of an object. Also used in generic parameter constraints. - /// (Originally from ..\FSComp.txt:1393) + /// (Originally from ..\FSComp.txt:1396) static member keywordDescriptionNull() = (GetStringFunc("keywordDescriptionNull",",,,") ) /// Used in discriminated unions to indicate the type of categories of values, and in delegate and exception declarations. - /// (Originally from ..\FSComp.txt:1394) + /// (Originally from ..\FSComp.txt:1397) static member keywordDescriptionOf() = (GetStringFunc("keywordDescriptionOf",",,,") ) /// Used to make the contents of a namespace or module available without qualification. - /// (Originally from ..\FSComp.txt:1395) + /// (Originally from ..\FSComp.txt:1398) static member keywordDescriptionOpen() = (GetStringFunc("keywordDescriptionOpen",",,,") ) /// Used with Boolean conditions as a Boolean or operator. Equivalent to ||. Also used in member constraints. - /// (Originally from ..\FSComp.txt:1396) + /// (Originally from ..\FSComp.txt:1399) static member keywordDescriptionOr() = (GetStringFunc("keywordDescriptionOr",",,,") ) /// Used to implement a version of an abstract or virtual method that differs from the base version. - /// (Originally from ..\FSComp.txt:1397) + /// (Originally from ..\FSComp.txt:1400) static member keywordDescriptionOverride() = (GetStringFunc("keywordDescriptionOverride",",,,") ) /// Restricts access to a member to code in the same type or module. - /// (Originally from ..\FSComp.txt:1398) + /// (Originally from ..\FSComp.txt:1401) static member keywordDescriptionPrivate() = (GetStringFunc("keywordDescriptionPrivate",",,,") ) /// Allows access to a member from outside the type. - /// (Originally from ..\FSComp.txt:1399) + /// (Originally from ..\FSComp.txt:1402) static member keywordDescriptionPublic() = (GetStringFunc("keywordDescriptionPublic",",,,") ) /// Used to indicate that a function is recursive. - /// (Originally from ..\FSComp.txt:1400) + /// (Originally from ..\FSComp.txt:1403) static member keywordDescriptionRec() = (GetStringFunc("keywordDescriptionRec",",,,") ) /// Used to provide a value for the result of the containing computation expression. - /// (Originally from ..\FSComp.txt:1401) + /// (Originally from ..\FSComp.txt:1404) static member keywordDescriptionReturn() = (GetStringFunc("keywordDescriptionReturn",",,,") ) /// Used to provide a value for the result of the containing computation expression, where that value itself comes from the result another computation expression. - /// (Originally from ..\FSComp.txt:1402) + /// (Originally from ..\FSComp.txt:1405) static member keywordDescriptionReturnBang() = (GetStringFunc("keywordDescriptionReturnBang",",,,") ) /// Used in query expressions to specify what fields or columns to extract. Note that this is a contextual keyword, which means that it is not actually a reserved word and it only acts like a keyword in appropriate context. - /// (Originally from ..\FSComp.txt:1403) + /// (Originally from ..\FSComp.txt:1406) static member keywordDescriptionSelect() = (GetStringFunc("keywordDescriptionSelect",",,,") ) /// Used to indicate a method or property that can be called without an instance of a type, or a value member that is shared among all instances of a type. - /// (Originally from ..\FSComp.txt:1404) + /// (Originally from ..\FSComp.txt:1407) static member keywordDescriptionStatic() = (GetStringFunc("keywordDescriptionStatic",",,,") ) /// Used to declare a structure type. Also used in generic parameter constraints. Used for OCaml compatibility in module definitions. - /// (Originally from ..\FSComp.txt:1405) + /// (Originally from ..\FSComp.txt:1408) static member keywordDescriptionStruct() = (GetStringFunc("keywordDescriptionStruct",",,,") ) /// Used in conditional expressions. Also used to perform side effects after object construction. - /// (Originally from ..\FSComp.txt:1406) + /// (Originally from ..\FSComp.txt:1409) static member keywordDescriptionThen() = (GetStringFunc("keywordDescriptionThen",",,,") ) /// Used in for loops to indicate a range. - /// (Originally from ..\FSComp.txt:1407) + /// (Originally from ..\FSComp.txt:1410) static member keywordDescriptionTo() = (GetStringFunc("keywordDescriptionTo",",,,") ) /// Used to introduce a block of code that might generate an exception. Used together with with or finally. - /// (Originally from ..\FSComp.txt:1408) + /// (Originally from ..\FSComp.txt:1411) static member keywordDescriptionTry() = (GetStringFunc("keywordDescriptionTry",",,,") ) /// Used to declare a class, record, structure, discriminated union, enumeration type, unit of measure, or type abbreviation. - /// (Originally from ..\FSComp.txt:1409) + /// (Originally from ..\FSComp.txt:1412) static member keywordDescriptionType() = (GetStringFunc("keywordDescriptionType",",,,") ) /// Used to convert to a type that is higher in the inheritance chain. - /// (Originally from ..\FSComp.txt:1410) + /// (Originally from ..\FSComp.txt:1413) static member keywordDescriptionUpcast() = (GetStringFunc("keywordDescriptionUpcast",",,,") ) /// Used instead of let for values that implement IDisposable" - /// (Originally from ..\FSComp.txt:1411) + /// (Originally from ..\FSComp.txt:1414) static member keywordDescriptionUse() = (GetStringFunc("keywordDescriptionUse",",,,") ) /// Used instead of let! in computation expressions for computation expression results that implement IDisposable. - /// (Originally from ..\FSComp.txt:1412) + /// (Originally from ..\FSComp.txt:1415) static member keywordDescriptionUseBang() = (GetStringFunc("keywordDescriptionUseBang",",,,") ) /// Used in a signature to indicate a value, or in a type to declare a member, in limited situations. - /// (Originally from ..\FSComp.txt:1413) + /// (Originally from ..\FSComp.txt:1416) static member keywordDescriptionVal() = (GetStringFunc("keywordDescriptionVal",",,,") ) /// Indicates the .NET void type. Used when interoperating with other .NET languages. - /// (Originally from ..\FSComp.txt:1414) + /// (Originally from ..\FSComp.txt:1417) static member keywordDescriptionVoid() = (GetStringFunc("keywordDescriptionVoid",",,,") ) /// Used for Boolean conditions (when guards) on pattern matches and to introduce a constraint clause for a generic type parameter. - /// (Originally from ..\FSComp.txt:1415) + /// (Originally from ..\FSComp.txt:1418) static member keywordDescriptionWhen() = (GetStringFunc("keywordDescriptionWhen",",,,") ) /// Introduces a looping construct. - /// (Originally from ..\FSComp.txt:1416) + /// (Originally from ..\FSComp.txt:1419) static member keywordDescriptionWhile() = (GetStringFunc("keywordDescriptionWhile",",,,") ) /// Used together with the match keyword in pattern matching expressions. Also used in object expressions, record copying expressions, and type extensions to introduce member definitions, and to introduce exception handlers. - /// (Originally from ..\FSComp.txt:1417) + /// (Originally from ..\FSComp.txt:1420) static member keywordDescriptionWith() = (GetStringFunc("keywordDescriptionWith",",,,") ) /// Used in a sequence expression to produce a value for a sequence. - /// (Originally from ..\FSComp.txt:1418) + /// (Originally from ..\FSComp.txt:1421) static member keywordDescriptionYield() = (GetStringFunc("keywordDescriptionYield",",,,") ) /// Used in a computation expression to append the result of a given computation expression to a collection of results for the containing computation expression. - /// (Originally from ..\FSComp.txt:1419) + /// (Originally from ..\FSComp.txt:1422) static member keywordDescriptionYieldBang() = (GetStringFunc("keywordDescriptionYieldBang",",,,") ) /// In function types, delimits arguments and return values. Yields an expression (in sequence expressions); equivalent to the yield keyword. Used in match expressions - /// (Originally from ..\FSComp.txt:1420) + /// (Originally from ..\FSComp.txt:1423) static member keywordDescriptionRightArrow() = (GetStringFunc("keywordDescriptionRightArrow",",,,") ) /// Assigns a value to a variable. - /// (Originally from ..\FSComp.txt:1421) + /// (Originally from ..\FSComp.txt:1424) static member keywordDescriptionLeftArrow() = (GetStringFunc("keywordDescriptionLeftArrow",",,,") ) /// Converts a type to type that is higher in the hierarchy. - /// (Originally from ..\FSComp.txt:1422) + /// (Originally from ..\FSComp.txt:1425) static member keywordDescriptionCast() = (GetStringFunc("keywordDescriptionCast",",,,") ) /// Converts a type to a type that is lower in the hierarchy. - /// (Originally from ..\FSComp.txt:1423) + /// (Originally from ..\FSComp.txt:1426) static member keywordDescriptionDynamicCast() = (GetStringFunc("keywordDescriptionDynamicCast",",,,") ) /// Delimits a typed code quotation. - /// (Originally from ..\FSComp.txt:1424) + /// (Originally from ..\FSComp.txt:1427) static member keywordDescriptionTypedQuotation() = (GetStringFunc("keywordDescriptionTypedQuotation",",,,") ) /// Delimits a untyped code quotation. - /// (Originally from ..\FSComp.txt:1425) + /// (Originally from ..\FSComp.txt:1428) static member keywordDescriptionUntypedQuotation() = (GetStringFunc("keywordDescriptionUntypedQuotation",",,,") ) /// %s '%s' not found in assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1426) + /// (Originally from ..\FSComp.txt:1429) static member itemNotFoundDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String) = (3216, GetStringFunc("itemNotFoundDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s '%s' not found in type '%s' from assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1427) + /// (Originally from ..\FSComp.txt:1430) static member itemNotFoundInTypeDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3216, GetStringFunc("itemNotFoundInTypeDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// is - /// (Originally from ..\FSComp.txt:1428) + /// (Originally from ..\FSComp.txt:1431) static member descriptionWordIs() = (GetStringFunc("descriptionWordIs",",,,") ) /// This value is not a function and cannot be applied. - /// (Originally from ..\FSComp.txt:1429) + /// (Originally from ..\FSComp.txt:1432) static member notAFunction() = (GetStringFunc("notAFunction",",,,") ) /// This value is not a function and cannot be applied. Did you intend to access the indexer via %s.[index] instead? - /// (Originally from ..\FSComp.txt:1430) + /// (Originally from ..\FSComp.txt:1433) static member notAFunctionButMaybeIndexerWithName(a0 : System.String) = (GetStringFunc("notAFunctionButMaybeIndexerWithName",",,,%s,,,") a0) /// This expression is not a function and cannot be applied. Did you intend to access the indexer via expr.[index] instead? - /// (Originally from ..\FSComp.txt:1431) + /// (Originally from ..\FSComp.txt:1434) static member notAFunctionButMaybeIndexer() = (GetStringFunc("notAFunctionButMaybeIndexer",",,,") ) /// - /// (Originally from ..\FSComp.txt:1432) + /// (Originally from ..\FSComp.txt:1435) static member notAFunctionButMaybeIndexerErrorCode() = (3217, GetStringFunc("notAFunctionButMaybeIndexerErrorCode",",,,") ) /// This value is not a function and cannot be applied. Did you forget to terminate a declaration? - /// (Originally from ..\FSComp.txt:1433) + /// (Originally from ..\FSComp.txt:1436) static member notAFunctionButMaybeDeclaration() = (GetStringFunc("notAFunctionButMaybeDeclaration",",,,") ) /// The argument names in the signature '%s' and implementation '%s' do not match. The argument name from the signature file will be used. This may cause problems when debugging or profiling. - /// (Originally from ..\FSComp.txt:1434) + /// (Originally from ..\FSComp.txt:1437) static member ArgumentsInSigAndImplMismatch(a0 : System.String, a1 : System.String) = (3218, GetStringFunc("ArgumentsInSigAndImplMismatch",",,,%s,,,%s,,,") a0 a1) /// An error occurred while reading the F# metadata of assembly '%s'. A reserved construct was utilized. You may need to upgrade your F# compiler or use an earlier version of the assembly that doesn't make use of a specific construct. - /// (Originally from ..\FSComp.txt:1435) + /// (Originally from ..\FSComp.txt:1438) static member pickleUnexpectedNonZero(a0 : System.String) = (3219, GetStringFunc("pickleUnexpectedNonZero",",,,%s,,,") a0) /// This method or property is not normally used from F# code, use an explicit tuple pattern for deconstruction instead. - /// (Originally from ..\FSComp.txt:1436) + /// (Originally from ..\FSComp.txt:1439) static member tcTupleMemberNotNormallyUsed() = (3220, GetStringFunc("tcTupleMemberNotNormallyUsed",",,,") ) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield'. - /// (Originally from ..\FSComp.txt:1437) + /// (Originally from ..\FSComp.txt:1440) static member implicitlyDiscardedInSequenceExpression(a0 : System.String) = (3221, GetStringFunc("implicitlyDiscardedInSequenceExpression",",,,%s,,,") a0) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield!'. - /// (Originally from ..\FSComp.txt:1438) + /// (Originally from ..\FSComp.txt:1441) static member implicitlyDiscardedSequenceInSequenceExpression(a0 : System.String) = (3222, GetStringFunc("implicitlyDiscardedSequenceInSequenceExpression",",,,%s,,,") a0) /// The file '%s' changed on disk unexpectedly, please reload. - /// (Originally from ..\FSComp.txt:1439) + /// (Originally from ..\FSComp.txt:1442) static member ilreadFileChanged(a0 : System.String) = (3223, GetStringFunc("ilreadFileChanged",",,,%s,,,") a0) /// The byref pointer is readonly, so this write is not permitted. - /// (Originally from ..\FSComp.txt:1440) + /// (Originally from ..\FSComp.txt:1443) static member writeToReadOnlyByref() = (3224, GetStringFunc("writeToReadOnlyByref",",,,") ) /// A ReadOnly attribute has been applied to a struct type with a mutable field. - /// (Originally from ..\FSComp.txt:1441) + /// (Originally from ..\FSComp.txt:1444) static member readOnlyAttributeOnStructWithMutableField() = (3225, GetStringFunc("readOnlyAttributeOnStructWithMutableField",",,,") ) /// A byref pointer returned by a function or method is implicitly dereferenced as of F# 4.5. To acquire the return value as a pointer, use the address-of operator, e.g. '&f(x)' or '&obj.Method(arg1, arg2)'. - /// (Originally from ..\FSComp.txt:1442) + /// (Originally from ..\FSComp.txt:1445) static member tcByrefReturnImplicitlyDereferenced() = (3226, GetStringFunc("tcByrefReturnImplicitlyDereferenced",",,,") ) /// A type annotated with IsByRefLike must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1443) + /// (Originally from ..\FSComp.txt:1446) static member tcByRefLikeNotStruct() = (3227, GetStringFunc("tcByRefLikeNotStruct",",,,") ) /// The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1444) + /// (Originally from ..\FSComp.txt:1447) static member chkNoByrefAddressOfValueFromExpression() = (3228, GetStringFunc("chkNoByrefAddressOfValueFromExpression",",,,") ) /// The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope. - /// (Originally from ..\FSComp.txt:1445) + /// (Originally from ..\FSComp.txt:1448) static member chkNoReturnOfLimitedSpan() = (3229, GetStringFunc("chkNoReturnOfLimitedSpan",",,,") ) /// This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope. - /// (Originally from ..\FSComp.txt:1446) + /// (Originally from ..\FSComp.txt:1449) static member chkNoWriteToLimitedSpan(a0 : System.String) = (3230, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0) /// A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...' - /// (Originally from ..\FSComp.txt:1447) + /// (Originally from ..\FSComp.txt:1450) static member tastValueMustBeLocal() = (3231, GetStringFunc("tastValueMustBeLocal",",,,") ) /// A type annotated with IsReadOnly must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1448) + /// (Originally from ..\FSComp.txt:1451) static member tcIsReadOnlyNotStruct() = (3232, GetStringFunc("tcIsReadOnlyNotStruct",",,,") ) /// Struct members cannot return the address of fields of the struct by reference - /// (Originally from ..\FSComp.txt:1449) + /// (Originally from ..\FSComp.txt:1452) static member chkStructsMayNotReturnAddressesOfContents() = (3233, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,") ) /// The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1450) + /// (Originally from ..\FSComp.txt:1453) static member chkNoByrefLikeFunctionCall() = (3234, GetStringFunc("chkNoByrefLikeFunctionCall",",,,") ) /// The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1451) + /// (Originally from ..\FSComp.txt:1454) static member chkNoSpanLikeVariable(a0 : System.String) = (3235, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0) /// A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1452) + /// (Originally from ..\FSComp.txt:1455) static member chkNoSpanLikeValueFromExpression() = (3236, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,") ) /// Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address. - /// (Originally from ..\FSComp.txt:1453) + /// (Originally from ..\FSComp.txt:1456) static member tastCantTakeAddressOfExpression() = (3237, GetStringFunc("tastCantTakeAddressOfExpression",",,,") ) /// This type does not inherit Attribute, it will not work correctly with other .NET languages. - /// (Originally from ..\FSComp.txt:1454) + /// (Originally from ..\FSComp.txt:1457) static member tcTypeDoesNotInheritAttribute() = (3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,") ) /// The /checknulls language feature is not enabled - /// (Originally from ..\FSComp.txt:1455) + /// (Originally from ..\FSComp.txt:1458) static member tcNullnessCheckingNotEnabled() = (3247, GetStringFunc("tcNullnessCheckingNotEnabled",",,,") ) /// Invalid anonymous record expression - /// (Originally from ..\FSComp.txt:1456) + /// (Originally from ..\FSComp.txt:1459) static member parsInvalidAnonRecdExpr() = (3243, GetStringFunc("parsInvalidAnonRecdExpr",",,,") ) /// Invalid anonymous record type - /// (Originally from ..\FSComp.txt:1457) + /// (Originally from ..\FSComp.txt:1460) static member parsInvalidAnonRecdType() = (3244, GetStringFunc("parsInvalidAnonRecdType",",,,") ) /// The input to a copy-and-update expression that creates an anonymous record must be either an anonymous record or a record - /// (Originally from ..\FSComp.txt:1458) + /// (Originally from ..\FSComp.txt:1461) static member tcCopyAndUpdateNeedsRecordType() = (3245, GetStringFunc("tcCopyAndUpdateNeedsRecordType",",,,") ) /// The type '%s' does not support a nullness qualitification. - /// (Originally from ..\FSComp.txt:1459) + /// (Originally from ..\FSComp.txt:1462) static member tcTypeDoesNotHaveAnyNull(a0 : System.String) = (3260, GetStringFunc("tcTypeDoesNotHaveAnyNull",",,,%s,,,") a0) /// This language feature is not enabled, use /langversion:5.0 or greater to enable it - /// (Originally from ..\FSComp.txt:1464) + /// (Originally from ..\FSComp.txt:1467) static member tcLangFeatureNotEnabled50() = (3265, GetStringFunc("tcLangFeatureNotEnabled50",",,,") ) /// Call this method once to validate that all known resources are valid; throws if not @@ -4718,6 +4727,9 @@ type internal SR private() = ignore(GetString("csMethodFoundButIsStatic")) ignore(GetString("csMethodFoundButIsNotStatic")) ignore(GetString("csStructConstraintInconsistent")) + ignore(GetString("csNullNotNullConstraintInconsistent")) + ignore(GetString("csStructNullConstraintInconsistent")) + ignore(GetString("csDelegateComparisonConstraintInconsistent")) ignore(GetString("csTypeDoesNotHaveNull")) ignore(GetString("csTypeHasNullAsTrueValue")) ignore(GetString("csTypeHasNullAsExtraValue")) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index 593cf1a6f79..9665c389061 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -1038,6 +1038,15 @@ The constraints 'struct' and 'not struct' are inconsistent + + The constraints 'null' and 'not null' are inconsistent + + + The constraints 'struct' and 'null' are inconsistent + + + The constraints 'delegate' and 'comparison' are inconsistent + The type '{0}' does not have 'null' as a proper value diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 013a7ce7bad..1cadde35b3d 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -82,7 +82,7 @@ let NewErrorMeasureVar () = let NewInferenceType (g: TcGlobals) = let tp = NewTypar (TyparKind.Type, TyparRigidity.Flexible, Typar(compgenId, NoStaticReq, true), false, TyparDynamicReq.No, [], false, false) - let nullness = if g.langFeatureNullness then NewNullnessVar() else KnownObliviousToNull + let nullness = if g.langFeatureNullness then NewNullnessVar() else KnownAmbivalentToNull TType_var (tp, nullness) let NewErrorType () = mkTyparTy (NewErrorTypar ()) @@ -816,8 +816,8 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 CompleteD | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with - | NullnessInfo.ObliviousToNull, _ -> CompleteD - | _, NullnessInfo.ObliviousToNull -> CompleteD + | NullnessInfo.AmbivalentToNull, _ -> CompleteD + | _, NullnessInfo.AmbivalentToNull -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD // Allow expected of WithNull and actual of WithoutNull @@ -847,8 +847,8 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona CompleteD | Nullness.Known n1, Nullness.Known n2 -> match n1, n2 with - | NullnessInfo.ObliviousToNull, _ -> CompleteD - | _, NullnessInfo.ObliviousToNull -> CompleteD + | NullnessInfo.AmbivalentToNull, _ -> CompleteD + | _, NullnessInfo.AmbivalentToNull -> CompleteD | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD // Allow target of WithNull and actual of WithoutNull @@ -1824,6 +1824,7 @@ and AddConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace tp newConstraint = // comparison implies equality | TyparConstraint.SupportsComparison _, TyparConstraint.SupportsEquality _ | TyparConstraint.SupportsNull _, TyparConstraint.SupportsNull _ + | TyparConstraint.NotSupportsNull _, TyparConstraint.NotSupportsNull _ | TyparConstraint.IsNonNullableStruct _, TyparConstraint.IsNonNullableStruct _ | TyparConstraint.IsUnmanaged _, TyparConstraint.IsUnmanaged _ | TyparConstraint.IsReferenceType _, TyparConstraint.IsReferenceType _ @@ -1899,7 +1900,7 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio CompleteD | Nullness.Known n1 -> match n1 with - | NullnessInfo.ObliviousToNull -> CompleteD + | NullnessInfo.AmbivalentToNull -> CompleteD | NullnessInfo.WithNull -> CompleteD | NullnessInfo.WithoutNull -> if csenv.g.checkNullness then @@ -1919,7 +1920,7 @@ and SolveNullnessNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Op CompleteD | Nullness.Known n1 -> match n1 with - | NullnessInfo.ObliviousToNull -> CompleteD + | NullnessInfo.AmbivalentToNull -> CompleteD | NullnessInfo.WithoutNull -> CompleteD | NullnessInfo.WithNull -> if csenv.g.checkNullness then @@ -1994,7 +1995,7 @@ and SolveTypeDefnNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = //// If you set a type variable constrained with a T: not null to U then you don't induce an inference constraint //// of U: not null. //// TODO: what about Obsolete? - //| TType_var(_, nullness) when nullness.TryEvaluate() = Some NullnessInfo.WithoutNull || nullness.TryEvaluate() = Some NullnessInfo.ObliviousToNull -> CompleteD + //| TType_var(_, nullness) when nullness.TryEvaluate() = Some NullnessInfo.WithoutNull || nullness.TryEvaluate() = Some NullnessInfo.AmbivalentToNull -> CompleteD //| _ -> match tryDestTyparTy g ty with | ValueSome tp -> diff --git a/src/fsharp/ErrorLogger.fs b/src/fsharp/ErrorLogger.fs index 41be3768ed2..b7a0d7a5a8d 100755 --- a/src/fsharp/ErrorLogger.fs +++ b/src/fsharp/ErrorLogger.fs @@ -231,7 +231,6 @@ type PhasedDiagnostic = | BuildPhaseSubcategory.Parameter | BuildPhaseSubcategory.Parse | BuildPhaseSubcategory.TypeCheck -> true - | null | BuildPhaseSubcategory.DefaultPhase | BuildPhaseSubcategory.CodeGen | BuildPhaseSubcategory.Optimize diff --git a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj index 1bae3eda985..564580f2719 100644 --- a/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj +++ b/src/fsharp/FSharp.Build-proto/FSharp.Build-proto.fsproj @@ -15,6 +15,7 @@ true LKG {D8BC791F-C1A9-49DC-9432-0F3090537555} + BUILDING_WITH_LKG;$(DefineConstants) diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 0046e733380..7fbd5c9ed2d 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -16,6 +16,7 @@ FSharp.Build true {702A7979-BCF9-4C41-853E-3ADFC9897890} + $(OtherFlags) --checknulls diff --git a/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs b/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs index 8ea25e12d61..e3193bdc97c 100644 --- a/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs +++ b/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs @@ -42,7 +42,11 @@ type FSharpCommandLineBuilder () = if s <> String.Empty then srcs <- tmp.ToString() :: srcs +#if BUILDING_WITH_LKG member x.AppendSwitchIfNotNull(switch:string, values:string array, sep:string) = +#else + member x.AppendSwitchIfNotNull(switch:string, values:string? array, sep:string) = +#endif builder.AppendSwitchIfNotNull(switch, values, sep) let tmp = new CommandLineBuilder() tmp.AppendSwitchUnquotedIfNotNull(switch, values, sep) @@ -50,7 +54,11 @@ type FSharpCommandLineBuilder () = if s <> String.Empty then args <- s :: args +#if BUILDING_WITH_LKG member x.AppendSwitchIfNotNull(switch:string, value:string, ?metadataNames:string array) = +#else + member x.AppendSwitchIfNotNull(switch:string, value:string?, ?metadataNames:string array) = +#endif let metadataNames = defaultArg metadataNames [||] builder.AppendSwitchIfNotNull(switch, value) let tmp = new CommandLineBuilder() @@ -65,7 +73,11 @@ type FSharpCommandLineBuilder () = if s <> String.Empty then args <- s :: args +#if BUILDING_WITH_LKG member x.AppendSwitchUnquotedIfNotNull(switch:string, value:string) = +#else + member x.AppendSwitchUnquotedIfNotNull(switch:string, value:string?) = +#endif assert(switch = "") // we only call this method for "OtherFlags" // Unfortunately we still need to mimic what cmd.exe does, but only for "OtherFlags". let ParseCommandLineArgs(commandLine:string) = // returns list in reverse order diff --git a/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs b/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs index ddc1f9242ca..f434d78f595 100644 --- a/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs +++ b/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs @@ -13,8 +13,13 @@ open Microsoft.Build.Framework open Microsoft.Build.Utilities type FSharpEmbedResXSource() = +#if BUILDING_WITH_LKG let mutable _buildEngine : IBuildEngine = null let mutable _hostObject : ITaskHost = null +#else + let mutable _buildEngine : IBuildEngine? = null + let mutable _hostObject : ITaskHost? = null +#endif let mutable _embeddedText : ITaskItem[] = [||] let mutable _generatedSource : ITaskItem[] = [||] let mutable _outputPath : string = "" diff --git a/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs b/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs index 8be55fda907..0881c125369 100644 --- a/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs +++ b/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs @@ -8,8 +8,13 @@ open Microsoft.Build.Framework open Microsoft.Build.Utilities type FSharpEmbedResourceText() = +#if BUILDING_WITH_LKG let mutable _buildEngine : IBuildEngine = null let mutable _hostObject : ITaskHost = null +#else + let mutable _buildEngine : IBuildEngine? = null + let mutable _hostObject : ITaskHost? = null +#endif let mutable _embeddedText : ITaskItem[] = [||] let mutable _generatedSource : ITaskItem[] = [||] let mutable _generatedResx : ITaskItem[] = [||] diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs index 95f3ec2f98c..47b2b3afd66 100644 --- a/src/fsharp/FSharp.Build/Fsc.fs +++ b/src/fsharp/FSharp.Build/Fsc.fs @@ -25,63 +25,92 @@ type public Fsc () as this = inherit ToolTask () - let mutable baseAddress : string = null let mutable capturedArguments : string list = [] // list of individual args, to pass to HostObject Compile() let mutable capturedFilenames : string list = [] // list of individual source filenames, to pass to HostObject Compile() - let mutable codePage : string = null let mutable commandLineArgs : ITaskItem list = [] let mutable debugSymbols = false - let mutable debugType : string = null let mutable defineConstants : ITaskItem[] = [||] let mutable delaySign : bool = false - let mutable disabledWarnings : string = null - let mutable documentationFile : string = null - let mutable dotnetFscCompilerPath : string = null let mutable embedAllSources = false let mutable embeddedFiles : ITaskItem[] = [||] - let mutable generateInterfaceFile : string = null let mutable highEntropyVA : bool = false - let mutable keyFile : string = null let mutable noFramework = false let mutable optimize : bool = true - let mutable otherFlags : string = null - let mutable outputAssembly : string = null - let mutable pdbFile : string = null - let mutable platform : string = null let mutable prefer32bit : bool = false - let mutable preferredUILang : string = null let mutable publicSign : bool = false let mutable provideCommandLineArgs : bool = false let mutable references : ITaskItem[] = [||] - let mutable referencePath : string = null let mutable resources : ITaskItem[] = [||] let mutable skipCompilerExecution : bool = false let mutable sources : ITaskItem[] = [||] - let mutable sourceLink : string = null - let mutable subsystemVersion : string = null let mutable tailcalls : bool = true - let mutable targetProfile : string = null - let mutable targetType : string = null let mutable toolExe : string = "fsc.exe" - let mutable toolPath : string = - let locationOfThisDll = - try Some(Path.GetDirectoryName(typeof.Assembly.Location)) - with _ -> None - match FSharpEnvironment.BinFolderOfDefaultFSharpCompiler(locationOfThisDll) with - | Some s -> s - | None -> "" let mutable treatWarningsAsErrors : bool = false let mutable useStandardResourceNames : bool = false + let mutable vserrors : bool = false + let mutable utf8output : bool = false + +#if BUILDING_WITH_LKG + let mutable baseAddress : string = null + let mutable codePage : string = null + let mutable debugType : string = null + let mutable disabledWarnings : string = null + let mutable documentationFile : string = null + let mutable dotnetFscCompilerPath : string = null + let mutable generateInterfaceFile : string = null + let mutable keyFile : string = null + let mutable otherFlags : string = null + let mutable outputAssembly : string = null + let mutable pdbFile : string = null + let mutable platform : string = null + let mutable preferredUILang : string = null + let mutable referencePath : string = null + let mutable sourceLink : string = null + let mutable subsystemVersion : string = null + let mutable targetProfile : string = null + let mutable targetType : string = null let mutable warningsAsErrors : string = null let mutable warningsNotAsErrors : string = null let mutable versionFile : string = null let mutable warningLevel : string = null let mutable win32res : string = null let mutable win32manifest : string = null - let mutable vserrors : bool = false let mutable vslcid : string = null - let mutable utf8output : bool = false +#else + let mutable baseAddress : string? = null + let mutable codePage : string? = null + let mutable debugType : string? = null + let mutable disabledWarnings : string? = null + let mutable documentationFile : string? = null + let mutable dotnetFscCompilerPath : string? = null + let mutable generateInterfaceFile : string? = null + let mutable keyFile : string? = null + let mutable otherFlags : string? = null + let mutable outputAssembly : string? = null + let mutable pdbFile : string? = null + let mutable platform : string? = null + let mutable preferredUILang : string? = null + let mutable referencePath : string? = null + let mutable sourceLink : string? = null + let mutable subsystemVersion : string? = null + let mutable targetProfile : string? = null + let mutable targetType : string? = null + let mutable warningsAsErrors : string? = null + let mutable warningsNotAsErrors : string? = null + let mutable versionFile : string? = null + let mutable warningLevel : string? = null + let mutable win32res : string? = null + let mutable win32manifest : string? = null + let mutable vslcid : string? = null +#endif + let mutable toolPath : string = + let locationOfThisDll = + try Some(Path.GetDirectoryName(typeof.Assembly.Location)) + with _ -> None + match FSharpEnvironment.BinFolderOfDefaultFSharpCompiler(locationOfThisDll) with + | Some s -> s + | None -> "" // See bug 6483; this makes parallel build faster, and is fine to set unconditionally do this.YieldDuringToolExecution <- true @@ -106,9 +135,8 @@ type public Fsc () as this = | _ -> null) if embedAllSources then builder.AppendSwitch("--embed+") - if embeddedFiles <> null then - for item in embeddedFiles do - builder.AppendSwitchIfNotNull("--embed:", item.ItemSpec) + for item in embeddedFiles do + builder.AppendSwitchIfNotNull("--embed:", item.ItemSpec) builder.AppendSwitchIfNotNull("--sourcelink:", sourceLink) // NoFramework if noFramework then @@ -116,9 +144,8 @@ type public Fsc () as this = // BaseAddress builder.AppendSwitchIfNotNull("--baseaddress:", baseAddress) // DefineConstants - if defineConstants <> null then - for item in defineConstants do - builder.AppendSwitchIfNotNull("--define:", item.ItemSpec) + for item in defineConstants do + builder.AppendSwitchIfNotNull("--define:", item.ItemSpec) // DocumentationFile builder.AppendSwitchIfNotNull("--doc:", documentationFile) // GenerateInterfaceFile @@ -138,7 +165,11 @@ type public Fsc () as this = builder.AppendSwitchIfNotNull("--pdb:", pdbFile) // Platform builder.AppendSwitchIfNotNull("--platform:", +#if BUILDING_WITH_LKG let ToUpperInvariant (s:string) = if s = null then null else s.ToUpperInvariant() +#else + let ToUpperInvariant (s:string?) = if s = null then null else s.ToUpperInvariant() +#endif match ToUpperInvariant(platform), prefer32bit, ToUpperInvariant(targetType) with | "ANYCPU", true, "EXE" | "ANYCPU", true, "WINEXE" -> "anycpu32bitpreferred" @@ -146,19 +177,20 @@ type public Fsc () as this = | "X86" , _, _ -> "x86" | "X64" , _, _ -> "x64" | _ -> null) + // Resources - if resources <> null then - for item in resources do - match useStandardResourceNames with - | true -> builder.AppendSwitchIfNotNull("--resource:", item.ItemSpec, [|item.GetMetadata("LogicalName"); item.GetMetadata("Access")|]) - | false -> builder.AppendSwitchIfNotNull("--resource:", item.ItemSpec) + for item in resources do + match useStandardResourceNames with + | true -> builder.AppendSwitchIfNotNull("--resource:", item.ItemSpec, [|item.GetMetadata("LogicalName"); item.GetMetadata("Access")|]) + | false -> builder.AppendSwitchIfNotNull("--resource:", item.ItemSpec) // VersionFile builder.AppendSwitchIfNotNull("--versionfile:", versionFile) + // References - if references <> null then - for item in references do - builder.AppendSwitchIfNotNull("-r:", item.ItemSpec) + for item in references do + builder.AppendSwitchIfNotNull("-r:", item.ItemSpec) + // ReferencePath let referencePathArray = // create a array of strings match referencePath with @@ -166,6 +198,7 @@ type public Fsc () as this = | _ -> referencePath.Split([|';'; ','|], StringSplitOptions.RemoveEmptyEntries) builder.AppendSwitchIfNotNull("--lib:", referencePathArray, ",") + // TargetType builder.AppendSwitchIfNotNull("--target:", if targetType = null then null else @@ -194,7 +227,12 @@ type public Fsc () as this = let warningsAsErrorsArray = match warningsAsErrors with | null -> [|"76"|] + // TODO: nonNull should not be needed +#if BUILDING_WITH_LKG | _ -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) +#else + | _ -> (nonNull warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) +#endif builder.AppendSwitchIfNotNull("--warnaserror:", warningsAsErrorsArray, ",") @@ -547,7 +585,12 @@ type public Fsc () as this = override fsc.GenerateCommandLineCommands() = let builder = new FSharpCommandLineBuilder() - if not (String.IsNullOrEmpty(dotnetFscCompilerPath)) then builder.AppendSwitch(dotnetFscCompilerPath) + if not (String.IsNullOrEmpty(dotnetFscCompilerPath)) then +#if BUILDING_WITH_LKG + builder.AppendSwitch(dotnetFscCompilerPath) +#else + builder.AppendSwitch(nonNull dotnetFscCompilerPath) +#endif builder.ToString() override fsc.GenerateResponseFileCommands() = diff --git a/src/fsharp/FSharp.Build/WriteCodeFragment.fs b/src/fsharp/FSharp.Build/WriteCodeFragment.fs index a36193da547..7fd5c54d3cb 100644 --- a/src/fsharp/FSharp.Build/WriteCodeFragment.fs +++ b/src/fsharp/FSharp.Build/WriteCodeFragment.fs @@ -13,12 +13,19 @@ open Microsoft.Build.Framework open Microsoft.Build.Utilities type WriteCodeFragment() = +#if BUILDING_WITH_LKG let mutable _buildEngine : IBuildEngine = null let mutable _hostObject : ITaskHost = null - let mutable _language : string = "" - let mutable _assemblyAttributes : ITaskItem[] = [||] let mutable _outputDirectory : ITaskItem = null let mutable _outputFile : ITaskItem = null +#else + let mutable _buildEngine : IBuildEngine? = null + let mutable _hostObject : ITaskHost? = null + let mutable _outputDirectory : ITaskItem? = null + let mutable _outputFile : ITaskItem? = null +#endif + let mutable _language : string = "" + let mutable _assemblyAttributes : ITaskItem[] = [||] static let escapeString (str:string) = let sb = str.ToCharArray() |> Seq.fold (fun (sb:StringBuilder) (c:char) -> @@ -109,7 +116,9 @@ type WriteCodeFragment() = member this.Execute() = try - if isNull _outputFile && isNull _outputDirectory then failwith "Output location must be specified" + if isNull _outputFile && isNull _outputDirectory then + failwith "Output location must be specified" + let boilerplate = match _language.ToLowerInvariant() with | "f#" -> "// \n// Generated by the FSharp WriteCodeFragment class.\n// \nnamespace FSharp\n\nopen System\nopen System.Reflection\n" @@ -121,16 +130,25 @@ type WriteCodeFragment() = let code = Array.fold (fun (sb:StringBuilder) (item:ITaskItem) -> sb.AppendLine(WriteCodeFragment.GenerateAttribute (item, _language.ToLowerInvariant()))) sb _assemblyAttributes if _language.ToLowerInvariant() = "f#" then code.AppendLine("do()") |> ignore +#if BUILDING_WITH_LKG let fileName = _outputFile.ItemSpec +#else + let fileName = (nonNull _outputFile).ItemSpec +#endif let outputFileItem = if not (isNull _outputFile) && not (isNull _outputDirectory) && not (Path.IsPathRooted(fileName)) then +#if BUILDING_WITH_LKG TaskItem(Path.Combine(_outputDirectory.ItemSpec, fileName)) :> ITaskItem - elif isNull _outputFile then - let tempFile = Path.Combine(Path.GetTempPath(), sprintf "tmp%s.fs" (Guid.NewGuid().ToString("N"))) - TaskItem(tempFile) :> ITaskItem +#else + TaskItem(Path.Combine((nonNull _outputDirectory).ItemSpec, fileName)) :> ITaskItem +#endif else +#if BUILDING_WITH_LKG _outputFile +#else + nonNull _outputFile +#endif let codeText = code.ToString() let alreadyExists = (try File.Exists fileName && File.ReadAllText(fileName) = codeText with _ -> false) diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index 0c72713522c..17f5d157410 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -18,6 +18,7 @@ true 0x06800000 $(OtherFlags) /warnon:1182 + $(OtherFlags) --maxerrors:10000 diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 91eadb4875e..42fa4d0eeb4 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -14,6 +14,7 @@ Library FSharp.Compiler.Server.Shared v4.6 + $(OtherFlags) --checknulls diff --git a/src/fsharp/FSharp.Core/option.fsi b/src/fsharp/FSharp.Core/option.fsi index a8f7af2ffce..c2f6f10a7f5 100644 --- a/src/fsharp/FSharp.Core/option.fsi +++ b/src/fsharp/FSharp.Core/option.fsi @@ -191,10 +191,18 @@ namespace Microsoft.FSharp.Core /// The input value. /// The result option. [] +//#if BUILDING_WITH_LKG val ofObj: value: 'T -> 'T option when 'T : null +//#else +// val ofObj: value: 'T? -> 'T option // when 'T : not null +//#endif /// Convert an option to a potentially null value. /// The input value. /// The result value, which is null if the input was None. [] +//#if BUILDING_WITH_LKG val toObj: value: 'T option -> 'T when 'T : null +//#else +// val toObj: value: 'T option -> 'T? // when 'T : null +//#endif \ No newline at end of file diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index e224139e51c..caf2df499b0 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3333,19 +3333,20 @@ namespace Microsoft.FSharp.Core | null -> true | _ -> false - [] - let inline isNullV (value : Nullable<'T>) = not value.HasValue - [] let inline internal isNonNull (value : 'T) = match value with | null -> false | _ -> true +#if !BUILDING_WITH_LKG + [] + let inline isNullV (value : Nullable<'T>) = not value.HasValue + [] - let inline nonNull (value : 'T when 'T : not struct) = + let inline nonNull (value : ('T)? when 'T : not struct) = match box value with - | null -> raise (System.NullReferenceException()) + | null -> raise (System.NullReferenceException()) // TODO: decide if this raises an exception or ploughs on | _ -> value [] @@ -3356,13 +3357,14 @@ namespace Microsoft.FSharp.Core raise (System.NullReferenceException()) [] - let inline withNull (value : 'T when 'T : not struct) = value + let inline withNull (value : 'T when 'T : not struct) = (# "" value : 'T? #) [] let inline withNullV (value : 'T) : Nullable<'T> = Nullable<'T>(value) [] let inline nullV<'T when 'T : struct and 'T : (new : unit -> 'T) and 'T :> ValueType> = Nullable<'T>() +#endif [] let inline raise (exn: exn) = (# "throw" exn : 'T #) diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index a8a3502ee82..46014599be7 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -2225,25 +2225,36 @@ namespace Microsoft.FSharp.Core /// The boxed value. /// The unboxed result. [] +#if BUILDING_WITH_LKG val inline unbox : value:obj -> 'T +#else + val inline unbox : value:obj? -> 'T +#endif /// Boxes a strongly typed value. /// The value to box. /// The boxed object. [] +#if BUILDING_WITH_LKG val inline box : value:'T -> obj - +#else + val inline box : value:'T -> obj __ambivalent +#endif /// Try to unbox a strongly typed value. /// The boxed value. /// The unboxed result as an option. [] +#if BUILDING_WITH_LKG val inline tryUnbox : value:obj -> 'T option +#else + val inline tryUnbox : value:obj? -> 'T option +#endif /// Determines whether the given value is null. /// The value to check. /// True when value is null, false otherwise. [] - val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null + val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null // TODO addition of 'T : not struct is compat? #if !BUILDING_WITH_LKG /// Determines whether the given value is null. diff --git a/src/fsharp/FSharp.Core/reflect.fsi b/src/fsharp/FSharp.Core/reflect.fsi index 99d4e491891..773a9ceb6e8 100644 --- a/src/fsharp/FSharp.Core/reflect.fsi +++ b/src/fsharp/FSharp.Core/reflect.fsi @@ -18,12 +18,14 @@ open Microsoft.FSharp.Collections type UnionCaseInfo = /// The name of the case. member Name : string + /// The type in which the case occurs. member DeclaringType: Type /// Returns the custom attributes associated with the case. /// An array of custom attributes. member GetCustomAttributes: unit -> obj[] + /// Returns the custom attributes associated with the case matching the given attribute type. /// The type of attributes to return. /// An array of custom attributes. @@ -56,8 +58,12 @@ type FSharpValue = /// The PropertyInfo describing the field to read. /// Thrown when the input type is not a record type. /// The field from the record. +#if BUILDING_WITH_LKG static member GetRecordField: record:obj * info:PropertyInfo -> obj - +#else + static member GetRecordField: record:obj? * info:PropertyInfo -> obj? +#endif + /// Precompute a function for reading a particular field from a record. /// Assumes the given type is a RecordType with a field of the given name. /// If not, ArgumentException is raised during pre-computation. @@ -68,7 +74,11 @@ type FSharpValue = /// The PropertyInfo of the field to read. /// Thrown when the input type is not a record type. /// A function to read the specified field from the record. +#if BUILDING_WITH_LKG static member PreComputeRecordFieldReader : info:PropertyInfo -> (obj -> obj) +#else + static member PreComputeRecordFieldReader : info:PropertyInfo -> (obj? -> obj?) +#endif /// Creates an instance of a record type. /// @@ -78,7 +88,11 @@ type FSharpValue = /// Optional binding flags for the record. /// Thrown when the input type is not a record type. /// The created record. +#if BUILDING_WITH_LKG static member MakeRecord: recordType:Type * values:obj [] * ?bindingFlags:BindingFlags -> obj +#else + static member MakeRecord: recordType:Type * values:obj? [] * ?bindingFlags:BindingFlags -> obj +#endif /// Reads all the fields from a record value. /// @@ -87,7 +101,11 @@ type FSharpValue = /// Optional binding flags for the record. /// Thrown when the input type is not a record type. /// The array of fields from the record. +#if BUILDING_WITH_LKG static member GetRecordFields: record:obj * ?bindingFlags:BindingFlags -> obj[] +#else + static member GetRecordFields: record:obj? * ?bindingFlags:BindingFlags -> obj?[] +#endif /// Precompute a function for reading all the fields from a record. The fields are returned in the /// same order as the fields reported by a call to Microsoft.FSharp.Reflection.Type.GetInfo for @@ -103,7 +121,12 @@ type FSharpValue = /// Optional binding flags. /// Thrown when the input type is not a record type. /// An optimized reader for the given record type. +#if BUILDING_WITH_LKG static member PreComputeRecordReader : recordType:Type * ?bindingFlags:BindingFlags -> (obj -> obj[]) +#else + static member PreComputeRecordReader : recordType:Type * ?bindingFlags:BindingFlags -> (obj? -> obj?[]) +#endif + /// Precompute a function for constructing a record value. /// /// Assumes the given type is a RecordType. @@ -112,7 +135,11 @@ type FSharpValue = /// Optional binding flags. /// Thrown when the input type is not a record type. /// A function to construct records of the given type. +#if BUILDING_WITH_LKG static member PreComputeRecordConstructor : recordType:Type * ?bindingFlags:BindingFlags -> (obj[] -> obj) +#else + static member PreComputeRecordConstructor : recordType:Type * ?bindingFlags:BindingFlags -> (obj?[] -> obj) +#endif /// Get a ConstructorInfo for a record type /// The record type. @@ -125,7 +152,11 @@ type FSharpValue = /// The array of arguments to construct the given case. /// Optional binding flags. /// The constructed union case. +#if BUILDING_WITH_LKG static member MakeUnion: unionCase:UnionCaseInfo * args:obj [] * ?bindingFlags:BindingFlags -> obj +#else + static member MakeUnion: unionCase:UnionCaseInfo * args:obj? [] * ?bindingFlags:BindingFlags -> obj +#endif /// Identify the union case and its fields for an object /// @@ -139,8 +170,12 @@ type FSharpValue = /// Optional binding flags. /// Thrown when the input type is not a union case value. /// The description of the union case and its fields. +#if BUILDING_WITH_LKG static member GetUnionFields: value:obj * unionType:Type * ?bindingFlags:BindingFlags -> UnionCaseInfo * obj [] - +#else + static member GetUnionFields: value:obj? * unionType:Type * ?bindingFlags:BindingFlags -> UnionCaseInfo * obj? [] +#endif + /// Assumes the given type is a union type. /// If not, ArgumentException is raised during pre-computation. /// @@ -150,7 +185,11 @@ type FSharpValue = /// The type of union to optimize reading. /// Optional binding flags. /// An optimized function to read the tags of the given union type. +#if BUILDING_WITH_LKG static member PreComputeUnionTagReader : unionType:Type * ?bindingFlags:BindingFlags -> (obj -> int) +#else + static member PreComputeUnionTagReader : unionType:Type * ?bindingFlags:BindingFlags -> (obj? -> int) +#endif /// Precompute a property or static method for reading an integer representing the case tag of a union type. /// The type of union to read. @@ -164,13 +203,21 @@ type FSharpValue = /// The description of the union case to read. /// Optional binding flags. /// A function to for reading the fields of the given union case. +#if BUILDING_WITH_LKG static member PreComputeUnionReader : unionCase:UnionCaseInfo * ?bindingFlags:BindingFlags -> (obj -> obj[]) +#else + static member PreComputeUnionReader : unionCase:UnionCaseInfo * ?bindingFlags:BindingFlags -> (obj? -> obj?[]) +#endif /// Precompute a function for constructing a discriminated union value for a particular union case. /// The description of the union case. /// Optional binding flags. /// A function for constructing values of the given union case. +#if BUILDING_WITH_LKG static member PreComputeUnionConstructor : unionCase:UnionCaseInfo * ?bindingFlags:BindingFlags -> (obj[] -> obj) +#else + static member PreComputeUnionConstructor : unionCase:UnionCaseInfo * ?bindingFlags:BindingFlags -> (obj?[] -> obj) +#endif /// A method that constructs objects of the given case /// The description of the union case. @@ -185,7 +232,11 @@ type FSharpValue = /// Optional binding flags. /// Thrown when the input type is not an F# exception. /// The fields from the given exception. +#if BUILDING_WITH_LKG static member GetExceptionFields: exn:obj * ?bindingFlags:BindingFlags -> obj[] +#else + static member GetExceptionFields: exn:obj? * ?bindingFlags:BindingFlags -> obj?[] +#endif /// Creates an instance of a tuple type /// @@ -194,7 +245,11 @@ type FSharpValue = /// The tuple type to create. /// Thrown if no elements are given. /// An instance of the tuple type with the given elements. +#if BUILDING_WITH_LKG static member MakeTuple: tupleElements:obj[] * tupleType:Type -> obj +#else + static member MakeTuple: tupleElements:obj?[] * tupleType:Type -> obj +#endif /// Reads a field from a tuple value. /// @@ -202,7 +257,11 @@ type FSharpValue = /// The input tuple. /// The index of the field to read. /// The value of the field. +#if BUILDING_WITH_LKG static member GetTupleField: tuple:obj * index:int -> obj +#else + static member GetTupleField: tuple:obj * index:int -> obj? +#endif /// Reads all fields from a tuple. /// @@ -210,8 +269,12 @@ type FSharpValue = /// The input tuple. /// Thrown when the input is not a tuple value. /// An array of the fields from the given tuple. - static member GetTupleFields: tuple:obj -> obj [] - +#if BUILDING_WITH_LKG + static member GetTupleFields: tuple:obj -> obj[] +#else + static member GetTupleFields: tuple:obj -> obj? [] +#endif + /// Precompute a function for reading the values of a particular tuple type /// /// Assumes the given type is a TupleType. @@ -219,8 +282,12 @@ type FSharpValue = /// The tuple type to read. /// Thrown when the given type is not a tuple type. /// A function to read values of the given tuple type. +#if BUILDING_WITH_LKG static member PreComputeTupleReader : tupleType:Type -> (obj -> obj[]) - +#else + static member PreComputeTupleReader : tupleType:Type -> (obj? -> obj?[]) +#endif + /// Gets information that indicates how to read a field of a tuple /// The input tuple type. /// The index of the tuple element to describe. @@ -234,7 +301,11 @@ type FSharpValue = /// The type of tuple to read. /// Thrown when the given type is not a tuple type. /// A function to read a particular tuple type. +#if BUILDING_WITH_LKG static member PreComputeTupleConstructor : tupleType:Type -> (obj[] -> obj) +#else + static member PreComputeTupleConstructor : tupleType:Type -> (obj?[] -> obj) +#endif /// Gets a method that constructs objects of the given tuple type. /// For small tuples, no additional type will be returned. @@ -254,7 +325,11 @@ type FSharpValue = /// The function type of the implementation. /// The untyped lambda of the function implementation. /// A typed function from the given dynamic implementation. +#if BUILDING_WITH_LKG static member MakeFunction : functionType:Type * implementation:(obj -> obj) -> obj +#else + static member MakeFunction : functionType:Type * implementation:(obj? -> obj?) -> obj +#endif [] /// Contains operations associated with constructing and analyzing F# types such as records, unions and tuples @@ -363,7 +438,12 @@ module FSharpReflectionExtensions = /// Optional flags that denotes accessibility of the private representation. /// Thrown when the input type is not a record type. /// The created record. - static member MakeRecord: recordType:Type * values:obj [] * ?allowAccessToPrivateRepresentation : bool -> obj +#if BUILDING_WITH_LKG + static member MakeRecord: recordType:Type * values:obj[] * ?allowAccessToPrivateRepresentation : bool -> obj +#else + static member MakeRecord: recordType:Type * values:obj? [] * ?allowAccessToPrivateRepresentation : bool -> obj +#endif + /// Reads all the fields from a record value. /// /// Assumes the given input is a record value. If not, ArgumentException is raised. @@ -371,7 +451,11 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not a record type. /// The array of fields from the record. +#if BUILDING_WITH_LKG static member GetRecordFields: record:obj * ?allowAccessToPrivateRepresentation : bool -> obj[] +#else + static member GetRecordFields: record:obj? * ?allowAccessToPrivateRepresentation : bool -> obj?[] +#endif /// Precompute a function for reading all the fields from a record. The fields are returned in the /// same order as the fields reported by a call to Microsoft.FSharp.Reflection.Type.GetInfo for @@ -387,7 +471,12 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not a record type. /// An optimized reader for the given record type. +#if BUILDING_WITH_LKG static member PreComputeRecordReader : recordType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj -> obj[]) +#else + static member PreComputeRecordReader : recordType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj? -> obj?[]) +#endif + /// Precompute a function for constructing a record value. /// /// Assumes the given type is a RecordType. @@ -396,20 +485,28 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not a record type. /// A function to construct records of the given type. +#if BUILDING_WITH_LKG static member PreComputeRecordConstructor : recordType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj[] -> obj) +#else + static member PreComputeRecordConstructor : recordType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj?[] -> obj?) +#endif /// Get a ConstructorInfo for a record type /// The record type. /// Optional flag that denotes accessibility of the private representation. /// A ConstructorInfo for the given record type. static member PreComputeRecordConstructorInfo: recordType:Type * ?allowAccessToPrivateRepresentation : bool-> ConstructorInfo - + /// Create a union case value. /// The description of the union case to create. /// The array of arguments to construct the given case. /// Optional flag that denotes accessibility of the private representation. /// The constructed union case. - static member MakeUnion: unionCase:UnionCaseInfo * args:obj [] * ?allowAccessToPrivateRepresentation : bool-> obj +#if BUILDING_WITH_LKG + static member MakeUnion: unionCase:UnionCaseInfo * args:obj[] * ?allowAccessToPrivateRepresentation : bool-> obj +#else + static member MakeUnion: unionCase:UnionCaseInfo * args:obj? [] * ?allowAccessToPrivateRepresentation : bool-> obj +#endif /// Identify the union case and its fields for an object /// @@ -423,8 +520,12 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not a union case value. /// The description of the union case and its fields. - static member GetUnionFields: value:obj * unionType:Type * ?allowAccessToPrivateRepresentation : bool -> UnionCaseInfo * obj [] - +#if BUILDING_WITH_LKG + static member GetUnionFields: value:obj * unionType:Type * ?allowAccessToPrivateRepresentation : bool -> UnionCaseInfo * obj[] +#else + static member GetUnionFields: value:obj? * unionType:Type * ?allowAccessToPrivateRepresentation : bool -> UnionCaseInfo * obj? [] +#endif + /// Assumes the given type is a union type. /// If not, ArgumentException is raised during pre-computation. /// @@ -434,7 +535,11 @@ module FSharpReflectionExtensions = /// The type of union to optimize reading. /// Optional flag that denotes accessibility of the private representation. /// An optimized function to read the tags of the given union type. +#if BUILDING_WITH_LKG static member PreComputeUnionTagReader : unionType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj -> int) +#else + static member PreComputeUnionTagReader : unionType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj? -> int) +#endif /// Precompute a property or static method for reading an integer representing the case tag of a union type. /// The type of union to read. @@ -448,13 +553,21 @@ module FSharpReflectionExtensions = /// The description of the union case to read. /// Optional flag that denotes accessibility of the private representation. /// A function to for reading the fields of the given union case. +#if BUILDING_WITH_LKG static member PreComputeUnionReader : unionCase:UnionCaseInfo * ?allowAccessToPrivateRepresentation : bool -> (obj -> obj[]) +#else + static member PreComputeUnionReader : unionCase:UnionCaseInfo * ?allowAccessToPrivateRepresentation : bool -> (obj? -> obj?[]) +#endif /// Precompute a function for constructing a discriminated union value for a particular union case. /// The description of the union case. /// Optional flag that denotes accessibility of the private representation. /// A function for constructing values of the given union case. +#if BUILDING_WITH_LKG static member PreComputeUnionConstructor : unionCase:UnionCaseInfo * ?allowAccessToPrivateRepresentation : bool -> (obj[] -> obj) +#else + static member PreComputeUnionConstructor : unionCase:UnionCaseInfo * ?allowAccessToPrivateRepresentation : bool -> (obj?[] -> obj?) +#endif /// A method that constructs objects of the given case /// The description of the union case. @@ -469,7 +582,11 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not an F# exception. /// The fields from the given exception. +#if BUILDING_WITH_LKG static member GetExceptionFields: exn:obj * ?allowAccessToPrivateRepresentation : bool -> obj[] +#else + static member GetExceptionFields: exn:obj * ?allowAccessToPrivateRepresentation : bool -> obj?[] +#endif type FSharpType with /// Reads all the fields from a record value, in declaration order diff --git a/src/fsharp/Fsc-proto/Fsc-proto.fsproj b/src/fsharp/Fsc-proto/Fsc-proto.fsproj index 5cccf4f17a2..da76843bace 100644 --- a/src/fsharp/Fsc-proto/Fsc-proto.fsproj +++ b/src/fsharp/Fsc-proto/Fsc-proto.fsproj @@ -19,6 +19,7 @@ true $(OtherFlags) --warnon:1182 $(OtherFlags) --stackReserveSize:4096000 + BUILDING_WITH_LKG;$(DefineConstants) diff --git a/src/fsharp/LexFilter.fs b/src/fsharp/LexFilter.fs index 8ba2bbc77de..30b38405ba5 100755 --- a/src/fsharp/LexFilter.fs +++ b/src/fsharp/LexFilter.fs @@ -922,7 +922,7 @@ type LexFilterImpl (lightSyntaxStatus:LightSyntaxStatus, compilingFsLib, lexer, // fx // fx | DEFAULT | COLON | COLON_GREATER | STRUCT | NULL | DELEGATE | AND | WHEN - | QMARK | HACKNULL + | QMARK | HACKNULL | AMBIVALENT | DOT_DOT | NEW | LBRACE_BAR diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs index c3e6af73db6..70451685fc3 100755 --- a/src/fsharp/NicePrint.fs +++ b/src/fsharp/NicePrint.fs @@ -913,7 +913,7 @@ module private PrintTypes = match nullness.Evaluate() with | NullnessInfo.WithNull -> part2 ^^ rightL (tagText "?") | NullnessInfo.WithoutNull -> part2 - | NullnessInfo.ObliviousToNull -> part2 ^^ wordL (tagText "%") + | NullnessInfo.AmbivalentToNull -> part2 ^^ wordL (tagText "%") /// Layout a type, taking precedence into account to insert brackets where needed and layoutTypeWithInfoAndPrec denv env prec ty = diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index d5897c05c39..4782c8cffed 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -3270,7 +3270,7 @@ module DebugPrint = begin match nullness.Evaluate() with | NullnessInfo.WithNull -> coreL ^^ wordL (tagText "?") | NullnessInfo.WithoutNull -> coreL - | NullnessInfo.ObliviousToNull -> coreL ^^ wordL (tagText "%") + | NullnessInfo.AmbivalentToNull -> coreL ^^ wordL (tagText "%") and auxTypeWrapL env isAtomic ty = let wrap x = bracketIfL isAtomic x in // wrap iff require atomic expr diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index b176e10f033..39433a89f7f 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -654,7 +654,7 @@ let p_nleref x st = p_int (encode_nleref st.occus st.ostrings st.onlerefs st.osc // Simple types are types like "int", represented as TType(Ref_nonlocal(...,"int"),[]). // A huge number of these occur in pickled F# data, so make them unique. -let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], KnownObliviousToNull) // TODO should simpletyps hold obvlious or non-null etc.? +let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], KnownAmbivalentToNull) // TODO should simpletyps hold obvlious or non-null etc.? let lookup_simpletyp st simpleTyTab x = lookup_uniq st simpleTyTab x let u_encoded_simpletyp st = u_int st let u_encoded_anoninfo st = u_int st @@ -1593,7 +1593,7 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> match nullness.Evaluate() with | NullnessInfo.WithNull -> p_byteB 9 st | NullnessInfo.WithoutNull -> p_byteB 10 st - | NullnessInfo.ObliviousToNull -> p_byteB 11 st + | NullnessInfo.AmbivalentToNull -> p_byteB 11 st p_byte 1 st; p_simpletyp nleref st | TType_app (tc,tinst, nullness) -> @@ -1601,7 +1601,7 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> match nullness.Evaluate() with | NullnessInfo.WithNull -> p_byteB 12 st | NullnessInfo.WithoutNull -> p_byteB 13 st - | NullnessInfo.ObliviousToNull -> p_byteB 14 st + | NullnessInfo.AmbivalentToNull -> p_byteB 14 st p_byte 2 st; p_tcref "typ" tc st; p_tys tinst st | TType_fun (d,r,nullness) -> @@ -1609,7 +1609,7 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> match nullness.Evaluate() with | NullnessInfo.WithNull -> p_byteB 15 st | NullnessInfo.WithoutNull -> p_byteB 16 st - | NullnessInfo.ObliviousToNull -> p_byteB 17 st + | NullnessInfo.AmbivalentToNull -> p_byteB 17 st p_byte 3 st // Note, the "this" argument may be found in the domain position of a function type, so propagate the isStructThisArgPos value p_ty2 isStructThisArgPos d st @@ -1620,7 +1620,7 @@ let _ = fill_p_ty2 (fun isStructThisArgPos ty st -> match nullness.Evaluate() with | NullnessInfo.WithNull -> p_byteB 18 st | NullnessInfo.WithoutNull -> p_byteB 19 st - | NullnessInfo.ObliviousToNull -> p_byteB 20 st + | NullnessInfo.AmbivalentToNull -> p_byteB 20 st p_byte 4 st p_tpref r st @@ -1664,7 +1664,7 @@ let _ = fill_u_ty (fun st -> | _ -> ufailwith st "u_ty 9b" | 11 -> match sty with - | TType_app(tcref, _, _) -> TType_app(tcref, [], KnownObliviousToNull) + | TType_app(tcref, _, _) -> TType_app(tcref, [], KnownAmbivalentToNull) | _ -> ufailwith st "u_ty 9c" | b -> ufailwith st (sprintf "u_ty - 1/B, byte = %A" b) | 2 -> @@ -1672,29 +1672,29 @@ let _ = fill_u_ty (fun st -> let tcref = u_tcref st let tinst = u_tys st match tagB with - | 0 -> TType_app (tcref, tinst, KnownObliviousToNull) + | 0 -> TType_app (tcref, tinst, KnownAmbivalentToNull) | 12 -> TType_app (tcref, tinst, KnownWithNull) | 13 -> TType_app (tcref, tinst, KnownWithoutNull) - | 14 -> TType_app (tcref, tinst, KnownObliviousToNull) + | 14 -> TType_app (tcref, tinst, KnownAmbivalentToNull) | _ -> ufailwith st "u_ty - 2/B" | 3 -> let tagB = u_byteB st let d = u_ty st let r = u_ty st match tagB with - | 0 -> TType_fun (d, r, KnownObliviousToNull) + | 0 -> TType_fun (d, r, KnownAmbivalentToNull) | 15 -> TType_fun (d, r, KnownWithNull) | 16 -> TType_fun (d, r, KnownWithoutNull) - | 17 -> TType_fun (d, r, KnownObliviousToNull) + | 17 -> TType_fun (d, r, KnownAmbivalentToNull) | _ -> ufailwith st "u_ty - 3/B" | 4 -> let tagB = u_byteB st let r = u_tpref st match tagB with - | 0 -> r.AsType KnownObliviousToNull + | 0 -> r.AsType KnownAmbivalentToNull | 18 -> r.AsType KnownWithNull | 19 -> r.AsType KnownWithoutNull - | 20 -> r.AsType KnownObliviousToNull + | 20 -> r.AsType KnownAmbivalentToNull | _ -> ufailwith st "u_ty - 4/B" | 5 -> let tps = u_tyar_specs st in let r = u_ty st in TType_forall (tps,r) | 6 -> let unt = u_measure_expr st in TType_measure unt diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs index 8a782683af5..b2c26b6191c 100755 --- a/src/fsharp/TcGlobals.fs +++ b/src/fsharp/TcGlobals.fs @@ -172,7 +172,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d let v_langFeatureAnonRecds = (langVersion >= 5.0) let v_knownWithoutNull = - if v_langFeatureNullness then KnownWithoutNull else KnownObliviousToNull + if v_langFeatureNullness then KnownWithoutNull else KnownAmbivalentToNull let mkNonGenericTy tcref = TType_app(tcref, [], v_knownWithoutNull) diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index 6a34d8fa9d1..365ffd7871b 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -4706,7 +4706,7 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped errorR(Error(FSComp.SR.parsInvalidLiteralInType(), m)) NewErrorType (), tpenv - | SynType.WithNull(innerTy, m) -> + | SynType.WithNull(innerTy, ambivalent, m) -> let innerTyC, tpenv = TcTypeAndRecover cenv newOk checkCxs occ env tpenv innerTy if g.langFeatureNullness then if TypeNullNever g innerTyC then @@ -4715,7 +4715,7 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped // TODO - doesn't feel right - it will add KnownNotNull + KnownWithNull --> KnownWithNull, e.g. // let f (x: string) = (x = null) - match tryAddNullnessToTy KnownWithNull innerTyC with + match tryAddNullnessToTy (if ambivalent then KnownAmbivalentToNull else KnownWithNull) innerTyC with | None -> let tyString = NicePrint.minimalStringOfType env.DisplayEnv innerTyC diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs index c3b82585366..8082b28ea74 100644 --- a/src/fsharp/ast.fs +++ b/src/fsharp/ast.fs @@ -477,7 +477,7 @@ and | StaticConstantNamed of expr:SynType * SynType * range:range /// F# syntax : type | null - | WithNull of SynType * range:range + | WithNull of SynType * ambivalent: bool * range:range /// Get the syntactic range of source code covered by this construct. member x.Range = diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj index ad16d0c0017..67a98e1c4ed 100644 --- a/src/fsharp/fsi/Fsi.fsproj +++ b/src/fsharp/fsi/Fsi.fsproj @@ -24,7 +24,7 @@ FSI_SHADOW_COPY_REFERENCES;$(DefineConstants) FSI_SERVER;$(DefineConstants) true - $(OtherFlags) --warnon:1182 + $(OtherFlags) --warnon:1182 --checknulls fsi.res v4.6 diff --git a/src/fsharp/fsi/console.fs b/src/fsharp/fsi/console.fs index 2ec0a73f3a7..50df9903692 100644 --- a/src/fsharp/fsi/console.fs +++ b/src/fsharp/fsi/console.fs @@ -53,19 +53,19 @@ type internal History() = if current >= 0 && current < list.Count then list.[current] else String.Empty member x.Clear() = list.Clear(); current <- -1 - member x.Add line = + + member x.Add (line: string?) = // TODO: explicit type annotation shouldn't be needed match line with | null | "" -> () - | _ -> list.Add(line) + | _ -> + list.Add(nonNull line) // TODO: explicit instantiation shouldn't be needed - member x.AddLast line = + member x.AddLast (line: string?) = // TODO: explicit type annotation shouldn't be needed match line with | null | "" -> () - | _ -> list.Add(line); current <- list.Count - - // Dead code - // member x.First() = current <- 0; x.Current - // member x.Last() = current <- list.Count - 1; x.Current; + | _ -> + list.Add(nonNull line) // TODO: explicit instantiation shouldn't be needed + current <- list.Count member x.Previous() = if (list.Count > 0) then diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs index 4156a38448b..8d3a32b2720 100644 --- a/src/fsharp/import.fs +++ b/src/fsharp/import.fs @@ -161,13 +161,13 @@ let rec ImportILType (env:ImportMap) m tinst ty = | ILType.Array(bounds,ty) -> let n = bounds.Rank let elementType = ImportILType env m tinst ty - let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport then KnownWithNull else KnownObliviousToNull + let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport then KnownWithNull else KnownAmbivalentToNull mkArrayTy env.g n nullness elementType m | ILType.Boxed tspec | ILType.Value tspec -> let tcref = ImportILTypeRef env m tspec.TypeRef let inst = tspec.GenericArgs |> List.map (ImportILType env m tinst) - let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownWithNull else KnownObliviousToNull + let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownWithNull else KnownAmbivalentToNull ImportTyconRefApp env tcref inst nullness | ILType.Modified(_,tref,ILType.Byref ty) when tref.Name = "System.Runtime.InteropServices.InAttribute" -> mkInByrefTy env.g (ImportILType env m tinst ty) @@ -258,7 +258,7 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: let g = env.g if st.PUntaint((fun st -> st.IsArray),m) then let elemTy = (ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()),m))) - let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport then KnownWithNull else KnownObliviousToNull + let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport then KnownWithNull else KnownAmbivalentToNull mkArrayTy g (st.PUntaint((fun st -> st.GetArrayRank()),m)) nullness elemTy m elif st.PUntaint((fun st -> st.IsByRef),m) then let elemTy = (ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()),m))) @@ -316,7 +316,7 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st: else genericArg) - let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownWithNull else KnownObliviousToNull + let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownWithNull else KnownAmbivalentToNull ImportTyconRefApp env tcref genericArgs nullness diff --git a/src/fsharp/lexhelp.fs b/src/fsharp/lexhelp.fs index 8a544642101..3e3a6ad0990 100644 --- a/src/fsharp/lexhelp.fs +++ b/src/fsharp/lexhelp.fs @@ -285,6 +285,7 @@ module Keywords = FSHARP, "__token_OLET" ,OLET(true) FSHARP, "__token_constraint",CONSTRAINT FSHARP, "__hacknull",HACKNULL + FSHARP, "__ambivalent",AMBIVALENT ] (*------- reserved keywords which are ml-compatibility ids *) @ List.map (fun s -> (FSHARP,s,RESERVED)) diff --git a/src/fsharp/lib.fs b/src/fsharp/lib.fs index 18404ba377d..cc713e73bb3 100755 --- a/src/fsharp/lib.fs +++ b/src/fsharp/lib.fs @@ -21,7 +21,11 @@ let condition s = let GetEnvInteger e dflt = match System.Environment.GetEnvironmentVariable(e) with null -> dflt | t -> try int t with _ -> dflt +#if BUILDING_WITH_LKG let dispose (x:System.IDisposable) = match x with null -> () | x -> x.Dispose() +#else +let dispose (x:System.IDisposable?) = match x with null -> () | x -> x.Dispose() +#endif type SaveAndRestoreConsoleEncoding () = let savedOut = System.Console.Out @@ -114,10 +118,9 @@ module Check = /// Throw System.ArgumentNullException() if argument is null. let ArgumentNotNull arg argname = - match box(arg) with + match box arg with | null -> raise (new System.ArgumentNullException(argname)) | _ -> () - /// Throw System.ArgumentNullException() if array argument is null. /// Throw System.ArgumentOutOfRangeException() is array argument is empty. @@ -369,22 +372,23 @@ type Graph<'Data, 'Id when 'Id : comparison and 'Id : equality> // with care. //---------------------------------------------------------------------------- -// The following DEBUG code does not currently compile. -//#if DEBUG -//type 'T NonNullSlot = 'T option -//let nullableSlotEmpty() = None -//let nullableSlotFull(x) = Some x +//#if BUILDING_WITH_LKG +type NonNullSlot<'T when 'T : not struct> = 'T //#else -type NonNullSlot<'T> = 'T -let nullableSlotEmpty() = Unchecked.defaultof<'T> -let nullableSlotFull x = x -//#endif +//type NonNullSlot<'T when (* 'T : not null and *) 'T : not struct> = 'T? +//#endif +let nullableSlotEmpty() : NonNullSlot<'T> = Unchecked.defaultof<_> +let nullableSlotFull (x: 'T) : NonNullSlot<'T> = x //--------------------------------------------------------------------------- // Caches, mainly for free variables //--------------------------------------------------------------------------- -type cache<'T> = { mutable cacheVal: 'T NonNullSlot } +//#if BUILDING_WITH_LKG +type cache<'T when 'T : not struct> = { mutable cacheVal: NonNullSlot<'T> } +//#else +//type cache<'T when 'T : (* not null and *) 'T : not struct> = { mutable cacheVal: NonNullSlot<'T> } +//#endif let newCache() = { cacheVal = nullableSlotEmpty() } let inline cached cache resf = diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy index 6080c0e6e87..155805e938e 100644 --- a/src/fsharp/pars.fsy +++ b/src/fsharp/pars.fsy @@ -203,7 +203,7 @@ let rangeOfLongIdent(lid:LongIdent) = %token GREATER_RBRACK STRUCT SIG %token STATIC MEMBER CLASS ABSTRACT OVERRIDE DEFAULT CONSTRUCTOR INHERIT %token EXTERN VOID PUBLIC PRIVATE INTERNAL GLOBAL -%token HACKNULL +%token HACKNULL AMBIVALENT /* for parser 'escape hatch' out of expression context without consuming the 'recover' token */ %token TYPE_COMING_SOON TYPE_IS_HERE MODULE_COMING_SOON MODULE_IS_HERE @@ -4432,14 +4432,17 @@ appTypeConPower: appType: | appType HACKNULL - { SynType.WithNull($1,lhs parseState) } + { SynType.WithNull($1, false, lhs parseState) } + + | appType AMBIVALENT + { SynType.WithNull($1, true, lhs parseState) } | appType QMARK - { SynType.WithNull($1,lhs parseState) } + { SynType.WithNull($1, false, lhs parseState) } /* | appType OR NULL - { SynType.WithNull($1,lhs parseState) } + { SynType.WithNull($1, false lhs parseState) } */ | appType arrayTypeSuffix { SynType.Array($2,$1,lhs parseState) } diff --git a/src/fsharp/service/ServiceLexing.fs b/src/fsharp/service/ServiceLexing.fs index 69987614adb..c350287f100 100755 --- a/src/fsharp/service/ServiceLexing.fs +++ b/src/fsharp/service/ServiceLexing.fs @@ -266,7 +266,7 @@ module internal TokenClassifications = | IF | THEN | ELSE | DO | DONE | LET(_) | IN (*| NAMESPACE*) | CONST | HIGH_PRECEDENCE_PAREN_APP | FIXED | HIGH_PRECEDENCE_BRACK_APP - | HACKNULL + | HACKNULL | AMBIVALENT | TYPE_COMING_SOON | TYPE_IS_HERE | MODULE_COMING_SOON | MODULE_IS_HERE -> (FSharpTokenColorKind.Keyword,FSharpTokenCharKind.Keyword,FSharpTokenTriggerClass.None) diff --git a/src/fsharp/symbols/SymbolHelpers.fs b/src/fsharp/symbols/SymbolHelpers.fs index 980b03824e2..6cc7479c344 100644 --- a/src/fsharp/symbols/SymbolHelpers.fs +++ b/src/fsharp/symbols/SymbolHelpers.fs @@ -476,7 +476,7 @@ module internal SymbolHelpers = // Generalize to get a formal signature let formalTypars = tcref.Typars(m) let formalTypeInst = generalizeTypars formalTypars - let ty = TType_app(tcref, formalTypeInst, KnownObliviousToNull) + let ty = TType_app(tcref, formalTypeInst, KnownAmbivalentToNull) if isILAppTy g ty then let formalTypeInfo = ILTypeInfo.FromType g ty Some(nlref.Ccu.FileName, formalTypars, formalTypeInfo) diff --git a/src/fsharp/symbols/Symbols.fs b/src/fsharp/symbols/Symbols.fs index b2a8d80baff..8519e397b68 100644 --- a/src/fsharp/symbols/Symbols.fs +++ b/src/fsharp/symbols/Symbols.fs @@ -2093,11 +2093,11 @@ and FSharpType(cenv, ty:TType) = | TType_tuple (_, _) -> false | _ -> false - member __.IsNullOblivious = + member __.IsNullAmbivalent = protect <| fun () -> match stripTyparEqns ty with | TType_app (_, _, nullness) - | TType_fun(_, _, nullness) -> match nullness.Evaluate() with NullnessInfo.ObliviousToNull -> true | _ -> false + | TType_fun(_, _, nullness) -> match nullness.Evaluate() with NullnessInfo.AmbivalentToNull -> true | _ -> false | TType_tuple (_, _) -> false | _ -> false diff --git a/src/fsharp/symbols/Symbols.fsi b/src/fsharp/symbols/Symbols.fsi index 3d14a4b284f..96eafe57cbc 100644 --- a/src/fsharp/symbols/Symbols.fsi +++ b/src/fsharp/symbols/Symbols.fsi @@ -945,7 +945,7 @@ and [] public FSharpType = member HasNullAnnotation: bool /// Indicates this type is assumed to support the null value - member IsNullOblivious: bool + member IsNullAmbivalent: bool /// Get the generic arguments for a tuple type, a function type or a type constructed using a named entity member GenericArguments : IList diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index f189ee79aae..a2576144028 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -2256,11 +2256,11 @@ and /// Links a previously unlinked type variable to the given data. Only used during unpickling of F# metadata. member x.AsType nullness = match nullness with - | Nullness.Known NullnessInfo.ObliviousToNull -> + | Nullness.Known NullnessInfo.AmbivalentToNull -> let ty = x.typar_astype match box ty with | null -> - let ty2 = TType_var (x, Nullness.Known NullnessInfo.ObliviousToNull) + let ty2 = TType_var (x, Nullness.Known NullnessInfo.AmbivalentToNull) x.typar_astype <- ty2 ty2 | _ -> ty @@ -3921,7 +3921,7 @@ and Nullness = // | Known info -> Some info // | Variable v -> v.TryEvaluate() - override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.ObliviousToNull -> "%" + override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?" | NullnessInfo.WithoutNull -> "" | NullnessInfo.AmbivalentToNull -> "%" // Note, nullness variables are only created if the nullness checking feature is on and NullnessVar() = @@ -3962,7 +3962,7 @@ and | WithoutNull /// we know we don't care - | ObliviousToNull + | AmbivalentToNull and /// The algebra of types @@ -5196,7 +5196,7 @@ and /// non-generic types. and [] - CompiledTypeRepr = + CompiledTypeRepr = /// An AbstractIL type representation that is just the name of a type. /// @@ -5374,7 +5374,7 @@ let ccuOfTyconRef eref = let NewNullnessVar() = Nullness.Variable (NullnessVar()) // we don't known (and if we never find out then it's non-null) -let KnownObliviousToNull = Nullness.Known NullnessInfo.ObliviousToNull +let KnownAmbivalentToNull = Nullness.Known NullnessInfo.AmbivalentToNull let KnownWithNull = Nullness.Known NullnessInfo.WithNull let KnownWithoutNull = Nullness.Known NullnessInfo.WithoutNull @@ -5423,11 +5423,11 @@ let rec stripUnitEqnsAux canShortcut unt = let combineNullness (nullnessOrig: Nullness) (nullnessNew: Nullness) = match nullnessOrig.Evaluate() with | NullnessInfo.WithoutNull -> nullnessNew - | NullnessInfo.ObliviousToNull -> nullnessOrig + | NullnessInfo.AmbivalentToNull -> nullnessOrig | NullnessInfo.WithNull -> match nullnessNew.Evaluate() with | NullnessInfo.WithoutNull -> nullnessOrig - | NullnessInfo.ObliviousToNull -> nullnessNew + | NullnessInfo.AmbivalentToNull -> nullnessNew | NullnessInfo.WithNull -> nullnessOrig let tryAddNullnessToTy nullnessNew (ty:TType) = diff --git a/src/utils/CompilerLocationUtils.fs b/src/utils/CompilerLocationUtils.fs index 55dcac8ccc0..95f1dfe4287 100644 --- a/src/utils/CompilerLocationUtils.fs +++ b/src/utils/CompilerLocationUtils.fs @@ -105,8 +105,11 @@ module internal FSharpEnvironment = let mutable uType = REG_SZ; let mutable cbData = maxDataLength; - let res = RegQueryValueExW(hkey, null, 0u, &uType, pathResult, &cbData); - +#if BUILDING_WITH_LKG + let res = RegQueryValueExW(hkey, null, 0u, &uType, pathResult, &cbData); // TODO use of nonNull should not be required +#else + let res = RegQueryValueExW(hkey, nonNull null, 0u, &uType, pathResult, &cbData); // TODO use of nonNull should not be required +#endif if (res = 0u && cbData > 0 && cbData <= maxDataLength) then Marshal.PtrToStringUni(pathResult, (cbData - 2)/2); else diff --git a/src/utils/sformat.fs b/src/utils/sformat.fs index 7620a2c411c..8eae50b18d4 100644 --- a/src/utils/sformat.fs +++ b/src/utils/sformat.fs @@ -392,6 +392,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl [] type ValueInfo = +#if BUILDING_WITH_LKG | TupleValue of (obj * Type) list | FunctionClosureValue of System.Type | RecordValue of (string * obj * Type) list @@ -399,12 +400,25 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl | ExceptionValue of System.Type * (string * (obj * Type)) list | UnitValue | ObjectValue of obj +#else + | TupleValue of (obj? * Type) list + | FunctionClosureValue of System.Type + | RecordValue of (string * obj? * Type) list + | ConstructorValue of string * (string * (obj? * Type)) list + | ExceptionValue of System.Type * (string * (obj? * Type)) list + | UnitValue + | ObjectValue of obj? +#endif module Value = // Analyze an object to see if it the representation // of an F# value. +#if BUILDING_WITH_LKG let GetValueInfoOfObject (bindingFlags:BindingFlags) (obj : obj) = +#else + let GetValueInfoOfObject (bindingFlags:BindingFlags) (obj : obj?) = +#endif #if FX_RESHAPED_REFLECTION let showNonPublic = isNonPublicFlag bindingFlags #endif @@ -466,7 +480,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl // analysis of null values. let GetValueInfo bindingFlags (x : 'a, ty : Type) (* x could be null *) = - let obj = (box x) + let obj = box x match obj with | null -> let isNullaryUnion = @@ -742,7 +756,11 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl | [(_,h);(_,t)] -> (h,t) | _ -> failwith "unpackCons" +#if BUILDING_WITH_LKG let getListValueInfo bindingFlags (x:obj, ty:Type) = +#else + let getListValueInfo bindingFlags (x:obj?, ty:Type) = +#endif match x with | null -> None | _ -> @@ -887,10 +905,19 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl let stopShort _ = exceededPrintSize() // for unfoldL // Recursive descent +#if BUILDING_WITH_LKG let rec objL depthLim prec (x:obj, ty:Type) = polyL bindingFlags objWithReprL ShowAll depthLim prec (x, ty) // showMode for inner expr and sameObjL depthLim prec (x:obj, ty:Type) = polyL bindingFlags objWithReprL showMode depthLim prec (x, ty) // showMode preserved +#else + let rec objL depthLim prec (x:obj?, ty:Type) = polyL bindingFlags objWithReprL ShowAll depthLim prec (x, ty) // showMode for inner expr + and sameObjL depthLim prec (x:obj?, ty:Type) = polyL bindingFlags objWithReprL showMode depthLim prec (x, ty) // showMode preserved +#endif +#if BUILDING_WITH_LKG and objWithReprL showMode depthLim prec (info:ValueInfo) (x:obj) (* x could be null *) = +#else + and objWithReprL showMode depthLim prec (info:ValueInfo) (x:obj?) (* x could be null *) = +#endif try if depthLim<=0 || exceededPrintSize() then wordL (tagPunctuation "...") else match x with @@ -913,7 +940,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl | res -> let attr = (res.[0] :?> StructuredFormatDisplayAttribute) let txt = attr.Value - if isNull txt || txt.Length <= 1 then + if isNull (box txt) || txt.Length <= 1 then None else let messageRegexPattern = @"^(?
.*?)(?.*?)(?.*)$"
@@ -1222,7 +1249,11 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl
         // pprinter: leafFormatter
         // --------------------------------------------------------------------
 
+#if BUILDING_WITH_LKG
         let leafFormatter (opts:FormatOptions) (obj :obj) =
+#else
+        let leafFormatter (opts:FormatOptions) (obj :obj?) =
+#endif
             match obj with 
             | null -> tagKeyword "null"
             | :? double as d -> 

From 5bc59eb1460f88a1200aae4bf30c7fc307139dfa Mon Sep 17 00:00:00 2001
From: Don Syme 
Date: Mon, 12 Nov 2018 13:33:54 +0000
Subject: [PATCH 019/137] mark up TODOs

---
 src/fsharp/ConstraintSolver.fs        |  4 ++--
 src/fsharp/FSharp.Build/Fsc.fs        |  2 +-
 src/fsharp/FSharp.Core/array.fs       |  2 +-
 src/fsharp/FSharp.Core/array2.fs      |  2 +-
 src/fsharp/FSharp.Core/list.fs        |  2 +-
 src/fsharp/FSharp.Core/prim-types.fs  |  2 +-
 src/fsharp/FSharp.Core/prim-types.fsi |  2 +-
 src/fsharp/FSharp.Core/seq.fs         |  2 +-
 src/fsharp/FSharp.Core/seqcore.fs     |  2 +-
 src/fsharp/IlxGen.fs                  |  3 +--
 src/fsharp/QuotationTranslator.fs     |  2 +-
 src/fsharp/TastOps.fs                 |  8 ++++----
 src/fsharp/TastPickle.fs              |  7 ++++++-
 src/fsharp/fsi/console.fs             |  8 ++++----
 src/fsharp/tast.fs                    | 20 ++++++++++----------
 15 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 1cadde35b3d..374bcc51238 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -821,7 +821,7 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1
         | NullnessInfo.WithNull, NullnessInfo.WithNull -> CompleteD
         | NullnessInfo.WithoutNull, NullnessInfo.WithoutNull -> CompleteD
         // Allow expected of WithNull and actual of WithoutNull
-        // TODO:  this is not sound in contravariant cases etc.
+        // TODO NULLNESS:  this is not sound in contravariant cases etc.
         | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD
         | _ -> 
             if csenv.g.checkNullness then 
@@ -987,7 +987,7 @@ and SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln origl1 origl2 =
        loop origl1 origl2
 
 and SolveFunTypeEqn csenv ndeep m2 trace cxsln d1 d2 r1 r2 = trackErrors {
-    // TODO: consider flipping the actual and expected in argument position
+    // TODO NULLNESS: consider flipping the actual and expected in argument position
     do! SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln d1 d2
     return! SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln r1 r2
   }
diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs
index 47b2b3afd66..63c001693cc 100644
--- a/src/fsharp/FSharp.Build/Fsc.fs
+++ b/src/fsharp/FSharp.Build/Fsc.fs
@@ -227,7 +227,7 @@ type public Fsc () as this =
         let warningsAsErrorsArray =
             match warningsAsErrors with
             | null -> [|"76"|]
-            // TODO: nonNull should not be needed
+            // TODO NULLNESS: nonNull should not be needed
 #if BUILDING_WITH_LKG
             | _ -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries)
 #else
diff --git a/src/fsharp/FSharp.Core/array.fs b/src/fsharp/FSharp.Core/array.fs
index 9d010246bf4..a323cd3eb4b 100644
--- a/src/fsharp/FSharp.Core/array.fs
+++ b/src/fsharp/FSharp.Core/array.fs
@@ -13,7 +13,7 @@ namespace Microsoft.FSharp.Collections
 #if FX_RESHAPED_REFLECTION
     open System.Reflection
 #endif
-    #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this?
+    #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this?
 
     /// Basic operations on arrays
     []
diff --git a/src/fsharp/FSharp.Core/array2.fs b/src/fsharp/FSharp.Core/array2.fs
index dbd7320281b..18f5f581791 100644
--- a/src/fsharp/FSharp.Core/array2.fs
+++ b/src/fsharp/FSharp.Core/array2.fs
@@ -9,7 +9,7 @@ namespace Microsoft.FSharp.Collections
     open Microsoft.FSharp.Core.Operators.Checked
 
     #nowarn "3218" // mismatch of parameter name where 'count1' --> 'length1' would shadow function in module of same name
-    #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this?
+    #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this?
 
     []
     []
diff --git a/src/fsharp/FSharp.Core/list.fs b/src/fsharp/FSharp.Core/list.fs
index 6d46be2180f..02562c2583a 100644
--- a/src/fsharp/FSharp.Core/list.fs
+++ b/src/fsharp/FSharp.Core/list.fs
@@ -12,7 +12,7 @@ namespace Microsoft.FSharp.Collections
 #if FX_RESHAPED_REFLECTION
     open System.Reflection
 #endif
-    #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this?
+    #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this?
 
     []
     []
diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs
index caf2df499b0..42ebc8f403a 100644
--- a/src/fsharp/FSharp.Core/prim-types.fs
+++ b/src/fsharp/FSharp.Core/prim-types.fs
@@ -3346,7 +3346,7 @@ namespace Microsoft.FSharp.Core
         []
         let inline nonNull (value : ('T)? when 'T : not struct) = 
             match box value with 
-            | null -> raise (System.NullReferenceException()) // TODO: decide if this raises an exception or ploughs on 
+            | null -> raise (System.NullReferenceException()) // TODO NULLNESS: decide if this raises an exception or ploughs on 
             | _ -> value
 
         []
diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi
index 46014599be7..b18fb444962 100644
--- a/src/fsharp/FSharp.Core/prim-types.fsi
+++ b/src/fsharp/FSharp.Core/prim-types.fsi
@@ -2254,7 +2254,7 @@ namespace Microsoft.FSharp.Core
         /// The value to check.
         /// True when value is null, false otherwise.
         []
-        val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null // TODO addition of 'T : not struct is compat?
+        val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null // TODO NULLNESS addition of 'T : not struct is compat?
         
 #if !BUILDING_WITH_LKG
         /// Determines whether the given value is null.
diff --git a/src/fsharp/FSharp.Core/seq.fs b/src/fsharp/FSharp.Core/seq.fs
index f721aea94ac..67a93fb05d2 100644
--- a/src/fsharp/FSharp.Core/seq.fs
+++ b/src/fsharp/FSharp.Core/seq.fs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.FSharp.Collections
     #nowarn "52" // The value has been copied to ensure the original is not mutated by this operation
-    #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this?
+    #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this?
 
     open System
     open System.Diagnostics
diff --git a/src/fsharp/FSharp.Core/seqcore.fs b/src/fsharp/FSharp.Core/seqcore.fs
index e20e984dd8c..cdaeb2b4dd7 100644
--- a/src/fsharp/FSharp.Core/seqcore.fs
+++ b/src/fsharp/FSharp.Core/seqcore.fs
@@ -2,7 +2,7 @@
 
 namespace Microsoft.FSharp.Collections
     #nowarn "52" // The value has been copied to ensure the original is not mutated by this operation
-    #nowarn "3245" // nullness on box-match-null TODO: don't give a warning on this?
+    #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this?
 
     open System
     open System.Diagnostics
diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs
index 8e267825dbe..ca33e8c231d 100644
--- a/src/fsharp/IlxGen.fs
+++ b/src/fsharp/IlxGen.fs
@@ -2653,8 +2653,7 @@ and GenUntupledArgExpr cenv cgbuf eenv m argInfos expr sequel =
             GenBinding cenv cgbuf eenvinner bind;
             let tys = destRefTupleTy cenv.g ty
             assert (tys.Length = numRequiredExprs)
-            // TODO - tupInfoRef
-            argInfos |> List.iteri (fun i _ -> GenGetTupleField cenv cgbuf eenvinner (tupInfoRef (* TODO *),loce,tys,i,m) Continue);
+            argInfos |> List.iteri (fun i _ -> GenGetTupleField cenv cgbuf eenvinner (tupInfoRef,loce,tys,i,m) Continue);
             GenSequel cenv eenv.cloc cgbuf sequel
         )
 
diff --git a/src/fsharp/QuotationTranslator.fs b/src/fsharp/QuotationTranslator.fs
index 9b5e731edac..52514c4699e 100644
--- a/src/fsharp/QuotationTranslator.fs
+++ b/src/fsharp/QuotationTranslator.fs
@@ -417,7 +417,7 @@ and private ConvExprCore cenv (env : QuotationTranslationEnv) (expr: Expr) : QP.
         | TOp.Tuple tupInfo,tyargs,_ -> 
             let tyR = ConvType cenv env m (mkAnyTupledTy g tupInfo tyargs)
             let argsR = ConvExprs cenv env args
-            QP.mkTuple(tyR,argsR) // TODO: propagate to quotations
+            QP.mkTuple(tyR,argsR)
 
         | TOp.Recd (_,tcref),_,_  -> 
             let rgtypR = ConvTyconRef cenv tcref m
diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs
index 3445857054c..8cef1726ec9 100644
--- a/src/fsharp/TastOps.fs
+++ b/src/fsharp/TastOps.fs
@@ -759,7 +759,7 @@ let evalAnonInfoIsStruct (anonInfo: AnonRecdTypeInfo) =
 let rec stripTyEqnsAndErase eraseFuncAndTuple (g:TcGlobals) ty =
     let ty = stripTyEqns g ty
     match ty with
-    | TType_app (tcref, args, nullness) ->  // TODO: what happens to this nullness?  Currently it is lost.  Noted in RFC
+    | TType_app (tcref, args, nullness) ->
         let tycon = tcref.Deref
         if tycon.IsErased  then
             let reducedTy = reduceTyconMeasureableOrProvided g tycon args
@@ -819,7 +819,7 @@ let isMeasureTy    g ty = ty |> stripTyEqns g |> (function TType_measure _ -> tr
 
 let isProvenUnionCaseTy ty = match ty with TType_ucase _ -> true | _ -> false
 
-let mkAppTy tcref tyargs = TType_app(tcref, tyargs, KnownWithoutNull) // TODO
+let mkAppTy tcref tyargs = TType_app(tcref, tyargs, KnownWithoutNull) // TODO NULLNESS - check various callers
 let mkProvenUnionCaseTy ucref tyargs = TType_ucase(ucref, tyargs)
 let isAppTy   g ty = ty |> stripTyEqns g |> (function TType_app _ -> true | _ -> false) 
 let tryAppTy g ty = ty |> stripTyEqns g |> (function TType_app(tcref, tinst, _) -> ValueSome (tcref, tinst) | _ -> ValueNone) 
@@ -1055,7 +1055,7 @@ let rec getErasedTypes g ty =
         getErasedTypes g rty
     | TType_var (tp, nullness) -> 
         match nullness.Evaluate() with
-        | NullnessInfo.WithNull -> [ty] // with-null annotations can't be tested at runtime (TODO: for value types Nullable<_> they can be)
+        | NullnessInfo.WithNull -> [ty] // with-null annotations can't be tested at runtime (TODO NULLNESS: for value types Nullable<_> they can be)
         | _ -> if tp.IsErased then [ty] else []
     | TType_app (_, b, nullness) ->
         match nullness.Evaluate() with
@@ -2385,7 +2385,7 @@ let generalizeTyconRef (g:TcGlobals) tcref =
 
 let generalizedTyOfTyconRef (g:TcGlobals) tcref = 
     let tinst = generalTyconRefInst tcref
-    TType_app(tcref, tinst, g.knownWithoutNull) // TODO: check me
+    TType_app(tcref, tinst, g.knownWithoutNull)
 
 let isTTyparSupportsStaticMethod tpc = 
     match tpc with 
diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs
index 39433a89f7f..64a81cdcc4c 100755
--- a/src/fsharp/TastPickle.fs
+++ b/src/fsharp/TastPickle.fs
@@ -654,7 +654,12 @@ let p_nleref x st = p_int (encode_nleref st.occus st.ostrings st.onlerefs st.osc
 
 // Simple types are types like "int", represented as TType(Ref_nonlocal(...,"int"),[]). 
 // A huge number of these occur in pickled F# data, so make them unique. 
-let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], KnownAmbivalentToNull) // TODO should simpletyps hold obvlious or non-null etc.? 
+//
+// TODO NULLNESS - the simpletyp table now holds KnownAmbivalentToNull by default, is this the right default?
+// For old assemblies it is, if we give those assemblies the ambivalent interpretation.
+// For new asemblies compiled with null-checking on it isn't, if the default is to give
+// those the KnownWithoutNull interpretation by default.
+let decode_simpletyp st _ccuTab _stringTab nlerefTab a = TType_app(ERefNonLocal (lookup_nleref st nlerefTab a), [], KnownAmbivalentToNull)
 let lookup_simpletyp st simpleTyTab x = lookup_uniq st simpleTyTab x
 let u_encoded_simpletyp st = u_int  st
 let u_encoded_anoninfo st = u_int  st
diff --git a/src/fsharp/fsi/console.fs b/src/fsharp/fsi/console.fs
index 50df9903692..620798784cb 100644
--- a/src/fsharp/fsi/console.fs
+++ b/src/fsharp/fsi/console.fs
@@ -54,17 +54,17 @@ type internal History() =
 
     member x.Clear() = list.Clear(); current <- -1
 
-    member x.Add (line: string?) = // TODO: explicit type annotation shouldn't be needed
+    member x.Add (line: string?) = // TODO NULLNESS: explicit type annotation shouldn't be needed
         match line with 
         | null | "" -> ()
         | _ ->
-            list.Add(nonNull line)  // TODO: explicit instantiation shouldn't be needed
+            list.Add(nonNull line)  // TODO NULLNESS: explicit instantiation shouldn't be needed
 
-    member x.AddLast (line: string?) =  // TODO: explicit type annotation shouldn't be needed
+    member x.AddLast (line: string?) =  // TODO NULLNESS: explicit type annotation shouldn't be needed
         match line with 
         | null | "" -> ()
         | _ ->
-            list.Add(nonNull line) // TODO: explicit instantiation shouldn't be needed
+            list.Add(nonNull line) // TODO NULLNESS: explicit instantiation shouldn't be needed
             current <- list.Count
 
     member x.Previous() = 
diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs
index a2576144028..22ceb8d9b84 100644
--- a/src/fsharp/tast.fs
+++ b/src/fsharp/tast.fs
@@ -5380,7 +5380,7 @@ let KnownWithoutNull = Nullness.Known NullnessInfo.WithoutNull
 
 let mkTyparTy (tp:Typar) = 
     match tp.Kind with 
-    | TyparKind.Type -> tp.AsType KnownWithoutNull // TODO: this is by no means always right!?
+    | TyparKind.Type -> tp.AsType KnownWithoutNull // TODO NULLNESS: check various callers
     | TyparKind.Measure -> TType_measure (Measure.Var tp)
 
 let copyTypar (tp: Typar) = 
@@ -5433,16 +5433,16 @@ let combineNullness (nullnessOrig: Nullness) (nullnessNew: Nullness) =
 let tryAddNullnessToTy nullnessNew (ty:TType) = 
     match ty with
     | TType_var (tp, nullnessOrig) -> 
-        // TODO: make this avoid allocation if no change
+        // TODO NULLNESS: make this avoid allocation if no change
         Some (TType_var (tp, combineNullness nullnessOrig nullnessNew))
     | TType_app (tcr, tinst, nullnessOrig) -> 
-        // TODO: make this avoid allocation if no change
+        // TODO NULLNESS: make this avoid allocation if no change
         Some (TType_app (tcr, tinst, combineNullness nullnessOrig nullnessNew))
-    | TType_ucase _ -> None // TODO
-    | TType_tuple _ -> None // TODO
-    | TType_anon _ -> None // TODO
+    | TType_ucase _ -> None // TODO NULLNESS
+    | TType_tuple _ -> None // TODO NULLNESS
+    | TType_anon _ -> None // TODO NULLNESS
     | TType_fun (d, r, nullnessOrig) ->
-        // TODO: make this avoid allocation if no change
+        // TODO NULLNESS: make this avoid allocation if no change
         Some (TType_fun (d, r, combineNullness nullnessOrig nullnessNew))
     | TType_forall _ -> None
     | TType_measure _ -> None
@@ -5455,9 +5455,9 @@ let addNullnessToTy (nullness: Nullness) (ty:TType) =
     | TType_var (tp, nullnessOrig) -> TType_var (tp, combineNullness nullnessOrig nullness)
     | TType_app (tcr, tinst, nullnessOrig) -> TType_app (tcr, tinst, combineNullness nullnessOrig nullness)
     | TType_fun (d, r, nullnessOrig) -> TType_fun (d, r, combineNullness nullnessOrig nullness)
-    //| TType_ucase _ -> None // TODO
-    //| TType_tuple _ -> None // TODO
-    //| TType_anon _ -> None // TODO
+    //| TType_ucase _ -> None // TODO NULLNESS
+    //| TType_tuple _ -> None // TODOTODO NULLNESS
+    //| TType_anon _ -> None // TODO NULLNESS
     | _ -> ty
 
 let rec stripTyparEqnsAux nullness0 canShortcut ty = 

From ad6e3fabf51ff6d8d82f615b343e0c306198bf56 Mon Sep 17 00:00:00 2001
From: Don Syme 
Date: Mon, 12 Nov 2018 17:03:19 +0000
Subject: [PATCH 020/137] extern types allow nulls, obj never gives warnings

---
 src/absil/ilread.fs                           | 12 ++++--
 src/absil/ilsupp.fs                           |  4 ++
 src/absil/ilwritepdb.fs                       | 14 ++-----
 src/fsharp/ConstraintSolver.fs                |  9 +++--
 src/fsharp/ErrorLogger.fs                     |  4 ++
 .../FSharp.Compiler.Private.fsproj            |  1 +
 src/fsharp/import.fs                          | 37 +++++++++++++++----
 src/fsharp/lib.fs                             |  4 ++
 src/fsharp/pars.fsy                           |  3 ++
 9 files changed, 63 insertions(+), 25 deletions(-)

diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs
index b08da89249f..7e863e7cae4 100644
--- a/src/absil/ilread.fs
+++ b/src/absil/ilread.fs
@@ -212,7 +212,11 @@ module MemoryMapping =
                                      int _flProtect, 
                                      int _dwMaximumSizeLow, 
                                      int _dwMaximumSizeHigh, 
+#if BUILDING_WITH_LKG
                                      string _lpName) 
+#else
+                                     string? _lpName) 
+#endif
 
     []
     extern ADDR MapViewOfFile (HANDLE _hFileMappingObject, 
@@ -891,14 +895,14 @@ type GenericParamsIdx = GenericParamsIdx of int * TypeOrMethodDefTag * int
 
 let mkCacheInt32 lowMem _inbase _nm _sz  =
     if lowMem then (fun f x -> f x) else
-    let cache = ref null 
+    let cache = ref Unchecked.defaultof<_> 
     let count = ref 0
 #if STATISTICS
     addReport (fun oc -> if !count <> 0 then oc.WriteLine ((_inbase + string !count + " "+ _nm + " cache hits")  : string))
 #endif
     fun f (idx:int32) ->
         let cache = 
-            match !cache with
+            match box !cache with
             | null -> cache :=  new Dictionary(11)
             | _ -> ()
             !cache
@@ -914,14 +918,14 @@ let mkCacheInt32 lowMem _inbase _nm _sz  =
 
 let mkCacheGeneric lowMem _inbase _nm _sz  =
     if lowMem then (fun f x -> f x) else
-    let cache = ref null 
+    let cache = ref Unchecked.defaultof<_>
     let count = ref 0
 #if STATISTICS
     addReport (fun oc -> if !count <> 0 then oc.WriteLine ((_inbase + string !count + " " + _nm + " cache hits") : string))
 #endif
     fun f (idx :'T) ->
         let cache = 
-            match !cache with
+            match box !cache with
             | null -> cache := new Dictionary<_, _>(11 (* sz:int *) ) 
             | _ -> ()
             !cache
diff --git a/src/absil/ilsupp.fs b/src/absil/ilsupp.fs
index fb4e3a58fdd..82f8b5c22e3 100644
--- a/src/absil/ilsupp.fs
+++ b/src/absil/ilsupp.fs
@@ -960,7 +960,11 @@ type ISymUnmanagedWriter2 =
     abstract GetDebugInfo : iDD : ImageDebugDirectory byref *
                           cData : int * 
                           pcData : int byref *
+#if BUILDING_WITH_LKG
                           []data : byte[] -> unit
+#else
+                          []data : byte[]? -> unit
+#endif
     abstract DefineSequencePoints : document : ISymUnmanagedDocumentWriter *
                                   spCount : int *
                                   []offsets : int [] *
diff --git a/src/absil/ilwritepdb.fs b/src/absil/ilwritepdb.fs
index 4caf952b651..d01f3e8bfab 100644
--- a/src/absil/ilwritepdb.fs
+++ b/src/absil/ilwritepdb.fs
@@ -222,10 +222,7 @@ let getRowCounts tableRowCounts =
 let generatePortablePdb (embedAllSource:bool) (embedSourceList:string list) (sourceLink:string) showTimes (info:PdbData) isDeterministic =
     sortMethods showTimes info
     let externalRowCounts = getRowCounts info.TableRowCounts
-    let docs = 
-        match info.Documents with
-        | null -> Array.empty
-        | _ -> info.Documents
+    let docs = info.Documents
 
     let metadata = MetadataBuilder()
     let serializeDocumentName (name:string) =
@@ -323,12 +320,9 @@ let generatePortablePdb (embedAllSource:bool) (embedSourceList:string list) (sou
     info.Methods |> Array.iter (fun minfo ->
         let docHandle, sequencePointBlob =
             let sps =
-                match minfo.SequencePoints with
-                | null -> Array.empty
-                | _ ->
-                    match minfo.Range with
-                    | None -> Array.empty
-                    | Some (_,_) -> minfo.SequencePoints
+                match minfo.Range with
+                | None -> Array.empty
+                | Some (_,_) -> minfo.SequencePoints
 
             let builder = new BlobBuilder()
             builder.WriteCompressedInteger(minfo.LocalSignatureToken)
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 374bcc51238..f280d58a6d0 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -824,7 +824,8 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1
         // TODO NULLNESS:  this is not sound in contravariant cases etc.
         | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD
         | _ -> 
-            if csenv.g.checkNullness then 
+            // NOTE: we never give nullness warnings for the 'obj' type
+            if csenv.g.checkNullness && not (isObjTy csenv.g ty1) && not (isObjTy csenv.g ty2) then 
                 WarnD(ConstraintSolverNullnessWarningEquivWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) 
             else
                 CompleteD
@@ -854,7 +855,7 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona
         // Allow target of WithNull and actual of WithoutNull
         | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD
         | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> 
-            if csenv.g.checkNullness then 
+            if csenv.g.checkNullness && not (isObjTy csenv.g ty1) && not (isObjTy csenv.g ty2) then 
                 WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) 
             else
                 CompleteD
@@ -1903,7 +1904,7 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio
         | NullnessInfo.AmbivalentToNull -> CompleteD
         | NullnessInfo.WithNull -> CompleteD
         | NullnessInfo.WithoutNull -> 
-            if csenv.g.checkNullness then 
+            if csenv.g.checkNullness && not (isObjTy csenv.g ty) then 
                 WarnD(ConstraintSolverNullnessWarningWithType(denv, ty, n1, m, m2)) 
             else
                 CompleteD
@@ -1923,7 +1924,7 @@ and SolveNullnessNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Op
         | NullnessInfo.AmbivalentToNull -> CompleteD
         | NullnessInfo.WithoutNull -> CompleteD
         | NullnessInfo.WithNull -> 
-            if csenv.g.checkNullness then 
+            if csenv.g.checkNullness && not (isObjTy csenv.g ty) then 
                 WarnD(ConstraintSolverNonNullnessWarningWithType(denv, ty, n1, m, m2)) 
             else
                 CompleteD
diff --git a/src/fsharp/ErrorLogger.fs b/src/fsharp/ErrorLogger.fs
index b7a0d7a5a8d..470e07f49cd 100755
--- a/src/fsharp/ErrorLogger.fs
+++ b/src/fsharp/ErrorLogger.fs
@@ -625,7 +625,11 @@ let NewlineifyErrorString (message:string) = message.Replace(stringThatIsAProxyF
 /// fixes given string by replacing all control chars with spaces.
 /// NOTE: newlines are recognized and replaced with stringThatIsAProxyForANewlineInFlatErrors (ASCII 29, the 'group separator'), 
 /// which is decoded by the IDE with 'NewlineifyErrorString' back into newlines, so that multi-line errors can be displayed in QuickInfo
+#if BUILDING_WITH_LKG
 let NormalizeErrorString (text : string) =
+#else
+let NormalizeErrorString (text : string?) =
+#endif
     if isNull text then nullArg "text"
     let text = text.Trim()
 
diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index 17f5d157410..d064642ef68 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -19,6 +19,7 @@
     0x06800000
     $(OtherFlags) /warnon:1182
     $(OtherFlags) --maxerrors:10000
+    $(OtherFlags) --checknulls
   
   
   
diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs
index 8d3a32b2720..fa780e8248b 100644
--- a/src/fsharp/import.fs
+++ b/src/fsharp/import.fs
@@ -152,6 +152,18 @@ let CanImportILTypeRef (env:ImportMap) m (tref:ILTypeRef) =
 let ImportTyconRefApp (env:ImportMap) tcref tyargs nullness = 
     env.g.improveType tcref tyargs nullness
 
+let ImportNullness (g: TcGlobals) =
+    if g.langFeatureNullness && g.assumeNullOnImport then
+        KnownWithNull
+    else
+        KnownAmbivalentToNull
+
+let ImportNullnessForTyconRef (g: TcGlobals) (m: range) (tcref: TyconRef) =
+    if g.langFeatureNullness && g.assumeNullOnImport && TyconRefNullIsExtraValueOld g m tcref then
+        KnownWithNull
+    else
+        KnownAmbivalentToNull
+
 /// Import an IL type as an F# type.
 let rec ImportILType (env:ImportMap) m tinst ty =  
     match ty with
@@ -161,27 +173,38 @@ let rec ImportILType (env:ImportMap) m tinst ty =
     | ILType.Array(bounds,ty) -> 
         let n = bounds.Rank
         let elementType = ImportILType env m tinst ty
-        let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport then KnownWithNull else KnownAmbivalentToNull
+        let nullness = ImportNullness env.g
         mkArrayTy env.g n nullness elementType m
 
     | ILType.Boxed  tspec | ILType.Value tspec ->
         let tcref = ImportILTypeRef env m tspec.TypeRef 
         let inst = tspec.GenericArgs |> List.map (ImportILType env m tinst) 
-        let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownWithNull else KnownAmbivalentToNull
+        let nullness = ImportNullnessForTyconRef env.g m tcref
         ImportTyconRefApp env tcref inst nullness
 
     | ILType.Modified(_,tref,ILType.Byref ty) when tref.Name = "System.Runtime.InteropServices.InAttribute" -> mkInByrefTy env.g (ImportILType env m tinst ty)
+
     | ILType.Byref ty -> mkByrefTy env.g (ImportILType env m tinst ty)
+
     | ILType.Ptr ILType.Void  when env.g.voidptr_tcr.CanDeref -> mkVoidPtrTy env.g
+
     | ILType.Ptr ty  -> mkNativePtrTy env.g (ImportILType env m tinst ty)
+
     | ILType.FunctionPointer _ -> env.g.nativeint_ty (* failwith "cannot import this kind of type (ptr, fptr)" *)
+
     | ILType.Modified(_,_,ty) -> 
          // All custom modifiers are ignored
          ImportILType env m tinst ty
+
     | ILType.TypeVar u16 -> 
-         try List.item (int u16) tinst
-         with _ -> 
-              error(Error(FSComp.SR.impNotEnoughTypeParamsInScopeWhileImporting(),m))
+        let ty = 
+            try 
+                List.item (int u16) tinst
+            with _ -> 
+                error(Error(FSComp.SR.impNotEnoughTypeParamsInScopeWhileImporting(),m))
+        let nullness = ImportNullness env.g
+        let tyWithNullness = addNullnessToTy nullness ty
+        tyWithNullness
 
 let rec CanImportILType (env:ImportMap) m ty =  
     match ty with
@@ -258,7 +281,7 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st:
     let g = env.g
     if st.PUntaint((fun st -> st.IsArray),m) then 
         let elemTy = (ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()),m)))
-        let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport then KnownWithNull else KnownAmbivalentToNull
+        let nullness = ImportNullness env.g
         mkArrayTy g (st.PUntaint((fun st -> st.GetArrayRank()),m)) nullness elemTy m
     elif st.PUntaint((fun st -> st.IsByRef),m) then 
         let elemTy = (ImportProvidedType env m (* tinst *) (st.PApply((fun st -> st.GetElementType()),m)))
@@ -316,7 +339,7 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st:
                 else
                     genericArg)
 
-        let nullness = if env.g.langFeatureNullness && env.g.assumeNullOnImport && TyconRefNullIsExtraValueOld env.g m tcref then KnownWithNull else KnownAmbivalentToNull
+        let nullness = ImportNullnessForTyconRef env.g m tcref
 
         ImportTyconRefApp env tcref genericArgs nullness
 
diff --git a/src/fsharp/lib.fs b/src/fsharp/lib.fs
index cc713e73bb3..9b230be14a4 100755
--- a/src/fsharp/lib.fs
+++ b/src/fsharp/lib.fs
@@ -462,7 +462,11 @@ module internal AsyncUtil =
                         // Continuations that Async.FromContinuations provide do QUWI/SynchContext.Post,
                         // so the order is not overly relevant but still.                        
                         List.rev savedConts)
+#if BUILDING_WITH_LKG
             let postOrQueue (sc:SynchronizationContext,cont) =
+#else
+            let postOrQueue (sc:SynchronizationContext?,cont) =
+#endif
                 match sc with
                 |   null -> ThreadPool.QueueUserWorkItem(fun _ -> cont res) |> ignore
                 |   sc -> sc.Post((fun _ -> cont res), state=null)
diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy
index 155805e938e..9a30b9bc9fc 100644
--- a/src/fsharp/pars.fsy
+++ b/src/fsharp/pars.fsy
@@ -2543,6 +2543,9 @@ cType:
      { let m = lhs parseState 
        SynType.App(SynType.LongIdent(LongIdentWithDots([ident("nativeptr",m)],[])),None,[$1],[],None,true,m) } 
 
+  | cType QMARK
+    { SynType.WithNull($1, false, lhs parseState) }
+
   | cType AMP  
      { let m = lhs parseState 
        SynType.App(SynType.LongIdent(LongIdentWithDots([ident("byref",m)],[])),None,[$1],[],None,true,m) } 

From 4c1bcbb47eb0af7c922e9fa7669731decc49bb21 Mon Sep 17 00:00:00 2001
From: Don Syme 
Date: Tue, 13 Nov 2018 20:26:57 +0000
Subject: [PATCH 021/137] use null checking on compiler

---
 src/absil/illib.fs                            |   1 -
 src/absil/ilreflect.fs                        |  45 +--
 src/absil/ilsupp.fs                           |  13 +-
 src/fsharp/AccessibilityLogic.fs              |   5 +-
 src/fsharp/CompileOps.fs                      |  14 +-
 src/fsharp/CompileOps.fsi                     |   2 +-
 src/fsharp/ConstraintSolver.fs                |  58 +++-
 src/fsharp/ExtensionTyping.fs                 | 292 ++++++++++++------
 src/fsharp/ExtensionTyping.fsi                |  49 +--
 src/fsharp/FSharp.Build/Fsc.fs                |   4 +-
 src/fsharp/FSharp.Build/WriteCodeFragment.fs  |   6 +-
 .../FSharp.Compiler.Private.fsproj            |   2 +-
 .../FSharp.Core/fslib-extra-pervasives.fs     |   2 +-
 src/fsharp/FSharp.Core/prim-types.fs          |  21 +-
 src/fsharp/FSharp.Core/prim-types.fsi         |  12 +
 src/fsharp/InfoReader.fs                      |  16 +-
 src/fsharp/LegacyHostedCompilerForTesting.fs  |   7 +-
 src/fsharp/MethodCalls.fs                     |   8 +-
 src/fsharp/NameResolution.fs                  |   2 +-
 src/fsharp/NicePrint.fs                       |   2 +-
 src/fsharp/TastOps.fs                         |   6 +-
 src/fsharp/TastOps.fsi                        |   4 +
 src/fsharp/TcGlobals.fs                       |  18 +-
 src/fsharp/TypeChecker.fs                     |  10 +-
 src/fsharp/ast.fs                             |  12 +
 src/fsharp/fsi/console.fs                     |   4 +-
 src/fsharp/fsi/fsi.fs                         |  17 +-
 src/fsharp/import.fs                          |  14 +-
 src/fsharp/import.fsi                         |   2 +-
 src/fsharp/infos.fs                           |  30 +-
 src/fsharp/lex.fsl                            |   4 +-
 src/fsharp/pars.fsy                           |   2 +-
 src/fsharp/service/QuickParse.fs              |  23 +-
 src/fsharp/service/QuickParse.fsi             |   6 +-
 src/fsharp/service/ServiceDeclarationLists.fs |   2 +-
 .../service/ServiceParamInfoLocations.fs      |   5 +-
 src/fsharp/service/service.fs                 |   8 +-
 src/fsharp/tainted.fs                         |  18 +-
 src/fsharp/tainted.fsi                        |   4 +-
 src/fsharp/tast.fs                            |  64 ++--
 src/utils/CompilerLocationUtils.fs            |   2 +-
 .../ProvidedTypes/ProvidedTypes.fs            |   1 -
 tests/fsharp/core/nullness/test.fsx           |  17 +-
 tests/service/data/TestTP/ProvidedTypes.fs    |  14 +-
 vsintegration/src/FSharp.VS.FSI/sessions.fs   |   6 +-
 .../ProvidedTypes.fs                          |  14 +-
 46 files changed, 562 insertions(+), 306 deletions(-)

diff --git a/src/absil/illib.fs b/src/absil/illib.fs
index bee45a1254a..f1f5e6cc658 100644
--- a/src/absil/illib.fs
+++ b/src/absil/illib.fs
@@ -38,7 +38,6 @@ let inline isSingleton l =
     | _ -> false
 
 let inline isNonNull x = not (isNull x)
-let inline nonNull msg x = if isNull x then failwith ("null: " + msg) else x
 let inline (===) x y = LanguagePrimitives.PhysicalEquality x y
 
 //---------------------------------------------------------------------
diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs
index 06b762d41a7..7e68ce3338a 100644
--- a/src/absil/ilreflect.fs
+++ b/src/absil/ilreflect.fs
@@ -398,7 +398,11 @@ let envBindTypeRef emEnv (tref:ILTypeRef) (typT: System.Type?, typB, typeDef)=
 #endif
     match typT with 
     | null -> failwithf "binding null type in envBindTypeRef: %s\n" tref.Name;
-    | _ -> {emEnv with emTypMap = Zmap.add tref (typT, typB, typeDef, None) emEnv.emTypMap}
+    | _ ->
+#if !BUILDING_WITH_LKG
+        let typT = nonNull typT // TODO NULLNESS
+#endif
+        {emEnv with emTypMap = Zmap.add tref (typT, typB, typeDef, None) emEnv.emTypMap}
 
 let envUpdateCreatedTypeRef emEnv (tref:ILTypeRef) =
     // The tref's TypeBuilder has been created, so we have a Type proper.
@@ -427,14 +431,10 @@ let envUpdateCreatedTypeRef emEnv (tref:ILTypeRef) =
         emEnv
 
 let convTypeRef cenv emEnv preferCreated (tref:ILTypeRef) = 
-    let res = 
-        match Zmap.tryFind tref emEnv.emTypMap with
-        | Some (_typT, _typB, _typeDef, Some createdTy) when preferCreated -> createdTy 
-        | Some (typT, _typB, _typeDef, _) -> typT       
-        | None -> convTypeRefAux cenv tref 
-    match res with 
-    | null -> error(Error(FSComp.SR.itemNotFoundDuringDynamicCodeGen ("type", tref.QualifiedName, tref.Scope.QualifiedName), range0))
-    | _ -> res
+    match Zmap.tryFind tref emEnv.emTypMap with
+    | Some (_typT, _typB, _typeDef, Some createdTy) when preferCreated -> createdTy 
+    | Some (typT, _typB, _typeDef, _) -> typT       
+    | None -> convTypeRefAux cenv tref 
   
 let envBindConsRef emEnv (mref:ILMethodRef) consB = 
     {emEnv with emConsMap = Zmap.add mref consB emEnv.emConsMap}
@@ -772,7 +772,7 @@ let queryableTypeGetMethodBySearch cenv emEnv parentT (mref:ILMethodRef) =
             failwithf "convMethodRef: could not bind to method '%A' of type '%s'" (System.String.Join(", ", methNames)) parentT.AssemblyQualifiedName
         | Some methInfo -> methInfo (* return MethodInfo for (generic) type's (generic) method *)
           
-let queryableTypeGetMethod cenv emEnv parentT (mref:ILMethodRef) =
+let queryableTypeGetMethod cenv emEnv parentT (mref:ILMethodRef) : MethodInfo =
     assert(not (typeIsNotQueryable(parentT)))
     if mref.GenericArity = 0 then 
         let tyargTs = getGenericArgumentsOfType parentT      
@@ -802,13 +802,17 @@ let queryableTypeGetMethod cenv emEnv parentT (mref:ILMethodRef) =
     else 
         queryableTypeGetMethodBySearch cenv emEnv parentT mref
 
+#if BUILDING_WITH_LKG
 let nonQueryableTypeGetMethod (parentTI:Type) (methInfo : MethodInfo) : MethodInfo = 
+#else
+let nonQueryableTypeGetMethod (parentTI:Type) (methInfo : MethodInfo) : MethodInfo? = 
+#endif
     if (parentTI.IsGenericType &&
         not (equalTypes parentTI (getTypeConstructor parentTI))) 
     then TypeBuilder.GetMethod(parentTI, methInfo )
     else methInfo 
 
-let convMethodRef cenv emEnv (parentTI:Type) (mref:ILMethodRef) =
+let convMethodRef cenv emEnv (parentTI:Type) (mref:ILMethodRef) : MethodInfo =
     let parent = mref.DeclaringTypeRef
     let res = 
         if isEmittedTypeRef emEnv parent then
@@ -826,7 +830,11 @@ let convMethodRef cenv emEnv (parentTI:Type) (mref:ILMethodRef) =
                 queryableTypeGetMethod cenv emEnv parentTI mref 
     match res with 
     | null -> error(Error(FSComp.SR.itemNotFoundInTypeDuringDynamicCodeGen ("method", mref.Name, parentTI.FullName, parentTI.Assembly.FullName), range0))
-    | _ -> res
+#if BUILDING_WITH_LKG
+    | _ -> res 
+#else
+    | NullChecked res -> res 
+#endif
 
 //----------------------------------------------------------------------------
 // convMethodSpec
@@ -848,11 +856,7 @@ let convMethodSpec cenv emEnv (mspec:ILMethodSpec) =
 // - QueryableTypeGetConstructors: get a constructor on a non-TypeBuilder type
 //----------------------------------------------------------------------------
 
-#if BUILDING_WITH_LKG
 let queryableTypeGetConstructor cenv emEnv (parentT:Type) (mref:ILMethodRef) : ConstructorInfo =
-#else
-let queryableTypeGetConstructor cenv emEnv (parentT:Type) (mref:ILMethodRef) : ConstructorInfo? =
-#endif
     let tyargTs  = getGenericArgumentsOfType parentT
     let reqArgTs  = 
         let emEnv = envPushTyvars emEnv tyargTs
@@ -891,7 +895,11 @@ let convConstructorSpec cenv emEnv (mspec:ILMethodSpec) =
                 queryableTypeGetConstructor cenv emEnv parentTI mref 
     match res with 
     | null -> error(Error(FSComp.SR.itemNotFoundInTypeDuringDynamicCodeGen ("constructor", "", parentTI.FullName, parentTI.Assembly.FullName), range0))
+#if BUILDING_WITH_LKG
     | _ -> res
+#else
+    | _ -> nonNull res // TODO NULLNESS
+#endif
 
 //----------------------------------------------------------------------------
 // emitLabelMark
@@ -1435,10 +1443,7 @@ let emitMethodBody cenv modB emEnv ilG _name (mbody: ILLazyMethodBody) =
     | MethodBody.NotAvailable     -> failwith "emitMethodBody: metadata only"
 
 let convCustomAttr cenv emEnv (cattr: ILAttribute) =
-    let methInfo = 
-       match convConstructorSpec cenv emEnv cattr.Method with 
-       | null -> failwithf "convCustomAttr: %+A" cattr.Method
-       | res -> res
+    let methInfo = convConstructorSpec cenv emEnv cattr.Method
     let data = getCustomAttrData cenv.ilg cattr
     (methInfo, data)
 
diff --git a/src/absil/ilsupp.fs b/src/absil/ilsupp.fs
index 82f8b5c22e3..60114c73f08 100644
--- a/src/absil/ilsupp.fs
+++ b/src/absil/ilsupp.fs
@@ -1178,14 +1178,11 @@ let pdbReadOpen (moduleName:string) (path:string) :  PdbReader =
 #if ENABLE_MONO_SUPPORT
         // ISymWrapper.dll is not available as a compile-time dependency for the cross-platform compiler, since it is Windows-only 
         // Access it via reflection instead.System.Diagnostics.SymbolStore.SymBinder 
-        try  
-            let isym = System.Reflection.Assembly.Load("ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a") 
-            let symbolBinder = isym.CreateInstance("System.Diagnostics.SymbolStore.SymBinder") 
-            let symbolBinderTy = symbolBinder.GetType() 
-            let reader = symbolBinderTy.InvokeMember("GetReader",BindingFlags.Public ||| BindingFlags.InvokeMethod ||| BindingFlags.Instance,  null,symbolBinder,[| box importerPtr; box moduleName; box path |]) 
-            { symReader = reader :?> ISymbolReader } 
-        with _ ->  
-            { symReader = null } 
+        let isym = System.Reflection.Assembly.Load("ISymWrapper, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a") 
+        let symbolBinder = isym.CreateInstance("System.Diagnostics.SymbolStore.SymBinder") 
+        let symbolBinderTy = symbolBinder.GetType() 
+        let reader = symbolBinderTy.InvokeMember("GetReader",BindingFlags.Public ||| BindingFlags.InvokeMethod ||| BindingFlags.Instance,  null,symbolBinder,[| box importerPtr; box moduleName; box path |]) 
+        { symReader = reader :?> ISymbolReader } 
 #else 
         let symbolBinder = new System.Diagnostics.SymbolStore.SymBinder()
         { symReader = symbolBinder.GetReader(importerPtr, moduleName, path) }
diff --git a/src/fsharp/AccessibilityLogic.fs b/src/fsharp/AccessibilityLogic.fs
index 24a516e138a..551d3c324f6 100644
--- a/src/fsharp/AccessibilityLogic.fs
+++ b/src/fsharp/AccessibilityLogic.fs
@@ -329,10 +329,11 @@ let IsPropInfoAccessible g amap m ad = function
     | ProvidedProp (amap, tppi, m) as pp-> 
         let access = 
             let a = tppi.PUntaint((fun ppi -> 
-                let tryGetILAccessForProvidedMethodBase (mi : ProvidedMethodBase) = 
+                let tryGetILAccessForProvidedMethodBase (mi : ProvidedMethodInfo?) = 
                     match mi with
                     | null -> None
-                    | mi -> Some(ComputeILAccess mi.IsPublic mi.IsFamily mi.IsFamilyOrAssembly mi.IsFamilyAndAssembly)
+                    | NullChecked mi -> Some(ComputeILAccess mi.IsPublic mi.IsFamily mi.IsFamilyOrAssembly mi.IsFamilyAndAssembly)
+
                 match tryGetILAccessForProvidedMethodBase(ppi.GetGetMethod()) with
                 | None -> tryGetILAccessForProvidedMethodBase(ppi.GetSetMethod())
                 | x -> x), m)
diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index b101ee7525c..3217d282c1f 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -2340,7 +2340,7 @@ type TcConfigBuilder =
       mutable win32manifest : string
       mutable includewin32manifest : bool
       mutable linkResources : string list
-      mutable legacyReferenceResolver: ReferenceResolver.Resolver 
+      mutable legacyReferenceResolver: ReferenceResolver.Resolver
 
       mutable showFullPaths : bool
       mutable errorStyle : ErrorStyle
@@ -2410,7 +2410,7 @@ type TcConfigBuilder =
       mutable internalTestSpanStackReferring : bool
       }
 
-    static member Initial =
+    static member Initial(legacyReferenceResolver) =
         {
 #if COMPILER_SERVICE_ASSUMES_DOTNETCORE_COMPILATION
           primaryAssembly = PrimaryAssembly.System_Runtime // defaut value, can be overridden using the command line switch
@@ -2506,7 +2506,7 @@ type TcConfigBuilder =
           win32manifest = ""
           includewin32manifest = true
           linkResources = []
-          legacyReferenceResolver = null
+          legacyReferenceResolver = legacyReferenceResolver
           showFullPaths = false
           errorStyle = ErrorStyle.DefaultErrors
 
@@ -2558,7 +2558,7 @@ type TcConfigBuilder =
         if (String.IsNullOrEmpty(defaultFSharpBinariesDir)) then
             failwith "Expected a valid defaultFSharpBinariesDir"
 
-        { TcConfigBuilder.Initial with 
+        { TcConfigBuilder.Initial(legacyReferenceResolver) with 
             implicitIncludeDir = implicitIncludeDir
             defaultFSharpBinariesDir = defaultFSharpBinariesDir
             reduceMemoryUsage = reduceMemoryUsage
@@ -4150,7 +4150,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
 
 
 #if !NO_EXTENSIONTYPING
-    member tcImports.GetProvidedAssemblyInfo(ctok, m, assembly: Tainted) = 
+    member tcImports.GetProvidedAssemblyInfo(ctok, m, assembly: Tainted< ProvidedAssembly? >) = 
         let anameOpt = assembly.PUntaint((fun assembly -> match assembly with null -> None | a -> Some (a.GetName())), m)
         match anameOpt with 
         | None -> false, None
@@ -4389,7 +4389,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
 
     member tcImports.ImportTypeProviderExtensions 
                (ctok, tcConfig:TcConfig, 
-                fileNameOfRuntimeAssembly, 
+                fileNameOfRuntimeAssembly:string, 
                 ilScopeRefOfRuntimeAssembly, 
                 runtimeAssemblyAttributes:ILAttribute list, 
                 entityToInjectInto, invalidateCcu:Event<_>, m) = 
@@ -4402,7 +4402,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
             runtimeAssemblyAttributes 
             |> List.choose (TryDecodeTypeProviderAssemblyAttr (defaultArg ilGlobalsOpt EcmaMscorlibILGlobals))
             // If no design-time assembly is specified, use the runtime assembly
-            |> List.map (function null -> fileNameOfRuntimeAssembly | s -> s)
+            |> List.map (function null -> fileNameOfRuntimeAssembly | NullChecked s -> s)
             // For each simple name of a design-time assembly, we take the first matching one in the order they are 
             // specified in the attributes
             |> List.distinctBy (fun s -> try Path.GetFileNameWithoutExtension(s) with _ -> s)
diff --git a/src/fsharp/CompileOps.fsi b/src/fsharp/CompileOps.fsi
index bc7720e7d26..210e8b7058a 100755
--- a/src/fsharp/CompileOps.fsi
+++ b/src/fsharp/CompileOps.fsi
@@ -382,7 +382,7 @@ type TcConfigBuilder =
       mutable internalTestSpanStackReferring : bool
     }
 
-    static member Initial: TcConfigBuilder
+    static member Initial: ReferenceResolver.Resolver -> TcConfigBuilder
 
     static member CreateNew: 
         legacyReferenceResolver: ReferenceResolver.Resolver *
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index f280d58a6d0..4cf2f54a13b 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -53,6 +53,10 @@ open Microsoft.FSharp.Compiler.Tastops
 open Microsoft.FSharp.Compiler.TcGlobals
 open Microsoft.FSharp.Compiler.TypeRelations
 
+#if !NO_EXTENSIONTYPING
+open Microsoft.FSharp.Compiler.ExtensionTyping
+#endif
+
 //-------------------------------------------------------------------------
 // Generate type variables and record them in within the scope of the
 // compilation environment, which currently corresponds to the scope
@@ -895,26 +899,62 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra
            SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullness2
 
     | TType_var (tp1, nullness1), TType_var (tp2, nullness2) when PreferUnifyTypar tp1 tp2 -> 
+        match nullness1.TryEvaluate(), nullness2.TryEvaluate() with
+        // Unifying 'T1? and 'T2? 
+        | ValueSome NullnessInfo.WithNull, ValueSome NullnessInfo.WithNull ->
+            SolveTyparEqualsType csenv ndeep m2 trace sty1 (TType_var (tp2, g.knownWithoutNull)) 
+        //// Unifying 'T1 % and 'T2 % 
+        //| ValueSome NullnessInfo.AmbivalentToNull, ValueSome NullnessInfo.AmbivalentToNull ->
+        //    SolveTyparEqualsType csenv ndeep m2 trace sty1 (TType_var (tp2, g.knownWithoutNull)) 
+        | _ -> 
         SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 ++ (fun () -> 
            let nullnessAfterSolution1 = combineNullness (nullnessOfTy g sty1) nullness1
            SolveNullnessEquiv csenv m2 trace ty1 ty2 nullnessAfterSolution1 nullness2
         )
+
     | TType_var (tp1, nullness1), TType_var (tp2, nullness2) when not csenv.MatchingOnly && PreferUnifyTypar tp2 tp1 ->
-        SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> 
-           let nullnessAfterSolution2 = combineNullness (nullnessOfTy g sty2) nullness2
-           SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullnessAfterSolution2
-        )
+        match nullness1.TryEvaluate(), nullness2.TryEvaluate() with
+        // Unifying 'T1? and 'T2? 
+        | ValueSome NullnessInfo.WithNull, ValueSome NullnessInfo.WithNull ->
+            SolveTyparEqualsType csenv ndeep m2 trace sty2 (TType_var (tp1, g.knownWithoutNull)) 
+        //// Unifying 'T1 % and 'T2 % 
+        //| ValueSome NullnessInfo.AmbivalentToNull, ValueSome NullnessInfo.AmbivalentToNull ->
+        //    SolveTyparEqualsType csenv ndeep m2 trace sty2 (TType_var (tp1, g.knownWithoutNull)) 
+        | _ -> 
+            // Unifying 'T1 ? and 'T2 % 
+            // Unifying 'T1 % and 'T2 ?
+            SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> 
+               let nullnessAfterSolution2 = combineNullness (nullnessOfTy g sty2) nullness2
+               SolveNullnessEquiv csenv m2 trace ty1 ty2 nullness1 nullnessAfterSolution2
+            )
 
     | TType_var (tp1, nullness1), _ when (tp1.Rigidity <> TyparRigidity.Rigid) -> 
+        match nullness1.TryEvaluate(), (nullnessOfTy g sty2).TryEvaluate() with
+        // Unifying 'T1? and 'T2? 
+        | ValueSome NullnessInfo.WithNull, ValueSome NullnessInfo.WithNull ->
+            SolveTyparEqualsType csenv ndeep m2 trace sty1 (replaceNullnessOfTy g.knownWithoutNull sty2) 
+        //// Unifying 'T1 % and 'T2 % 
+        //| ValueSome NullnessInfo.AmbivalentToNull, ValueSome NullnessInfo.AmbivalentToNull ->
+        //    SolveTyparEqualsType csenv ndeep m2 trace sty1 (replaceNullnessOfTy g.knownWithoutNull sty2) 
+        | _ -> 
         SolveTyparEqualsType csenv ndeep m2 trace sty1 ty2 ++ (fun () -> 
            let nullnessAfterSolution1 = combineNullness (nullnessOfTy g sty1) nullness1
            SolveNullnessEquiv csenv m2 trace ty1 ty2 nullnessAfterSolution1 (nullnessOfTy g sty2)
         )
+
     | _, TType_var (tp2, nullness2) when (tp2.Rigidity <> TyparRigidity.Rigid) && not csenv.MatchingOnly ->
-        SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> 
-           let nullnessAfterSolution2 = combineNullness (nullnessOfTy g sty2) nullness2
-           SolveNullnessEquiv csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullnessAfterSolution2
-        )
+        match (nullnessOfTy g sty1).TryEvaluate(), nullness2.TryEvaluate() with
+        // Unifying 'T1? and 'T2? 
+        | ValueSome NullnessInfo.WithNull, ValueSome NullnessInfo.WithNull ->
+            SolveTyparEqualsType csenv ndeep m2 trace sty2 (replaceNullnessOfTy g.knownWithoutNull sty1)
+        //// Unifying 'T1 % and 'T2 % 
+        //| ValueSome NullnessInfo.AmbivalentToNull, ValueSome NullnessInfo.AmbivalentToNull ->
+        //    SolveTyparEqualsType csenv ndeep m2 trace sty2 (replaceNullnessOfTy g.knownWithoutNull sty1)
+        | _ -> 
+            SolveTyparEqualsType csenv ndeep m2 trace sty2 ty1 ++ (fun () -> 
+               let nullnessAfterSolution2 = combineNullness (nullnessOfTy g sty2) nullness2
+               SolveNullnessEquiv csenv m2 trace ty1 ty2 (nullnessOfTy g sty1) nullnessAfterSolution2
+            )
 
     // Catch float<_>=float<1>, float32<_>=float32<1> and decimal<_>=decimal<1> 
     | (_, TType_app (tc2, [ms2], nullness2)) when (tc2.IsMeasureableReprTycon && typeEquiv csenv.g sty1 (reduceTyconRefMeasureableOrProvided csenv.g tc2 [ms2])) ->
@@ -1598,7 +1638,7 @@ and MemberConstraintSolutionOfMethInfo css m minfo minst =
         match callMethInfoOpt, callExpr with 
         | Some methInfo, Expr.Op(TOp.ILCall(_useCallVirt, _isProtected, _, _isNewObj, NormalValUse, _isProp, _noTailCall, ilMethRef, _actualTypeInst, actualMethInst, _ilReturnTys), [], args, m)
              when (args, (objArgVars@allArgVars)) ||> List.lengthsEqAndForall2 (fun a b -> match a with Expr.Val(v, _, _) -> valEq v.Deref b | _ -> false) ->
-                let declaringType = Import.ImportProvidedType amap m (methInfo.PApply((fun x -> x.DeclaringType), m))
+                let declaringType = Import.ImportProvidedType amap m (methInfo.PApply((fun x -> nonNull x.DeclaringType), m))
                 if isILAppTy g declaringType then 
                     let extOpt = None  // EXTENSION METHODS FROM TYPE PROVIDERS: for extension methods coming from the type providers we would have something here.
                     ILMethSln(declaringType, extOpt, ilMethRef, actualMethInst)
diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs
index 0d86ca58a05..de1f73f2b39 100755
--- a/src/fsharp/ExtensionTyping.fs
+++ b/src/fsharp/ExtensionTyping.fs
@@ -239,7 +239,7 @@ module internal ExtensionTyping =
     let unmarshal (t:Tainted<_>) = t.PUntaintNoFailure id
 
     /// Try to access a member on a provided type, catching and reporting errors
-    let TryTypeMember(st:Tainted<_>, fullName, memberName, m, recover, f) =
+    let TryTypeMember<'T,'U>(st:Tainted<'T>, fullName, memberName, m, recover, f: 'T -> 'U) =
         try
             st.PApply (f, m)
         with :? TypeProviderError as tpe -> 
@@ -248,16 +248,11 @@ module internal ExtensionTyping =
 
     /// Try to access a member on a provided type, where the result is an array of values, catching and reporting errors
     let TryTypeMemberArray (st:Tainted<_>, fullName, memberName, m, f) =
-        let result =
-            try
-                st.PApplyArray(f, memberName, m)
-            with :? TypeProviderError as tpe ->
-                tpe.Iter (fun e -> error(Error(FSComp.SR.etUnexpectedExceptionFromProvidedTypeMember(fullName, memberName, e.ContextualErrorMessage), m)))
-                [||]
-
-        match result with 
-        | null -> error(Error(FSComp.SR.etUnexpectedNullFromProvidedTypeMember(fullName, memberName), m)); [||]
-        | r -> r
+        try
+            st.PApplyArray(f, memberName, m)
+        with :? TypeProviderError as tpe ->
+            tpe.Iter (fun e -> error(Error(FSComp.SR.etUnexpectedExceptionFromProvidedTypeMember(fullName, memberName, e.ContextualErrorMessage), m)))
+            [||]
 
     /// Try to access a member on a provided type, catching and reporting errors and checking the result is non-null, 
     let TryTypeMemberNonNull (st:Tainted<_>, fullName, memberName, m, recover, f) =
@@ -265,7 +260,7 @@ module internal ExtensionTyping =
         | Tainted.Null -> 
             errorR(Error(FSComp.SR.etUnexpectedNullFromProvidedTypeMember(fullName, memberName), m)); 
             st.PApplyNoFailure(fun _ -> recover)
-        | r -> r
+        | Tainted.NonNull r -> r
 
     /// Try to access a property or method on a provided member, catching and reporting errors
     let TryMemberMember (mi:Tainted<_>, typeName, memberName, memberMemberName, m, recover, f) = 
@@ -280,8 +275,10 @@ module internal ExtensionTyping =
         resolver.PUntaint((fun tp -> tp.GetType().Name), m)
 
     /// Validate a provided namespace name
-    let ValidateNamespaceName(name, typeProvider:Tainted, m, nsp:string) =
-        if nsp<>null then // Null namespace designates the global namespace.
+    let ValidateNamespaceName(name, typeProvider:Tainted, m, nsp:string?) =
+        match nsp with 
+        | null -> ()
+        | NullChecked nsp -> 
             if String.IsNullOrWhiteSpace nsp then
                 // Empty namespace is not allowed
                 errorR(Error(FSComp.SR.etEmptyNamespaceOfTypeNotAllowed(name, typeProvider.PUntaint((fun tp -> tp.GetType().Name), m)), m))
@@ -369,7 +366,7 @@ module internal ExtensionTyping =
     type CustomAttributeTypedArgument = System.Reflection.CustomAttributeTypedArgument
 #endif
 
-    []
+    []
     type ProvidedType (x:System.Type, ctxt: ProvidedTypeContext) =
 #if FX_RESHAPED_REFLECTION
         inherit ProvidedMemberInfo(x.GetTypeInfo(), ctxt)
@@ -401,7 +398,7 @@ module internal ExtensionTyping =
         member __.IsSuppressRelocate = (x.Attributes &&& enum (int32 TypeProviderTypeAttributes.SuppressRelocate)) <> enum 0  
         member __.IsErased = (x.Attributes &&& enum (int32 TypeProviderTypeAttributes.IsErased)) <> enum 0  
         member __.IsGenericType = x.IsGenericType
-        member __.Namespace = x.Namespace
+        member __.Namespace : string? = x.Namespace
         member __.FullName = x.FullName
         member __.IsArray = x.IsArray
         member __.Assembly = x.Assembly |> ProvidedAssembly.Create ctxt
@@ -442,16 +439,35 @@ module internal ExtensionTyping =
         member __.GetArrayRank() = x.GetArrayRank()
         member __.GenericParameterPosition = x.GenericParameterPosition
         member __.RawSystemType = x
+
         /// Type.GetEnumUnderlyingType either returns type or raises exception, null is not permitted
         member __.GetEnumUnderlyingType() = 
             x.GetEnumUnderlyingType() 
             |> ProvidedType.CreateWithNullCheck ctxt "EnumUnderlyingType"
-        static member Create ctxt x = match x with null -> null | t -> ProvidedType (t, ctxt)
-        static member CreateWithNullCheck ctxt name x = match x with null -> nullArg name | t -> ProvidedType (t, ctxt)
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedType.Create ctxt)
+
+        static member Create ctxt x : ProvidedType? = 
+            match x with 
+            | null -> null 
+            | NullChecked t -> ProvidedType (t, ctxt)
+
+        static member CreateNonNull ctxt x = ProvidedType (x, ctxt)
+
+        static member CreateWithNullCheck ctxt name x = 
+            match x with
+            | null -> nullArg name 
+            | t -> ProvidedType (t, ctxt)
+
+        static member CreateArray ctxt xs = 
+            match box xs with
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedType.CreateNonNull ctxt)
+
         static member CreateNoContext (x:Type) = ProvidedType.Create ProvidedTypeContext.Empty x
+
         static member Void = ProvidedType.CreateNoContext typeof
+
         member __.Handle = x
+
         override __.Equals y = assert false; match y with :? ProvidedType as y -> x.Equals y.Handle | _ -> false
         override __.GetHashCode() = assert false; x.GetHashCode()
         member __.TryGetILTypeRef() = ctxt.TryGetILTypeRef x
@@ -461,9 +477,8 @@ module internal ExtensionTyping =
         static member TaintedEquals (pt1:Tainted, pt2:Tainted) = 
            Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle))
 
-    and [] 
-        IProvidedCustomAttributeProvider =
-        abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string * int * int) option 
+    and IProvidedCustomAttributeProvider =
+        abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string? * int * int) option 
         abstract GetXmlDocAttributes : provider:ITypeProvider -> string[]
         abstract GetHasTypeProviderEditorHideMethodsAttribute : provider:ITypeProvider -> bool
         abstract GetAttributeConstructorArgs: provider:ITypeProvider * attribName:string -> (obj option list * (string * obj option) list) option
@@ -512,7 +527,7 @@ module internal ExtensionTyping =
                                 None) 
                         |> Seq.toArray  }
 
-    and [] 
+    and [] 
         ProvidedMemberInfo (x: System.Reflection.MemberInfo, ctxt) = 
 #if FX_NO_CUSTOMATTRIBUTEDATA
         let provide () = ProvidedCustomAttributeProvider.Create (fun provider -> provider.GetMemberCustomAttributesData(x) :> _)
@@ -529,14 +544,14 @@ module internal ExtensionTyping =
             member __.GetXmlDocAttributes(provider) = provide().GetXmlDocAttributes(provider)
             member __.GetAttributeConstructorArgs (provider, attribName) = provide().GetAttributeConstructorArgs (provider, attribName)
 
-    and [] 
+    and [] 
         ProvidedParameterInfo (x: System.Reflection.ParameterInfo, ctxt) = 
 #if FX_NO_CUSTOMATTRIBUTEDATA
         let provide () = ProvidedCustomAttributeProvider.Create (fun provider -> provider.GetParameterCustomAttributesData(x) :> _)
 #else
         let provide () = ProvidedCustomAttributeProvider.Create (fun _provider -> x.CustomAttributes)
 #endif
-        member __.Name = x.Name
+        member __.Name = let nm = x.Name in match box nm with null -> "" | _ -> nm
         member __.IsOut = x.IsOut
 #if FX_NO_ISIN_ON_PARAMETER_INFO 
         member __.IsIn = not x.IsOut
@@ -547,29 +562,41 @@ module internal ExtensionTyping =
         member __.RawDefaultValue = x.RawDefaultValue
         member __.HasDefaultValue = x.Attributes.HasFlag(System.Reflection.ParameterAttributes.HasDefault)
         /// ParameterInfo.ParameterType cannot be null
-        member __.ParameterType = ProvidedType.CreateWithNullCheck ctxt "ParameterType" x.ParameterType 
-        static member Create ctxt x = match x with null -> null | t -> ProvidedParameterInfo (t, ctxt)
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedParameterInfo.Create ctxt)  // TODO null wrong?
+        member __.ParameterType = ProvidedType.CreateWithNullCheck ctxt "ParameterType" x.ParameterType
+        
+        static member Create ctxt (x: ParameterInfo?) : ProvidedParameterInfo? = 
+            match x with 
+            | null -> null 
+            | NullChecked x -> ProvidedParameterInfo (x, ctxt)
+
+        static member CreateNonNull ctxt x = ProvidedParameterInfo (x, ctxt)
+        
+        static member CreateArray ctxt (xs: ParameterInfo[]) : ProvidedParameterInfo[] = 
+            match box xs with 
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedParameterInfo.CreateNonNull ctxt)
+        
         interface IProvidedCustomAttributeProvider with 
             member __.GetHasTypeProviderEditorHideMethodsAttribute(provider) = provide().GetHasTypeProviderEditorHideMethodsAttribute(provider)
             member __.GetDefinitionLocationAttribute(provider) = provide().GetDefinitionLocationAttribute(provider)
             member __.GetXmlDocAttributes(provider) = provide().GetXmlDocAttributes(provider)
             member __.GetAttributeConstructorArgs (provider, attribName) = provide().GetAttributeConstructorArgs (provider, attribName)
+        
         member __.Handle = x
         override __.Equals y = assert false; match y with :? ProvidedParameterInfo as y -> x.Equals y.Handle | _ -> false
         override __.GetHashCode() = assert false; x.GetHashCode()
 
-    and [] 
+    and [] 
         ProvidedAssembly (x: System.Reflection.Assembly, _ctxt) = 
         member __.GetName() = x.GetName()
         member __.FullName = x.FullName
         member __.GetManifestModuleContents(provider: ITypeProvider) = provider.GetGeneratedAssemblyContents(x)
-        static member Create ctxt x = match x with null -> null | t -> ProvidedAssembly (t, ctxt)
+        static member Create ctxt x : ProvidedAssembly? = match x with null -> null | t -> ProvidedAssembly (t, ctxt)
         member __.Handle = x
         override __.Equals y = assert false; match y with :? ProvidedAssembly as y -> x.Equals y.Handle | _ -> false
         override __.GetHashCode() = assert false; x.GetHashCode()
 
-    and [] 
+    and [] 
         ProvidedMethodBase (x: System.Reflection.MethodBase, ctxt) = 
         inherit ProvidedMemberInfo(x, ctxt)
         member __.Context = ctxt
@@ -631,16 +658,27 @@ module internal ExtensionTyping =
                     | :? System.Reflection.MethodBase as mb -> mb
                     | _ -> failwith (FSComp.SR.estApplyStaticArgumentsForMethodNotImplemented())
             match mb with 
-            | :? System.Reflection.MethodInfo as mi -> (mi |> ProvidedMethodInfo.Create ctxt : ProvidedMethodInfo) :> ProvidedMethodBase
-            | :? System.Reflection.ConstructorInfo as ci -> (ci |> ProvidedConstructorInfo.Create ctxt : ProvidedConstructorInfo) :> ProvidedMethodBase
+            | :? System.Reflection.MethodInfo as mi -> (mi |> ProvidedMethodInfo.CreateNonNull ctxt : ProvidedMethodInfo) :> ProvidedMethodBase
+            | :? System.Reflection.ConstructorInfo as ci -> (ci |> ProvidedConstructorInfo.CreateNonNull ctxt : ProvidedConstructorInfo) :> ProvidedMethodBase
             | _ -> failwith (FSComp.SR.estApplyStaticArgumentsForMethodNotImplemented())
 
 
-    and [] 
+    and [] 
         ProvidedFieldInfo (x: System.Reflection.FieldInfo, ctxt) = 
         inherit ProvidedMemberInfo(x, ctxt)
-        static member Create ctxt x = match x with null -> null | t -> ProvidedFieldInfo (t, ctxt)
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedFieldInfo.Create ctxt)
+
+        static member CreateNonNull ctxt x = ProvidedFieldInfo (x, ctxt)
+
+        static member Create ctxt x : ProvidedFieldInfo? = 
+            match x with 
+            | null -> null 
+            | NullChecked x -> ProvidedFieldInfo (x, ctxt)
+
+        static member CreateArray ctxt xs : ProvidedFieldInfo[] = 
+            match box xs with 
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedFieldInfo.CreateNonNull ctxt)
+
         member __.IsInitOnly = x.IsInitOnly
         member __.IsStatic = x.IsStatic
         member __.IsSpecialName = x.IsSpecialName
@@ -661,15 +699,25 @@ module internal ExtensionTyping =
 
 
 
-    and [] 
+    and [] 
         ProvidedMethodInfo (x: System.Reflection.MethodInfo, ctxt) = 
         inherit ProvidedMethodBase(x, ctxt)
 
         member __.ReturnType = x.ReturnType |> ProvidedType.CreateWithNullCheck ctxt "ReturnType"
 
-        static member Create ctxt x = match x with null -> null | t -> ProvidedMethodInfo (t, ctxt)
+        static member CreateNonNull ctxt (x: MethodInfo) : ProvidedMethodInfo = 
+            ProvidedMethodInfo (x, ctxt)
+
+        static member Create ctxt (x: MethodInfo?) : ProvidedMethodInfo? = 
+            match x with 
+            | null -> null
+            | NullChecked x -> ProvidedMethodInfo (x, ctxt)
+
+        static member CreateArray ctxt (xs: MethodInfo[]?) : ProvidedMethodInfo[] = 
+            match box xs with 
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedMethodInfo.CreateNonNull ctxt)
 
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedMethodInfo.Create ctxt)
         member __.Handle = x
 #if !FX_NO_REFLECTION_METADATA_TOKENS
         member __.MetadataToken = x.MetadataToken
@@ -677,7 +725,7 @@ module internal ExtensionTyping =
         override __.Equals y = assert false; match y with :? ProvidedMethodInfo as y -> x.Equals y.Handle | _ -> false
         override __.GetHashCode() = assert false; x.GetHashCode()
 
-    and [] 
+    and [] 
         ProvidedPropertyInfo (x: System.Reflection.PropertyInfo, ctxt) = 
         inherit ProvidedMemberInfo(x, ctxt)
         member __.GetGetMethod() = x.GetGetMethod() |> ProvidedMethodInfo.Create ctxt
@@ -687,8 +735,19 @@ module internal ExtensionTyping =
         member __.GetIndexParameters() = x.GetIndexParameters() |> ProvidedParameterInfo.CreateArray ctxt
         /// PropertyInfo.PropertyType cannot be null
         member __.PropertyType = x.PropertyType |> ProvidedType.CreateWithNullCheck ctxt "PropertyType"
-        static member Create ctxt x = match x with null -> null | t -> ProvidedPropertyInfo (t, ctxt)
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedPropertyInfo.Create ctxt)
+
+        static member CreateNonNull ctxt x = ProvidedPropertyInfo (x, ctxt)
+
+        static member Create ctxt x : ProvidedPropertyInfo? = 
+            match x with 
+            | null -> null 
+            | NullChecked x -> ProvidedPropertyInfo (x, ctxt)
+
+        static member CreateArray ctxt xs : ProvidedPropertyInfo[] = 
+            match box xs with
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedPropertyInfo.CreateNonNull ctxt)
+
         member __.Handle = x
         override __.Equals y = assert false; match y with :? ProvidedPropertyInfo as y -> x.Equals y.Handle | _ -> false
         override __.GetHashCode() = assert false; x.GetHashCode()
@@ -697,15 +756,26 @@ module internal ExtensionTyping =
         static member TaintedEquals (pt1:Tainted, pt2:Tainted) = 
            Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle))
 
-    and [] 
+    and [] 
         ProvidedEventInfo (x: System.Reflection.EventInfo, ctxt) = 
         inherit ProvidedMemberInfo(x, ctxt)
         member __.GetAddMethod() = x.GetAddMethod() |> ProvidedMethodInfo.Create  ctxt
         member __.GetRemoveMethod() = x.GetRemoveMethod() |> ProvidedMethodInfo.Create ctxt
         /// EventInfo.EventHandlerType cannot be null
         member __.EventHandlerType = x.EventHandlerType |> ProvidedType.CreateWithNullCheck ctxt "EventHandlerType"
-        static member Create ctxt x = match x with null -> null | t -> ProvidedEventInfo (t, ctxt)
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedEventInfo.Create ctxt)
+        
+        static member CreateNonNull ctxt x = ProvidedEventInfo (x, ctxt)
+        
+        static member Create ctxt x : ProvidedEventInfo? = 
+            match x with 
+            | null -> null 
+            | NullChecked x -> ProvidedEventInfo (x, ctxt)
+        
+        static member CreateArray ctxt xs : ProvidedEventInfo[] = 
+            match box xs with 
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedEventInfo.CreateNonNull ctxt)
+        
         member __.Handle = x
         override __.Equals y = assert false; match y with :? ProvidedEventInfo as y -> x.Equals y.Handle | _ -> false
         override __.GetHashCode() = assert false; x.GetHashCode()
@@ -714,37 +784,71 @@ module internal ExtensionTyping =
         static member TaintedEquals (pt1:Tainted, pt2:Tainted) = 
            Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle))
 
-    and [] 
+    and [] 
         ProvidedConstructorInfo (x: System.Reflection.ConstructorInfo, ctxt) = 
         inherit ProvidedMethodBase(x, ctxt)
-        static member Create ctxt x = match x with null -> null | t -> ProvidedConstructorInfo (t, ctxt)
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedConstructorInfo.Create ctxt)
+
+        static member CreateNonNull ctxt x = ProvidedConstructorInfo (x, ctxt)
+
+        static member Create ctxt (x: ConstructorInfo?) : ProvidedConstructorInfo? = 
+            match x with 
+            | null -> null 
+            | NullChecked x -> ProvidedConstructorInfo (x, ctxt)
+
+        static member CreateArray ctxt xs : ProvidedConstructorInfo[] = 
+            match box xs with 
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedConstructorInfo.CreateNonNull ctxt)
+
         member __.Handle = x
         override __.Equals y = assert false; match y with :? ProvidedConstructorInfo as y -> x.Equals y.Handle | _ -> false
         override __.GetHashCode() = assert false; x.GetHashCode()
 
-    []
+    []
     type ProvidedExpr (x:Quotations.Expr, ctxt) =
         member __.Type = x.Type |> ProvidedType.Create ctxt
         member __.Handle = x
         member __.Context = ctxt
         member __.UnderlyingExpressionString = x.ToString()
-        static member Create ctxt t = match box t with null -> null | _ -> ProvidedExpr (t, ctxt)
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedExpr.Create ctxt)
+
+        static member Create ctxt t : ProvidedExpr? = 
+            match box t with 
+            | null -> null 
+            | _ -> ProvidedExpr (t, ctxt)
+
+        static member CreateNonNull ctxt t : ProvidedExpr = 
+            ProvidedExpr (t, ctxt)
+
+        static member CreateArray ctxt xs : ProvidedExpr[] = 
+            match box xs with 
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedExpr.CreateNonNull ctxt)
+
         override __.Equals y = match y with :? ProvidedExpr as y -> x.Equals y.Handle | _ -> false
+
         override __.GetHashCode() = x.GetHashCode()
 
-    []
+    []
     type ProvidedVar (x:Quotations.Var, ctxt) =
         member __.Type = x.Type |> ProvidedType.Create ctxt
         member __.Name = x.Name
         member __.IsMutable = x.IsMutable
         member __.Handle = x
         member __.Context = ctxt
-        static member Create ctxt t = match box t with null -> null | _ -> ProvidedVar (t, ctxt)
-        static member Fresh (nm, ty:ProvidedType) = ProvidedVar.Create ty.Context (new Quotations.Var(nm, ty.Handle))
-        static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedVar.Create ctxt)
+
+        static member CreateNonNull ctxt t = 
+            ProvidedVar (t, ctxt)
+
+        static member Fresh (nm, ty:ProvidedType) = 
+            ProvidedVar.CreateNonNull ty.Context (new Quotations.Var(nm, ty.Handle))
+
+        static member CreateArray ctxt xs = 
+            match box xs with 
+            | null -> [| |]
+            | _ -> xs |> Array.map (ProvidedVar.CreateNonNull ctxt)
+
         override __.Equals y = match y with :? ProvidedVar as y -> x.Equals y.Handle | _ -> false
+
         override __.GetHashCode() = x.GetHashCode()
 
 
@@ -823,7 +927,7 @@ module internal ExtensionTyping =
     /// Detect a provided lambda expression 
     let (|ProvidedLambdaExpr|_|) (x:ProvidedExpr) = 
         match x.Handle with 
-        |  Quotations.Patterns.Lambda(v, body) -> Some (ProvidedVar.Create x.Context v,  ProvidedExpr.Create x.Context body)
+        |  Quotations.Patterns.Lambda(v, body) -> Some (ProvidedVar.CreateNonNull x.Context v,  ProvidedExpr.Create x.Context body)
         | _ -> None
 
     /// Detect a provided try/finally expression 
@@ -835,7 +939,7 @@ module internal ExtensionTyping =
     /// Detect a provided try/with expression 
     let (|ProvidedTryWithExpr|_|) (x:ProvidedExpr) = 
         match x.Handle with 
-        |  Quotations.Patterns.TryWith(b, v1, e1, v2, e2) -> Some (ProvidedExpr.Create x.Context b, ProvidedVar.Create x.Context v1, ProvidedExpr.Create x.Context e1, ProvidedVar.Create x.Context v2, ProvidedExpr.Create x.Context e2)
+        |  Quotations.Patterns.TryWith(b, v1, e1, v2, e2) -> Some (ProvidedExpr.Create x.Context b, ProvidedVar.CreateNonNull x.Context v1, ProvidedExpr.Create x.Context e1, ProvidedVar.CreateNonNull x.Context v2, ProvidedExpr.Create x.Context e2)
         | _ -> None
 
 #if PROVIDED_ADDRESS_OF
@@ -854,7 +958,7 @@ module internal ExtensionTyping =
     /// Detect a provided 'let' expression 
     let (|ProvidedLetExpr|_|) (x:ProvidedExpr) = 
         match x.Handle with 
-        |  Quotations.Patterns.Let(v, e, b) -> Some (ProvidedVar.Create x.Context v, ProvidedExpr.Create x.Context e, ProvidedExpr.Create x.Context b)
+        |  Quotations.Patterns.Let(v, e, b) -> Some (ProvidedVar.CreateNonNull x.Context v, ProvidedExpr.Create x.Context e, ProvidedExpr.Create x.Context b)
         | _ -> None
 
 
@@ -862,7 +966,7 @@ module internal ExtensionTyping =
     let (|ProvidedForIntegerRangeLoopExpr|_|) (x:ProvidedExpr) = 
         match x.Handle with 
         |  Quotations.Patterns.ForIntegerRangeLoop (v, e1, e2, e3) -> 
-            Some (ProvidedVar.Create x.Context v, 
+            Some (ProvidedVar.CreateNonNull x.Context v, 
                   ProvidedExpr.Create x.Context e1, 
                   ProvidedExpr.Create x.Context e2, 
                   ProvidedExpr.Create x.Context e3)
@@ -871,7 +975,7 @@ module internal ExtensionTyping =
     /// Detect a provided 'set variable' expression 
     let (|ProvidedVarSetExpr|_|) (x:ProvidedExpr) = 
         match x.Handle with 
-        |  Quotations.Patterns.VarSet(v, e) -> Some (ProvidedVar.Create x.Context v, ProvidedExpr.Create x.Context e)
+        |  Quotations.Patterns.VarSet(v, e) -> Some (ProvidedVar.CreateNonNull x.Context v, ProvidedExpr.Create x.Context e)
         | _ -> None
 
     /// Detect a provided 'IfThenElse' expression 
@@ -883,7 +987,7 @@ module internal ExtensionTyping =
     /// Detect a provided 'Var' expression 
     let (|ProvidedVarExpr|_|) (x:ProvidedExpr) = 
         match x.Handle with 
-        |  Quotations.Patterns.Var v  -> Some (ProvidedVar.Create x.Context v)
+        |  Quotations.Patterns.Var v  -> Some (ProvidedVar.CreateNonNull x.Context v)
         | _ -> None
 
     /// Get the provided invoker expression for a particular use of a method.
@@ -908,7 +1012,7 @@ module internal ExtensionTyping =
             errorR(Error(FSComp.SR.etMustNotBeGeneric(fullName), m))  
         if TryTypeMember(st, fullName, "IsArray", m, false, fun st->st.IsArray) |> unmarshal then 
             errorR(Error(FSComp.SR.etMustNotBeAnArray(fullName), m))  
-        TryTypeMemberNonNull(st, fullName, "GetInterfaces", m, [||], fun st -> st.GetInterfaces()) |> ignore
+        TryTypeMember(st, fullName, "GetInterfaces", m, [||], fun st -> st.GetInterfaces()) |> ignore
 
 
     /// Verify that a provided type has the expected name
@@ -917,15 +1021,17 @@ module internal ExtensionTyping =
         if name <> expectedName then
             raise (TypeProviderError(FSComp.SR.etProvidedTypeHasUnexpectedName(expectedName, name), st.TypeProviderDesignation, m))
 
-        let namespaceName = TryTypeMember(st, name, "Namespace", m, "", fun st -> st.Namespace) |> unmarshal
+        let namespaceName = TryTypeMember<_, (string?)>(st, name, "Namespace", m, withNull "", fun st -> st.Namespace) |> unmarshal // TODO NULLNESS: why is this explicit instantiation needed?
+
         let rec declaringTypes (st:Tainted) accu =
             match TryTypeMember(st, name, "DeclaringType", m, null, fun st -> st.DeclaringType) with
-            |   Tainted.Null -> accu
-            |   dt -> declaringTypes dt (CheckAndComputeProvidedNameProperty(m, dt, (fun dt -> dt.Name), "Name")::accu)
+            | Tainted.Null -> accu
+            | Tainted.NonNull dt -> declaringTypes dt (CheckAndComputeProvidedNameProperty(m, dt, (fun dt -> dt.Name), "Name")::accu)
+
         let path = 
             [|  match namespaceName with 
                 | null -> ()
-                | _ -> yield! namespaceName.Split([|'.'|])
+                | NullChecked namespaceName -> yield! namespaceName.Split([|'.'|])
                 yield! declaringTypes st [] |]
         
         if path <> expectedPath then
@@ -938,7 +1044,7 @@ module internal ExtensionTyping =
         // Do all the calling into st up front with recovery
         let fullName, namespaceName, usedMembers =
             let name = CheckAndComputeProvidedNameProperty(m, st, (fun st -> st.Name), "Name")
-            let namespaceName = TryTypeMember(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal
+            let namespaceName = TryTypeMember<_, (string?)>(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal
             let fullName = TryTypeMemberNonNull(st, name, "FullName", m, FSComp.SR.invalidFullNameForProvidedType(), fun st -> st.FullName) |> unmarshal
             ValidateExpectedName m expectedPath expectedName st
             // Must be able to call (GetMethods|GetEvents|GetPropeties|GetNestedTypes|GetConstructors)(bindingFlags).
@@ -963,7 +1069,7 @@ module internal ExtensionTyping =
         for mi in usedMembers do
             match mi with 
             | Tainted.Null -> errorR(Error(FSComp.SR.etNullMember(fullName), m))  
-            | _ -> 
+            | Tainted.NonNull _ -> 
                 let memberName = TryMemberMember(mi, fullName, "Name", "Name", m, "invalid provided type member name", fun mi -> mi.Name) |> unmarshal
                 if String.IsNullOrEmpty(memberName) then 
                     errorR(Error(FSComp.SR.etNullOrEmptyMemberName(fullName), m))  
@@ -974,7 +1080,7 @@ module internal ExtensionTyping =
                     | Tainted.Null when (mi.OfType().IsSome) -> ()
                     | Tainted.Null -> 
                         errorR(Error(FSComp.SR.etNullMemberDeclaringType(fullName, memberName), m))   
-                    | _ ->     
+                    | Tainted.NonNull miDeclaringType  ->     
                         let miDeclaringTypeFullName = 
                             TryMemberMember(miDeclaringType, fullName, memberName, "FullName", m, "invalid declaring type full name", fun miDeclaringType -> miDeclaringType.FullName)
                             |> unmarshal
@@ -1040,7 +1146,7 @@ module internal ExtensionTyping =
 
         // Validate the Name, Namespace and FullName properties
         let name = CheckAndComputeProvidedNameProperty(m, st, (fun st -> st.Name), "Name")
-        let _namespaceName = TryTypeMember(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal
+        let _namespaceName = TryTypeMember<_, (string?)>(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal
         let _fullname = TryTypeMemberNonNull(st, name, "FullName", m, FSComp.SR.invalidFullNameForProvidedType(), fun st -> st.FullName)  |> unmarshal
         ValidateExpectedName m expectedPath expectedName st
 
@@ -1059,7 +1165,7 @@ module internal ExtensionTyping =
     /// Resolve a (non-nested) provided type given a full namespace name and a type name. 
     /// May throw an exception which will be turned into an error message by one of the 'Try' function below.
     /// If resolution is successful the type is then validated.
-    let ResolveProvidedType (resolver:Tainted, m, moduleOrNamespace:string[], typeName) =
+    let ResolveProvidedType (resolver:Tainted, m, moduleOrNamespace:string[], typeName) : Tainted< ProvidedType? > =
         let displayName = String.Join(".", moduleOrNamespace)
 
         // Try to find the type in the given provided namespace
@@ -1072,8 +1178,8 @@ module internal ExtensionTyping =
             if displayName = providedNamespaceName then
                 let resolvedType = providedNamespace.PApply((fun providedNamespace -> ProvidedType.CreateNoContext(providedNamespace.ResolveTypeName typeName)), range=m) 
                 match resolvedType with
-                |   Tainted.Null -> None
-                |   result -> 
+                | Tainted.Null -> None
+                | Tainted.NonNull result -> 
                     ValidateProvidedTypeDefinition(m, result, moduleOrNamespace, typeName)
                     Some result
             else
@@ -1095,7 +1201,7 @@ module internal ExtensionTyping =
         try 
             match ResolveProvidedType(resolver, m, moduleOrNamespace, typeName) with
             | Tainted.Null -> None
-            | ty -> Some ty
+            | Tainted.NonNull ty -> Some ty
         with e -> 
             errorRecovery e m
             None
@@ -1107,13 +1213,13 @@ module internal ExtensionTyping =
             | Tainted.Null -> 
                match st.PUntaint((fun st -> st.Namespace), m) with 
                | null -> typeName
-               | ns -> ns + "." + typeName
+               | NullChecked ns -> ns + "." + typeName
             | _ -> typeName
 
         let rec encContrib (st:Tainted) = 
             match st.PApply((fun st ->st.DeclaringType), m) with 
             | Tainted.Null -> []
-            | enc -> encContrib enc @ [ nameContrib enc ]
+            | Tainted.NonNull enc -> encContrib enc @ [ nameContrib enc ]
 
         encContrib st, nameContrib st
 
@@ -1137,7 +1243,7 @@ module internal ExtensionTyping =
  
             match methBeforeArgs.PApplyWithProvider((fun (mb, provider) -> mb.ApplyStaticArgumentsForMethod(provider, mangledName, staticArgs)), range=m) with 
             | Tainted.Null -> None
-            | methWithArguments -> 
+            | Tainted.NonNull methWithArguments -> 
                 let actualName = methWithArguments.PUntaint((fun x -> x.Name), m)
                 if actualName <> mangledName then 
                     error(Error(FSComp.SR.etProvidedAppliedMethodHadWrongName(methWithArguments.TypeProviderDesignation, mangledName, actualName), m))
@@ -1164,7 +1270,7 @@ module internal ExtensionTyping =
  
             match typeBeforeArguments.PApplyWithProvider((fun (typeBeforeArguments, provider) -> typeBeforeArguments.ApplyStaticArguments(provider, Array.ofList fullTypePathAfterArguments, staticArgs)), range=m) with 
             | Tainted.Null -> None
-            | typeWithArguments -> 
+            | Tainted.NonNull typeWithArguments -> 
                 let actualName = typeWithArguments.PUntaint((fun x -> x.Name), m)
                 let checkTypeName() = 
                     let expectedTypeNameAfterArguments = fullTypePathAfterArguments.[fullTypePathAfterArguments.Length-1]
@@ -1188,7 +1294,7 @@ module internal ExtensionTyping =
 
         match typeBeforeArguments with 
         | Tainted.Null -> None
-        | _ -> 
+        | Tainted.NonNull typeBeforeArguments -> 
             // Take the static arguments (as strings, taken from the text in the reference we're relinking), 
             // and convert them to objects of the appropriate type, based on the expected kind.
             let staticParameters = typeBeforeArguments.PApplyWithProvider((fun (typeBeforeArguments, resolver) -> typeBeforeArguments.GetStaticParameters(resolver)), range=range0)
@@ -1242,27 +1348,31 @@ module internal ExtensionTyping =
             | None -> None
 
     /// Get the parts of a .NET namespace. Special rules: null means global, empty is not allowed.
-    let GetPartsOfNamespaceRecover(namespaceName:string) = 
-        if namespaceName=null then []
-        elif  namespaceName.Length = 0 then [""]
-        else splitNamespace namespaceName
+    let GetPartsOfNamespaceRecover(namespaceName:string?) = 
+        match namespaceName with 
+        | null -> [] 
+        | NullChecked namespaceName -> 
+            if namespaceName.Length = 0 then [""]
+            else splitNamespace (nonNull namespaceName)
 
     /// Get the parts of a .NET namespace. Special rules: null means global, empty is not allowed.
-    let GetProvidedNamespaceAsPath (m, resolver:Tainted, namespaceName:string) = 
-        if namespaceName<>null && namespaceName.Length = 0 then
-            errorR(Error(FSComp.SR.etEmptyNamespaceNotAllowed(DisplayNameOfTypeProvider(resolver.TypeProvider, m)), m))  
-
-        GetPartsOfNamespaceRecover namespaceName
+    let GetProvidedNamespaceAsPath (m, resolver:Tainted, namespaceName:string?) = 
+        match namespaceName with 
+        | null -> [] 
+        | NullChecked namespaceName -> 
+            if namespaceName.Length = 0 then
+                errorR(Error(FSComp.SR.etEmptyNamespaceNotAllowed(DisplayNameOfTypeProvider(resolver.TypeProvider, m)), m))  
+            GetPartsOfNamespaceRecover namespaceName
 
     /// Get the parts of the name that encloses the .NET type including nested types. 
     let GetFSharpPathToProvidedType (st:Tainted, m) = 
         // Can't use st.Fullname because it may be like IEnumerable
         // We want [System;Collections;Generic]
         let namespaceParts = GetPartsOfNamespaceRecover(st.PUntaint((fun st -> st.Namespace), m))
-        let rec walkUpNestedClasses(st:Tainted, soFar) =
+        let rec walkUpNestedClasses(st:Tainted< ProvidedType? >, soFar) =
             match st with
             | Tainted.Null -> soFar
-            | st -> walkUpNestedClasses(st.PApply((fun st ->st.DeclaringType), m), soFar) @ [st.PUntaint((fun st -> st.Name), m)]
+            | Tainted.NonNull st -> walkUpNestedClasses(st.PApply((fun st ->st.DeclaringType), m), soFar) @ [st.PUntaint((fun st -> st.Name), m)]
 
         walkUpNestedClasses(st.PApply((fun st ->st.DeclaringType), m), namespaceParts)
 
@@ -1277,7 +1387,7 @@ module internal ExtensionTyping =
     /// any type relocations or static linking for generated types.
     let GetOriginalILTypeRefOfProvidedType (st:Tainted, m) = 
         
-        let aref = GetOriginalILAssemblyRefOfProvidedAssembly (st.PApply((fun st -> st.Assembly), m), m)
+        let aref = GetOriginalILAssemblyRefOfProvidedAssembly (st.PApply((fun st -> nonNull st.Assembly), m), m) // TODO: why is explicit instantiation needed here
         let scoperef = ILScopeRef.Assembly aref
         let enc, nm = ILPathToProvidedType (st, m)
         let tref = ILTypeRef.Create(scoperef, enc, nm)
diff --git a/src/fsharp/ExtensionTyping.fsi b/src/fsharp/ExtensionTyping.fsi
index a16788e2bb7..58ccbe4ed93 100755
--- a/src/fsharp/ExtensionTyping.fsi
+++ b/src/fsharp/ExtensionTyping.fsi
@@ -92,18 +92,18 @@ module internal ExtensionTyping =
     type CustomAttributeTypedArgument = Microsoft.FSharp.Core.CompilerServices.IProvidedCustomAttributeTypedArgument
 #endif
 
-    type [] 
+    type [] 
         ProvidedType =
         inherit ProvidedMemberInfo
         member IsSuppressRelocate : bool
         member IsErased : bool
         member IsGenericType : bool
-        member Namespace : string
+        member Namespace : string?
         member FullName : string
         member IsArray : bool
         member GetInterfaces : unit -> ProvidedType[]
         member Assembly : ProvidedAssembly
-        member BaseType : ProvidedType
+        member BaseType : ProvidedType?
         member GetNestedType : string -> ProvidedType
         member GetNestedTypes : unit -> ProvidedType[]
         member GetAllNestedTypes : unit -> ProvidedType[]
@@ -143,27 +143,26 @@ module internal ExtensionTyping =
         interface IProvidedCustomAttributeProvider
         static member TaintedEquals : Tainted * Tainted -> bool 
 
-    and [] 
-        IProvidedCustomAttributeProvider =
+    and IProvidedCustomAttributeProvider =
         abstract GetHasTypeProviderEditorHideMethodsAttribute : provider:ITypeProvider -> bool
-        abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string * int * int) option 
+        abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string? * int * int) option 
         abstract GetXmlDocAttributes : provider:ITypeProvider -> string[]
         abstract GetAttributeConstructorArgs: provider:ITypeProvider * attribName:string -> (obj option list * (string * obj option) list) option
         
-    and [] 
+    and [] 
         ProvidedAssembly = 
         member GetName : unit -> System.Reflection.AssemblyName
         member FullName : string
         member GetManifestModuleContents : ITypeProvider -> byte[]
         member Handle : System.Reflection.Assembly
 
-    and [] 
+    and [] 
         ProvidedMemberInfo = 
         member Name :string
-        member DeclaringType : ProvidedType
+        member DeclaringType : ProvidedType?
         interface IProvidedCustomAttributeProvider 
 
-    and [] 
+    and [] 
         ProvidedMethodBase = 
         inherit ProvidedMemberInfo
         member IsGenericMethod : bool
@@ -183,7 +182,7 @@ module internal ExtensionTyping =
         static member TaintedGetHashCode : Tainted -> int
         static member TaintedEquals : Tainted * Tainted -> bool 
 
-    and [] 
+    and [] 
         ProvidedMethodInfo = 
         inherit ProvidedMethodBase
         member ReturnType : ProvidedType
@@ -191,9 +190,9 @@ module internal ExtensionTyping =
         member MetadataToken : int
 #endif
 
-    and [] 
+    and [] 
         ProvidedParameterInfo = 
-        member Name :string
+        member Name : string
         member ParameterType : ProvidedType
         member IsIn : bool
         member IsOut : bool
@@ -202,7 +201,7 @@ module internal ExtensionTyping =
         member HasDefaultValue : bool
         interface IProvidedCustomAttributeProvider 
 
-    and [] 
+    and [] 
         ProvidedFieldInfo = 
         inherit ProvidedMemberInfo
         member IsInitOnly : bool
@@ -218,19 +217,27 @@ module internal ExtensionTyping =
         member IsPrivate : bool
         static member TaintedEquals : Tainted * Tainted -> bool 
 
-    and [] 
+    and [] 
         ProvidedPropertyInfo = 
         inherit ProvidedMemberInfo
-        member GetGetMethod : unit -> ProvidedMethodInfo
-        member GetSetMethod : unit -> ProvidedMethodInfo
+
+        member GetGetMethod : unit -> ProvidedMethodInfo?
+
+        member GetSetMethod : unit -> ProvidedMethodInfo?
+
         member GetIndexParameters : unit -> ProvidedParameterInfo[]
+
         member CanRead : bool
+
         member CanWrite : bool
+
         member PropertyType : ProvidedType
+
         static member TaintedGetHashCode : Tainted -> int
+
         static member TaintedEquals : Tainted * Tainted -> bool 
 
-    and [] 
+    and [] 
         ProvidedEventInfo = 
         inherit ProvidedMemberInfo
         member GetAddMethod : unit -> ProvidedMethodInfo
@@ -239,17 +246,17 @@ module internal ExtensionTyping =
         static member TaintedGetHashCode : Tainted -> int
         static member TaintedEquals : Tainted * Tainted -> bool 
 
-    and [] 
+    and [] 
         ProvidedConstructorInfo = 
         inherit ProvidedMethodBase
         
-    []
+    []
     type ProvidedExpr =
         member Type : ProvidedType
         /// Convert the expression to a string for diagnostics
         member UnderlyingExpressionString : string
 
-    []
+    []
     type ProvidedVar =
         member Type : ProvidedType
         member Name : string
diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs
index 63c001693cc..53a24b08bef 100644
--- a/src/fsharp/FSharp.Build/Fsc.fs
+++ b/src/fsharp/FSharp.Build/Fsc.fs
@@ -231,7 +231,7 @@ type public Fsc () as this =
 #if BUILDING_WITH_LKG
             | _ -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries)
 #else
-            | _ -> (nonNull warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries)
+            | _ -> (nonNull warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries)
 #endif
 
         builder.AppendSwitchIfNotNull("--warnaserror:", warningsAsErrorsArray, ",")
@@ -589,7 +589,7 @@ type public Fsc () as this =
 #if BUILDING_WITH_LKG
             builder.AppendSwitch(dotnetFscCompilerPath)
 #else
-            builder.AppendSwitch(nonNull dotnetFscCompilerPath)
+            builder.AppendSwitch(nonNull dotnetFscCompilerPath) // TODO NULLNESS: why is this explicit instantiation needed?
 #endif
         builder.ToString()
 
diff --git a/src/fsharp/FSharp.Build/WriteCodeFragment.fs b/src/fsharp/FSharp.Build/WriteCodeFragment.fs
index 7fd5c54d3cb..bd91df88ba0 100644
--- a/src/fsharp/FSharp.Build/WriteCodeFragment.fs
+++ b/src/fsharp/FSharp.Build/WriteCodeFragment.fs
@@ -133,7 +133,7 @@ type WriteCodeFragment() =
 #if BUILDING_WITH_LKG
                 let fileName = _outputFile.ItemSpec
 #else
-                let fileName = (nonNull _outputFile).ItemSpec
+                let fileName = (nonNull _outputFile).ItemSpec
 #endif
 
                 let outputFileItem =
@@ -141,13 +141,13 @@ type WriteCodeFragment() =
 #if BUILDING_WITH_LKG
                         TaskItem(Path.Combine(_outputDirectory.ItemSpec, fileName)) :> ITaskItem
 #else
-                        TaskItem(Path.Combine((nonNull _outputDirectory).ItemSpec, fileName)) :> ITaskItem
+                        TaskItem(Path.Combine((nonNull _outputDirectory).ItemSpec, fileName)) :> ITaskItem
 #endif
                     else
 #if BUILDING_WITH_LKG
                         _outputFile
 #else
-                        nonNull _outputFile
+                        nonNull _outputFile // TODO NULLNESS: why is this explicit instantiation needed
 #endif
 
                 let codeText = code.ToString()
diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index d064642ef68..7a3cf6d028f 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -19,7 +19,7 @@
     0x06800000
     $(OtherFlags) /warnon:1182
     $(OtherFlags) --maxerrors:10000
-    $(OtherFlags) --checknulls
+    $(OtherFlags) /checknulls
   
   
   
diff --git a/src/fsharp/FSharp.Core/fslib-extra-pervasives.fs b/src/fsharp/FSharp.Core/fslib-extra-pervasives.fs
index 63cb2d80718..47c278bc08e 100644
--- a/src/fsharp/FSharp.Core/fslib-extra-pervasives.fs
+++ b/src/fsharp/FSharp.Core/fslib-extra-pervasives.fs
@@ -343,7 +343,7 @@ namespace Microsoft.FSharp.Core.CompilerServices
     type ITypeProvider =
         inherit System.IDisposable
         abstract GetNamespaces : unit -> IProvidedNamespace[] 
-        abstract GetStaticParameters : typeWithoutArguments:Type -> ParameterInfo[] 
+        abstract GetStaticParameters : typeWithoutArguments:Type -> ParameterInfo[]
         abstract ApplyStaticArguments : typeWithoutArguments:Type * typePathWithArguments:string[] * staticArguments:obj[] -> Type 
         abstract GetInvokerExpression : syntheticMethodBase:MethodBase * parameters:Microsoft.FSharp.Quotations.Expr[] -> Microsoft.FSharp.Quotations.Expr
 
diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs
index 42ebc8f403a..930b815f58a 100644
--- a/src/fsharp/FSharp.Core/prim-types.fs
+++ b/src/fsharp/FSharp.Core/prim-types.fs
@@ -2371,9 +2371,7 @@ namespace Microsoft.FSharp.Core
             parse p 0UL
 
         let inline removeUnderscores (s:string) =
-            match s with
-            | null -> null
-            | s -> s.Replace("_", "")
+            s.Replace("_", "")
 
         let ParseUInt32 (s:string) = 
             if System.Object.ReferenceEquals(s,null) then
@@ -3340,14 +3338,15 @@ namespace Microsoft.FSharp.Core
             | _ -> true
 
 #if !BUILDING_WITH_LKG
+
         []
         let inline isNullV (value : Nullable<'T>) = not value.HasValue
 
         []
-        let inline nonNull (value : ('T)? when 'T : not struct) = 
+        let inline nonNull (value : 'T? when 'T : not struct) = 
             match box value with 
             | null -> raise (System.NullReferenceException()) // TODO NULLNESS: decide if this raises an exception or ploughs on 
-            | _ -> value
+            | _ -> (# "" value : 'T #)
 
         []
         let inline nonNullV (value : Nullable<'T>) = 
@@ -3356,6 +3355,18 @@ namespace Microsoft.FSharp.Core
             else 
                 raise (System.NullReferenceException())
 
+        []
+        let inline (|Null|NonNull|) (value : 'T?) = 
+            match value with 
+            | null -> Choice1Of2 () 
+            | _ -> Choice2Of2 (# "" value : 'T #)
+
+        []
+        let inline (|NullChecked|) (value : 'T?) =
+            match box value with 
+            | null -> raise (System.NullReferenceException()) // TODO NULLNESS: decide if this raises an exception or ploughs on 
+            | _ -> (# "" value : 'T #)
+
         []
         let inline withNull (value : 'T when 'T : not struct) = (# "" value : 'T? #)
 
diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi
index b18fb444962..ee966184fae 100644
--- a/src/fsharp/FSharp.Core/prim-types.fsi
+++ b/src/fsharp/FSharp.Core/prim-types.fsi
@@ -2257,6 +2257,18 @@ namespace Microsoft.FSharp.Core
         val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null // TODO NULLNESS addition of 'T : not struct is compat?
         
 #if !BUILDING_WITH_LKG
+        /// Determines whether the given value is null.
+        /// The value to check.
+        /// A choice indicating whether the value is null or not-null.
+        []
+        val inline (|Null|NonNull|) : value: 'T? -> Choice 
+        
+        /// When used in a pattern checks the given value is not null.
+        /// The value to check.
+        /// A choice indicating whether the value is null or not-null.
+        []
+        val inline (|NullChecked|) : value: 'T? -> 'T 
+        
         /// Determines whether the given value is null.
         /// The value to check.
         /// True when value is null, false otherwise.
diff --git a/src/fsharp/InfoReader.fs b/src/fsharp/InfoReader.fs
index eda63c42d5b..9689e813aaa 100644
--- a/src/fsharp/InfoReader.fs
+++ b/src/fsharp/InfoReader.fs
@@ -20,6 +20,10 @@ open Microsoft.FSharp.Compiler.Tast
 open Microsoft.FSharp.Compiler.Tastops
 open Microsoft.FSharp.Compiler.TcGlobals
 
+#if !NO_EXTENSIONTYPING
+open Microsoft.FSharp.Compiler.ExtensionTyping
+#endif
+
 /// Use the given function to select some of the member values from the members of an F# type
 let private SelectImmediateMemberVals g optFilter f (tcref:TyconRef) = 
     let chooser (vref:ValRef) = 
@@ -146,8 +150,8 @@ let rec GetImmediateIntrinsicPropInfosOfTypeAux (optFilter,ad) g amap m origTy m
                 match optFilter with
                 |   Some name ->
                         match st.PApply((fun st -> st.GetProperty name), m) with
-                        |   Tainted.Null -> [||]
-                        |   pi -> [|pi|]
+                        | Tainted.Null -> [||]
+                        | Tainted.NonNull pi -> [|pi|]
                 |   None ->
                         st.PApplyArray((fun st -> st.GetProperties()), "GetProperties", m)
             matchingProps
@@ -221,8 +225,8 @@ type InfoReader(g: TcGlobals, amap: Import.ImportMap) =
                         [ for fi in st.PApplyArray((fun st -> st.GetFields()), "GetFields" , m) -> ProvidedField(amap,fi,m) ]
                 |   Some name ->
                         match st.PApply ((fun st -> st.GetField name), m) with
-                        |   Tainted.Null -> []
-                        |   fi -> [  ProvidedField(amap,fi,m) ]
+                        | Tainted.Null -> []
+                        | Tainted.NonNull fi -> [  ProvidedField(amap,fi,m) ]
 #endif
             | ILTypeMetadata _ -> 
                 let tinfo = ILTypeInfo.FromType g ty
@@ -246,8 +250,8 @@ type InfoReader(g: TcGlobals, amap: Import.ImportMap) =
                         [   for ei in st.PApplyArray((fun st -> st.GetEvents()), "GetEvents" , m) -> ProvidedEvent(amap,ei,m) ]
                 |   Some name ->
                         match st.PApply ((fun st -> st.GetEvent name), m) with
-                        |   Tainted.Null -> []
-                        |   ei -> [  ProvidedEvent(amap,ei,m) ]
+                        | Tainted.Null -> []
+                        | Tainted.NonNull ei -> [  ProvidedEvent(amap,ei,m) ]
 #endif
             | ILTypeMetadata _ -> 
                 let tinfo = ILTypeInfo.FromType g ty
diff --git a/src/fsharp/LegacyHostedCompilerForTesting.fs b/src/fsharp/LegacyHostedCompilerForTesting.fs
index 1f8e258e07e..2e61cda44cd 100644
--- a/src/fsharp/LegacyHostedCompilerForTesting.fs
+++ b/src/fsharp/LegacyHostedCompilerForTesting.fs
@@ -136,12 +136,15 @@ type internal FscCompiler(legacyReferenceResolver) =
         fun arg -> regex.IsMatch(arg)
 
     /// do compilation as if args was argv to fsc.exe
-    member this.Compile(args : string array) =
+    member this.Compile(args : string[]) =
         // args.[0] is later discarded, assuming it is just the path to fsc.
         // compensate for this in case caller didn't know
         let args =
+            match box args with
+            | null -> [|"fsc"|]
+            | _ -> 
             match args with
-            | [||] | null -> [|"fsc"|]
+            | [||] -> [|"fsc"|]
             | a when not <| fscExeArg a.[0] -> Array.append [|"fsc"|] a
             | _ -> args
 
diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs
index c72270cb653..298cad9cf27 100644
--- a/src/fsharp/MethodCalls.fs
+++ b/src/fsharp/MethodCalls.fs
@@ -706,7 +706,7 @@ let MakeMethInfoCall amap m minfo minst args =
 // This imports a provided method, and checks if it is a known compiler intrinsic like "1 + 2"
 let TryImportProvidedMethodBaseAsLibraryIntrinsic (amap:Import.ImportMap, m:range, mbase: Tainted) = 
     let methodName = mbase.PUntaint((fun x -> x.Name), m)
-    let declaringType = Import.ImportProvidedType amap m (mbase.PApply((fun x -> x.DeclaringType), m))
+    let declaringType = Import.ImportProvidedType amap m (mbase.PApply((fun x -> nonNull x.DeclaringType), m))
     if isAppTy amap.g declaringType then 
         let declaringEntity = tcrefOfAppTy amap.g declaringType
         if not declaringEntity.IsLocalRef && ccuEq declaringEntity.nlr.Ccu amap.g.fslibCcu then
@@ -936,7 +936,7 @@ module ProvidedMethodCalls =
                         st.PApply((fun st -> 
                             match st.BaseType with 
                             | null -> ProvidedType.CreateNoContext(typeof)  // it might be an interface
-                            | st -> st), m)
+                            | NullChecked st -> st), m)
                     loop baseType
                 else
                     if isGeneric then 
@@ -975,7 +975,7 @@ module ProvidedMethodCalls =
             let fail() = error(Error(FSComp.SR.etUnsupportedProvidedExpression(ea.PUntaint((fun etree -> etree.UnderlyingExpressionString), m)), m))
             match ea with
             | Tainted.Null -> error(Error(FSComp.SR.etNullProvidedExpression(ea.TypeProviderDesignation), m))
-            |  _ ->
+            | Tainted.NonNull ea ->
             match ea.PApplyOption((function ProvidedTypeAsExpr x -> Some x | _ -> None), m) with
             | Some info -> 
                 let (expr, targetTy) = info.PApply2(id, m)
@@ -1239,7 +1239,7 @@ module ProvidedMethodCalls =
         let thisArg, paramVars = 
             match objArgs with
             | [objArg] -> 
-                let erasedThisTy = eraseSystemType (amap, m, mi.PApply((fun mi -> mi.DeclaringType), m))
+                let erasedThisTy = eraseSystemType (amap, m, mi.PApply((fun mi -> nonNull mi.DeclaringType), m))
                 let thisVar = erasedThisTy.PApply((fun ty -> ProvidedVar.Fresh("this", ty)), m)
                 Some objArg , Array.append [| thisVar |] paramVars
             | [] -> None , paramVars
diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs
index 120b6189214..edd78781119 100644
--- a/src/fsharp/NameResolution.fs
+++ b/src/fsharp/NameResolution.fs
@@ -1130,7 +1130,7 @@ let ResolveProvidedTypeNameInEntity (amap, m, typeName, modref: ModuleOrNamespac
             //if staticResInfo.NumStaticArgs > 0 then 
             //    error(Error(FSComp.SR.etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters(),m))
             []
-        | nestedSty -> 
+        | Tainted.NonNull nestedSty -> 
             [AddEntityForProvidedType (amap, modref, resolutionEnvironment, nestedSty, m) ]
     | _ -> []
 #endif
diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs
index 70451685fc3..da372ab28bc 100755
--- a/src/fsharp/NicePrint.fs
+++ b/src/fsharp/NicePrint.fs
@@ -2077,7 +2077,7 @@ let minimalStringsOfTwoTypes denv t1 t2=
         let denv = denv.SetOpenPaths []
         let denv = { denv with includeStaticParametersInTypeNames=true }
         let makeName t =
-            let assemblyName = PrintTypes.layoutAssemblyName denv t |> function | null | "" -> "" | name -> sprintf " (%s)" name
+            let assemblyName = PrintTypes.layoutAssemblyName denv t |> function "" -> "" | name -> sprintf " (%s)" name
             sprintf "%s%s" (stringOfTy denv t) assemblyName
 
         (makeName t1,makeName t2,stringOfTyparConstraints denv tpcs)
diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs
index 8cef1726ec9..0fa12b64ca6 100644
--- a/src/fsharp/TastOps.fs
+++ b/src/fsharp/TastOps.fs
@@ -6758,12 +6758,12 @@ let mkCompilationMappingAttrForQuotationResource (g:TcGlobals) (nm, tys: ILTypeR
 let isTypeProviderAssemblyAttr (cattr:ILAttribute) = 
     cattr.Method.DeclaringType.BasicQualifiedName = typeof.FullName
 
-let TryDecodeTypeProviderAssemblyAttr ilg (cattr:ILAttribute) = 
+let TryDecodeTypeProviderAssemblyAttr ilg (cattr:ILAttribute) : string? option = 
     if isTypeProviderAssemblyAttr cattr then 
         let parms, _args = decodeILAttribData ilg cattr 
         match parms with // The first parameter to the attribute is the name of the assembly with the compiler extensions.
-        | (ILAttribElem.String (Some assemblyName))::_ -> Some assemblyName
         | (ILAttribElem.String None)::_ -> Some null
+        | (ILAttribElem.String (Some assemblyName))::_ -> Some assemblyName
         | [] -> Some null
         | _ -> None
     else
@@ -8604,7 +8604,7 @@ let DetectAndOptimizeForExpression g option expr =
                 mkLet spBind mEnumExpr currentVar enumerableExpr
                     // let mutable next = current.TailOrNull
                     (mkCompGenLet mForLoop nextVar tailOrNullExpr 
-                        // while nonNull next dp
+                        // while notNull next dp
                        (mkWhile g (spWhileLoop, WhileLoopForCompiledForEachExprMarker, guardExpr, bodyExpr, mBody)))
 
             expr
diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi
index ad593d4b4d8..786c5a3f34b 100755
--- a/src/fsharp/TastOps.fsi
+++ b/src/fsharp/TastOps.fsi
@@ -1439,7 +1439,11 @@ val TryFindAttributeUsageAttribute : TcGlobals -> range -> TyconRef -> bool opti
 
 #if !NO_EXTENSIONTYPING
 /// returns Some(assemblyName) for success
+#if BUILDING_WITH_LKG
 val TryDecodeTypeProviderAssemblyAttr : ILGlobals -> ILAttribute -> string option
+#else
+val TryDecodeTypeProviderAssemblyAttr : ILGlobals -> ILAttribute -> string? option
+#endif
 #endif
 val IsSignatureDataVersionAttr  : ILAttribute -> bool
 val TryFindAutoOpenAttr           : IL.ILGlobals -> ILAttribute -> string option 
diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs
index b2c26b6191c..cf8748f4366 100755
--- a/src/fsharp/TcGlobals.fs
+++ b/src/fsharp/TcGlobals.fs
@@ -829,13 +829,13 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
 
   let betterEntries = Array.append betterTyconEntries decompileTyconEntries
 
-  let mutable decompileTypeDict = null
-  let mutable betterTypeDict1 = null
-  let mutable betterTypeDict2 = null
+  let mutable decompileTypeDict = Unchecked.defaultof<_>
+  let mutable betterTypeDict1 = Unchecked.defaultof<_>
+  let mutable betterTypeDict2 = Unchecked.defaultof<_>
 
   /// This map is indexed by stamps and lazy to avoid dereferencing while setting up the base imports. 
   let getDecompileTypeDict () = 
-      match decompileTypeDict with 
+      match box decompileTypeDict with 
       | null -> 
           let entries = decompileTyconEntries
           let t = Dictionary.newWithSize entries.Length
@@ -844,13 +844,13 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
                   t.Add(tcref.Stamp, builder)
           decompileTypeDict <- t
           t
-      | t -> t
+      | _ -> decompileTypeDict
 
   /// This map is for use when building FSharp.Core.dll. The backing Tycon's may not yet exist for
   /// the TyconRef's we have in our hands, hence we can't dereference them to find their stamps.
   /// So this dictionary is indexed by names. Make it lazy to avoid dereferencing while setting up the base imports. 
   let getBetterTypeDict1 () = 
-      match betterTypeDict1 with 
+      match box betterTypeDict1 with 
       | null -> 
           let entries = betterEntries
           let t = Dictionary.newWithSize entries.Length
@@ -863,12 +863,12 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
                              TType_app (tcref2, tinst2, nullness)))
           betterTypeDict1 <- t
           t
-      | t -> t
+      | _ -> betterTypeDict1
 
   /// This map is for use in normal times (not building FSharp.Core.dll). It is indexed by stamps
   /// and lazy to avoid dereferencing while setting up the base imports. 
   let getBetterTypeDict2 () = 
-      match betterTypeDict2 with 
+      match box betterTypeDict2 with 
       | null -> 
           let entries = betterEntries
           let t = Dictionary.newWithSize entries.Length
@@ -877,7 +877,7 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
                   t.Add(tcref.Stamp, builder)
           betterTypeDict2 <- t
           t
-      | t -> t
+      | _ -> betterTypeDict2
 
   /// For logical purposes equate some F# types with .NET types, e.g. TType_tuple == System.Tuple/ValueTuple.
   /// Doing this normalization is a fairly performance critical piece of code as it is frequently invoked
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
index 365ffd7871b..5c62470ace3 100755
--- a/src/fsharp/TypeChecker.fs
+++ b/src/fsharp/TypeChecker.fs
@@ -4701,6 +4701,8 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped
         | _ -> 
             errorR(Error(FSComp.SR.parsInvalidLiteralInType(), m)) 
             NewErrorType (), tpenv
+
+    | SynType.StaticConstantNull m
     | SynType.StaticConstantNamed (_, _, m)
     | SynType.StaticConstantExpr (_, m) ->
         errorR(Error(FSComp.SR.parsInvalidLiteralInType(), m)) 
@@ -4855,10 +4857,11 @@ and TcStaticConstantParameter cenv (env:TcEnv) tpenv kind (v:SynType) idOpt cont
             | SynConst.Single n     when typeEquiv g g.float32_ty kind -> record(g.float32_ty); box (n:single)
             | SynConst.Double n     when typeEquiv g g.float_ty kind   -> record(g.float_ty); box (n:double)
             | SynConst.Char n       when typeEquiv g g.char_ty kind    -> record(g.char_ty); box (n:char)
-            | SynConst.String (s, _) when s <> null && typeEquiv g g.string_ty kind  -> record(g.string_ty); box (s:string)
+            | SynConst.String (s, _) when typeEquiv g g.string_ty kind  -> record(g.string_ty); box s
             | SynConst.Bool b       when typeEquiv g g.bool_ty kind    -> record(g.bool_ty); box (b:bool)
             | _ -> fail()
         v, tpenv
+    | SynType.StaticConstantNull(_) -> fail()
     | SynType.StaticConstantExpr(e, _ ) ->
 
         // If an error occurs, don't try to recover, since the constant expression will be nothing like what we need
@@ -4883,7 +4886,6 @@ and TcStaticConstantParameter cenv (env:TcEnv) tpenv kind (v:SynType) idOpt cont
                 | Const.Single n   -> record(g.float32_ty); box (n:single)
                 | Const.Double n   -> record(g.float_ty); box (n:double)
                 | Const.Char n     -> record(g.char_ty); box (n:char)
-                | Const.String null   -> fail() 
                 | Const.String s   -> record(g.string_ty); box (s:string)
                 | Const.Bool b     -> record(g.bool_ty); box (b:bool)
                 | _ ->  fail()
@@ -6873,7 +6875,7 @@ and TcObjectExpr cenv overallTy env tpenv (synObjTy, argopt, binds, extraImpls,
 //------------------------------------------------------------------------- 
 
 /// Check a constant string expression. It might be a 'printf' format string 
-and TcConstStringExpr cenv overallTy env m tpenv s  =
+and TcConstStringExpr cenv overallTy env m tpenv (s: string)  =
 
     if (AddCxTypeEqualsTypeUndoIfFailed env.DisplayEnv cenv.css m overallTy cenv.g.string_ty) then 
       mkString cenv.g m s, tpenv
@@ -10583,7 +10585,7 @@ and TcAndBuildFixedExpr cenv env (overallPatTy, fixedExpr, overallExprTy, mBindi
 
         // let ptr : nativeptr = 
         //   let tmpArray : elem[] = arr
-        //   if nonNull tmpArray then
+        //   if notNull tmpArray then
         //      if tmpArray.Length <> 0 then
         //         let pinned tmpArrayByref : byref = &arr.[0]
         //         (nativeint) tmpArrayByref
diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs
index 8082b28ea74..a59bb4a779e 100644
--- a/src/fsharp/ast.fs
+++ b/src/fsharp/ast.fs
@@ -237,24 +237,32 @@ type
     | Double of double
     /// F# syntax: 'a'
     | Char of char
+
     /// F# syntax: 23.4M
     | Decimal of System.Decimal
+
     /// UserNum(value, suffix)
     ///
     /// F# syntax: 1Q, 1Z, 1R, 1N, 1G
     | UserNum of value:string * suffix:string
+
     /// F# syntax: verbatim or regular string, e.g. "abc"
+    /// May be null coming from parser in type provider instantiation but is always treated as an error.
     | String of text:string * range:range
+
     /// F# syntax: verbatim or regular byte string, e.g. "abc"B.
     ///
     /// Also used internally in the typechecker once an array of unit16 constants
     /// is detected, to allow more efficient processing of large arrays of uint16 constants.
     | Bytes of bytes:byte[] * range:range
+
     /// Used internally in the typechecker once an array of unit16 constants
     /// is detected, to allow more efficient processing of large arrays of uint16 constants.
     | UInt16s of uint16[]
+
     /// Old comment: "we never iterate, so the const here is not another SynConst.Measure"
     | Measure of constant:SynConst * SynMeasure
+
     member c.Range dflt =
         match c with
         | SynConst.String (_,m0) | SynConst.Bytes (_,m0) -> m0
@@ -470,6 +478,9 @@ and
     /// For the dimensionless units i.e. 1 , and static parameters to provided types
     | StaticConstant of constant:SynConst * range:range
 
+    /// F# syntax : nul used in parameters to type providers
+    | StaticConstantNull of range:range
+
     /// F# syntax : const expr, used in static parameters to type providers
     | StaticConstantExpr of expr:SynExpr * range:range
 
@@ -492,6 +503,7 @@ and
         | SynType.Anon (range=m)
         | SynType.WithGlobalConstraints (range=m)
         | SynType.StaticConstant (range=m)
+        | SynType.StaticConstantNull (range=m)
         | SynType.StaticConstantExpr (range=m)
         | SynType.StaticConstantNamed (range=m)
         | SynType.HashConstraint (range=m)
diff --git a/src/fsharp/fsi/console.fs b/src/fsharp/fsi/console.fs
index 620798784cb..55c5f38dba9 100644
--- a/src/fsharp/fsi/console.fs
+++ b/src/fsharp/fsi/console.fs
@@ -58,13 +58,13 @@ type internal History() =
         match line with 
         | null | "" -> ()
         | _ ->
-            list.Add(nonNull line)  // TODO NULLNESS: explicit instantiation shouldn't be needed
+            list.Add(nonNull line)  // TODO NULLNESS: explicit instantiation shouldn't be needed
 
     member x.AddLast (line: string?) =  // TODO NULLNESS: explicit type annotation shouldn't be needed
         match line with 
         | null | "" -> ()
         | _ ->
-            list.Add(nonNull line) // TODO NULLNESS: explicit instantiation shouldn't be needed
+            list.Add(nonNull line) // TODO NULLNESS: explicit instantiation shouldn't be needed
             current <- list.Count
 
     member x.Previous() = 
diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs
index b2df5102032..fbab81d84b1 100644
--- a/src/fsharp/fsi/fsi.fs
+++ b/src/fsharp/fsi/fsi.fs
@@ -350,9 +350,10 @@ type internal FsiValuePrinter(fsi: FsiEvaluationSessionHostConfig, g: TcGlobals,
                                    match obj with 
                                    | null -> None 
                                    | _ when aty.IsAssignableFrom(obj.GetType())  ->  
-                                       match printer obj with 
+                                       let text = printer obj
+                                       match box text with 
                                        | null -> None
-                                       | s -> Some (wordL (TaggedTextOps.tagText s)) 
+                                       | _ -> Some (wordL (TaggedTextOps.tagText text)) 
                                    | _ -> None)
                                    
                          | Choice2Of2 (aty: System.Type, converter) -> 
@@ -1612,7 +1613,7 @@ module internal MagicAssemblyResolution =
         { new System.IDisposable with 
              member x.Dispose() = () }
 #else
-        let ResolveAssembly (ctok, m, tcConfigB, tcImports: TcImports, fsiDynamicCompiler: FsiDynamicCompiler, fsiConsoleOutput: FsiConsoleOutput, fullAssemName:string) = 
+        let ResolveAssembly (ctok, m, tcConfigB, tcImports: TcImports, fsiDynamicCompiler: FsiDynamicCompiler, fsiConsoleOutput: FsiConsoleOutput, fullAssemName:string) : Assembly? = 
 
            try 
                // Grab the name of the assembly
@@ -1733,17 +1734,17 @@ type internal FsiStdinLexerProvider
         let initialLightSyntaxStatus = tcConfigB.light <> Some false
         LightSyntaxStatus (initialLightSyntaxStatus, false (* no warnings *))
 
-    let LexbufFromLineReader (fsiStdinSyphon: FsiStdinSyphon) readf = 
+    let LexbufFromLineReader (fsiStdinSyphon: FsiStdinSyphon) (readf: unit -> string?) = 
         UnicodeLexing.FunctionAsLexbuf 
           (fun (buf: char[], start, len) -> 
             //fprintf fsiConsoleOutput.Out "Calling ReadLine\n"
             let inputOption = try Some(readf()) with :? EndOfStreamException -> None
-            inputOption |> Option.iter (fun t -> fsiStdinSyphon.Add (t + "\n"))
+            inputOption |> Option.iter (fun t -> fsiStdinSyphon.Add ((match t with null -> "" | NullChecked s -> s) + "\n"))
             match inputOption with 
             |  Some(null) | None -> 
                  if !progress then fprintfn fsiConsoleOutput.Out "End of file from TextReader.ReadLine"
                  0
-            | Some (input:string) ->
+            | Some (NullChecked input) ->
                 let input  = input + "\n" 
                 let ninput = input.Length 
                 if ninput > len then fprintf fsiConsoleOutput.Error  "%s" (FSIstrings.SR.fsiLineTooLong())
@@ -1757,7 +1758,11 @@ type internal FsiStdinLexerProvider
     // Reading stdin as a lex stream
     //----------------------------------------------------------------------------
 
+#if BUILDING_WITH_LKG
     let removeZeroCharsFromString (str:string) = (* bug://4466 *)
+#else
+    let removeZeroCharsFromString (str:string?) : string? = (* bug://4466 *)
+#endif
         if str<>null && str.Contains("\000") then
           System.String(str |> Seq.filter (fun c -> c<>'\000') |> Seq.toArray)
         else
diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs
index fa780e8248b..c00ad80d26f 100644
--- a/src/fsharp/import.fs
+++ b/src/fsharp/import.fs
@@ -31,7 +31,7 @@ type AssemblyLoader =
     /// Get a flag indicating if an assembly is a provided assembly, plus the
     /// table of information recording remappings from type names in the provided assembly to type
     /// names in the statically linked, embedded assembly.
-    abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted -> bool * ProvidedAssemblyStaticLinkingMap option
+    abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted< ProvidedAssembly? > -> bool * ProvidedAssemblyStaticLinkingMap option
 
     /// Record a root for a [] type to help guide static linking & type relocation
     abstract RecordGeneratedTypeRoot : ProviderGeneratedType -> unit
@@ -346,17 +346,17 @@ let rec ImportProvidedType (env:ImportMap) (m:range) (* (tinst:TypeInst) *) (st:
 
 /// Import a provided method reference as an Abstract IL method reference
 let ImportProvidedMethodBaseAsILMethodRef (env:ImportMap) (m:range) (mbase: Tainted) = 
-     let tref = ExtensionTyping.GetILTypeRefOfProvidedType (mbase.PApply((fun mbase -> mbase.DeclaringType),m), m)
+     let tref = ExtensionTyping.GetILTypeRefOfProvidedType (mbase.PApply((fun mbase -> nonNull mbase.DeclaringType),m), m)
 
      let mbase = 
          // Find the formal member corresponding to the called member
          match mbase.OfType() with 
          | Some minfo when 
-                    minfo.PUntaint((fun minfo -> minfo.IsGenericMethod|| minfo.DeclaringType.IsGenericType),m) -> 
-                let declaringType = minfo.PApply((fun minfo -> minfo.DeclaringType),m)
+                    minfo.PUntaint((fun minfo -> minfo.IsGenericMethod|| (nonNull minfo.DeclaringType).IsGenericType),m) -> 
+                let declaringType = minfo.PApply((fun minfo -> nonNull minfo.DeclaringType),m)
                 let declaringGenericTypeDefn =  
                     if declaringType.PUntaint((fun t -> t.IsGenericType),m) then 
-                        declaringType.PApply((fun declaringType -> declaringType.GetGenericTypeDefinition()),m)
+                        declaringType.PApply((fun t -> t.GetGenericTypeDefinition()),m)
                     else 
                         declaringType
                 let methods = declaringGenericTypeDefn.PApplyArray((fun x -> x.GetMethods()),"GetMethods",m) 
@@ -370,8 +370,8 @@ let ImportProvidedMethodBaseAsILMethodRef (env:ImportMap) (m:range) (mbase: Tain
                         error(NumberedError(FSComp.SR.etIncorrectProvidedMethod(ExtensionTyping.DisplayNameOfTypeProvider(minfo.TypeProvider, m),methodName,metadataToken,typeName), m))
          | _ -> 
          match mbase.OfType() with 
-         | Some cinfo when cinfo.PUntaint((fun x -> x.DeclaringType.IsGenericType),m) -> 
-                let declaringType = cinfo.PApply((fun x -> x.DeclaringType),m)
+         | Some cinfo when cinfo.PUntaint((fun x -> (nonNull x.DeclaringType).IsGenericType),m) -> 
+                let declaringType = cinfo.PApply((fun x -> nonNull x.DeclaringType),m)
                 let declaringGenericTypeDefn =  declaringType.PApply((fun x -> x.GetGenericTypeDefinition()),m)
                 // We have to find the uninstantiated formal signature corresponding to this instantiated constructor.
                 // Annoyingly System.Reflection doesn't give us a MetadataToken to compare on, so we have to look by doing
diff --git a/src/fsharp/import.fsi b/src/fsharp/import.fsi
index 02415e922f8..91034afce19 100644
--- a/src/fsharp/import.fsi
+++ b/src/fsharp/import.fsi
@@ -25,7 +25,7 @@ type AssemblyLoader =
     /// Get a flag indicating if an assembly is a provided assembly, plus the
     /// table of information recording remappings from type names in the provided assembly to type
     /// names in the statically linked, embedded assembly.
-    abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted -> bool * ProvidedAssemblyStaticLinkingMap option
+    abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted< ProvidedAssembly? > -> bool * ProvidedAssemblyStaticLinkingMap option
 
     /// Record a root for a [] type to help guide static linking & type relocation
     abstract RecordGeneratedTypeRoot : ProviderGeneratedType -> unit
diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs
index 4dfb59aee08..c58d4a2f8d0 100755
--- a/src/fsharp/infos.fs
+++ b/src/fsharp/infos.fs
@@ -62,7 +62,7 @@ let GetSuperTypeOfType g amap m ty =
 #if !NO_EXTENSIONTYPING
       | ProvidedTypeMetadata info -> 
         let st = info.ProvidedType
-        let superOpt = st.PApplyOption((fun st -> match st.BaseType with null -> None | t -> Some t),m)
+        let superOpt = st.PApplyOption((fun st -> match st.BaseType with null -> None | t -> Some (nonNull t)),m)
         match superOpt with 
         | None -> None
         | Some super -> Some(Import.ImportProvidedType amap m super)
@@ -416,7 +416,7 @@ type ValRef with
 let GetCompiledReturnTyOfProvidedMethodInfo amap m (mi:Tainted) =
     let returnType = 
         if mi.PUntaint((fun mi -> mi.IsConstructor),m) then  
-            mi.PApply((fun mi -> mi.DeclaringType),m)
+            mi.PApply((fun mi -> nonNull mi.DeclaringType),m)
         else mi.Coerce(m).PApply((fun mi -> mi.ReturnType),m)
     let ty = Import.ImportProvidedType amap m returnType
     if isVoidTy amap.g ty then None else Some ty
@@ -650,10 +650,10 @@ let OptionalArgInfoOfProvidedParameter (amap:Import.ImportMap) m (provParam : Ta
         NotOptional
 
 /// Compute the ILFieldInit for the given provided constant value for a provided enum type.
-let GetAndSanityCheckProviderMethod m (mi: Tainted<'T :> ProvidedMemberInfo>) (get : 'T -> ProvidedMethodInfo) err = 
-    match mi.PApply((fun mi -> (get mi :> ProvidedMethodBase)),m) with 
+let GetAndSanityCheckProviderMethod m (mi: Tainted<'T :> ProvidedMemberInfo>) (get : 'T -> ProvidedMethodInfo?) err = 
+    match mi.PApply((fun mi -> (get mi :> ProvidedMethodBase?)),m) with 
     | Tainted.Null -> error(Error(err(mi.PUntaint((fun mi -> mi.Name),m),mi.PUntaint((fun mi -> mi.DeclaringType.Name),m)),m))   
-    | meth -> meth
+    | Tainted.NonNull meth -> meth
 
 /// Try to get an arbitrary ProvidedMethodInfo associated with a property.
 let ArbitraryMethodInfoOfPropertyInfo (pi:Tainted) m =
@@ -909,7 +909,7 @@ type MethInfo =
         | DefaultStructCtor(_,ty) -> ty
 #if !NO_EXTENSIONTYPING
         | ProvidedMeth(amap,mi,_,m) -> 
-              Import.ImportProvidedType amap m (mi.PApply((fun mi -> mi.DeclaringType),m))
+              Import.ImportProvidedType amap m (mi.PApply((fun mi -> nonNull mi.DeclaringType),m))
 #endif
 
     /// Get the enclosing type of the method info, using a nominal type for tuple types
@@ -1358,7 +1358,7 @@ type MethInfo =
         | DefaultStructCtor _ -> []
 #if !NO_EXTENSIONTYPING
         | ProvidedMeth(amap,mi,_,m) -> 
-            if x.IsInstance then [ Import.ImportProvidedType amap m (mi.PApply((fun mi -> mi.DeclaringType),m)) ] // find the type of the 'this' argument
+            if x.IsInstance then [ Import.ImportProvidedType amap m (mi.PApply((fun mi -> nonNull mi.DeclaringType),m)) ] // find the type of the 'this' argument
             else []
 #endif
 
@@ -1535,7 +1535,7 @@ type MethInfo =
                     // For non-generic type providers there is no difference
                     let formalParams = 
                         [ [ for p in mi.PApplyArray((fun mi -> mi.GetParameters()), "GetParameters", m) do 
-                                let paramName = p.PUntaint((fun p -> match p.Name with null -> None | s -> Some s),m)
+                                let paramName = p.PUntaint((fun p -> match p.Name with "" -> None | s -> Some s),m)
                                 let paramType = Import.ImportProvidedType amap m (p.PApply((fun p -> p.ParameterType),m))
                                 let isIn, isOut,isOptional = p.PUntaint((fun p -> p.IsIn, p.IsOut, p.IsOptional),m)
                                 yield TSlotParam(paramName, paramType, isIn, isOut, isOptional, []) ] ]
@@ -1563,12 +1563,12 @@ type MethInfo =
                 [ [for p in mi.PApplyArray((fun mi -> mi.GetParameters()), "GetParameters", m) do 
                         let pname = 
                             match p.PUntaint((fun p -> p.Name), m) with
-                            | null -> None
+                            | "" -> None
                             | name -> Some (mkSynId m name)
                         let pty =
                             match p.PApply((fun p -> p.ParameterType), m) with
                             | Tainted.Null ->  amap.g.unit_ty
-                            | parameterType -> Import.ImportProvidedType amap m parameterType
+                            | Tainted.NonNull parameterType -> Import.ImportProvidedType amap m parameterType
                         yield ParamNameAndType(pname,pty) ] ]
 
 #endif
@@ -1617,7 +1617,7 @@ type ILFieldInfo =
         match x with 
         | ILFieldInfo(tinfo,_) -> tinfo.ToType
 #if !NO_EXTENSIONTYPING
-        | ProvidedField(amap,fi,m) -> (Import.ImportProvidedType amap m (fi.PApply((fun fi -> fi.DeclaringType),m)))
+        | ProvidedField(amap,fi,m) -> (Import.ImportProvidedType amap m (fi.PApply((fun fi -> nonNull fi.DeclaringType),m)))
 #endif
 
     member x.ApparentEnclosingAppType = x.ApparentEnclosingType
@@ -1638,7 +1638,7 @@ type ILFieldInfo =
         match x with 
         | ILFieldInfo(tinfo,_) -> tinfo.ILTypeRef
 #if !NO_EXTENSIONTYPING
-        | ProvidedField(amap,fi,m) -> (Import.ImportProvidedTypeAsILType amap m (fi.PApply((fun fi -> fi.DeclaringType),m))).TypeRef
+        | ProvidedField(amap,fi,m) -> (Import.ImportProvidedTypeAsILType amap m (fi.PApply((fun fi -> nonNull fi.DeclaringType),m))).TypeRef
 #endif
     
      /// Get the scope used to interpret IL metadata
@@ -1907,7 +1907,7 @@ type PropInfo =
         | FSProp(_,ty,_,_) -> ty
 #if !NO_EXTENSIONTYPING
         | ProvidedProp(amap,pi,m) -> 
-            Import.ImportProvidedType amap m (pi.PApply((fun pi -> pi.DeclaringType),m)) 
+            Import.ImportProvidedType amap m (pi.PApply((fun pi -> nonNull pi.DeclaringType),m)) 
 #endif
 
     /// Get the enclosing type of the method info, using a nominal type for tuple types
@@ -2155,7 +2155,7 @@ type PropInfo =
 #if !NO_EXTENSIONTYPING
         | ProvidedProp (_,pi,m) -> 
             [ for p in pi.PApplyArray((fun pi -> pi.GetIndexParameters()), "GetIndexParameters", m) do
-                let paramName = p.PUntaint((fun p -> match p.Name with null -> None | s -> Some (mkSynId m s)), m)
+                let paramName = p.PUntaint((fun p -> match p.Name with "" -> None | s -> Some (mkSynId m s)), m)
                 let paramType = Import.ImportProvidedType amap m (p.PApply((fun p -> p.ParameterType), m))
                 yield ParamNameAndType(paramName, paramType) ]
 #endif
@@ -2322,7 +2322,7 @@ type EventInfo =
         | ILEvent ileinfo -> ileinfo.ApparentEnclosingType 
         | FSEvent (_,p,_,_) -> p.ApparentEnclosingType
 #if !NO_EXTENSIONTYPING
-        | ProvidedEvent (amap,ei,m) -> Import.ImportProvidedType amap m (ei.PApply((fun ei -> ei.DeclaringType),m)) 
+        | ProvidedEvent (amap,ei,m) -> Import.ImportProvidedType amap m (ei.PApply((fun ei -> nonNull ei.DeclaringType),m)) 
 #endif
     /// Get the enclosing type of the method info, using a nominal type for tuple types
     member x.ApparentEnclosingAppType = 
diff --git a/src/fsharp/lex.fsl b/src/fsharp/lex.fsl
index 62fea65c296..26a776d714e 100644
--- a/src/fsharp/lex.fsl
+++ b/src/fsharp/lex.fsl
@@ -75,9 +75,7 @@ let parseOctalUInt64 (s:string) p l =
     parse p 0UL
 
 let removeUnderscores (s:string) =
-    match s with
-    | null -> null
-    | s -> s.Replace("_", "")
+    s.Replace("_", "")
 
 let parseInt32 (s:string) = 
     let s = removeUnderscores s
diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy
index 9a30b9bc9fc..af7983b6db8 100644
--- a/src/fsharp/pars.fsy
+++ b/src/fsharp/pars.fsy
@@ -4579,7 +4579,7 @@ atomType:
 
   | NULL
      { let m = rhs parseState 1
-       SynType.StaticConstant(SynConst.String (null, m), m) }
+       SynType.StaticConstantNull(m) }
 
   | CONST atomicExpr
      {  let e,_ = $2
diff --git a/src/fsharp/service/QuickParse.fs b/src/fsharp/service/QuickParse.fs
index 9e851fef05f..02d84ab143c 100644
--- a/src/fsharp/service/QuickParse.fs
+++ b/src/fsharp/service/QuickParse.fs
@@ -68,8 +68,11 @@ module QuickParse =
       | true, _, true when name.Length > 2 -> isValidStrippedName (name.Substring(1, name.Length - 2)) 0
       | _ -> false
     
-    let GetCompleteIdentifierIslandImpl (lineStr: string) (index: int) : (string * int * bool) option =
-        if index < 0 || isNull lineStr || index >= lineStr.Length then None 
+    let GetCompleteIdentifierIslandImpl (lineStr: string?) (index: int) : (string * int * bool) option =
+        match lineStr with 
+        | null -> None
+        | NullChecked lineStr -> 
+        if index < 0 || index >= lineStr.Length then None 
         else
             let fixup =
                 match () with
@@ -176,9 +179,11 @@ module QuickParse =
     let private defaultName = [], ""
 
     /// Get the partial long name of the identifier to the left of index.
-    let GetPartialLongName(lineStr: string, index: int) =
-        if isNull lineStr then defaultName
-        elif index < 0 then defaultName
+    let GetPartialLongName(lineStr: string?, index: int) =
+        match lineStr with
+        | null -> defaultName
+        | NullChecked lineStr ->
+        if index < 0 then defaultName
         elif index >= lineStr.Length then defaultName
         else
             let IsIdentifierPartCharacter pos = IsIdentifierPartCharacter lineStr.[pos]
@@ -215,9 +220,11 @@ module QuickParse =
 
     /// Get the partial long name of the identifier to the left of index.
     /// For example, for `System.DateTime.Now` it returns PartialLongName ([|"System"; "DateTime"|], "Now", Some 32), where "32" pos of the last dot.
-    let GetPartialLongNameEx(lineStr: string, index: int) : PartialLongName =
-        if isNull lineStr then PartialLongName.Empty(index)
-        elif index < 0 then PartialLongName.Empty(index)
+    let GetPartialLongNameEx(lineStr: string?, index: int) : PartialLongName =
+        match lineStr with
+        | null -> PartialLongName.Empty(index)
+        | NullChecked lineStr ->
+        if index < 0 then PartialLongName.Empty(index)
         elif index >= lineStr.Length then PartialLongName.Empty(index)
         else
             let IsIdentifierPartCharacter pos = IsIdentifierPartCharacter lineStr.[pos]
diff --git a/src/fsharp/service/QuickParse.fsi b/src/fsharp/service/QuickParse.fsi
index 7857f94d4cc..9cc321ab48d 100644
--- a/src/fsharp/service/QuickParse.fsi
+++ b/src/fsharp/service/QuickParse.fsi
@@ -69,14 +69,14 @@ module public QuickParse =
     /// a call to `DeclItemsForNamesAtPosition` for intellisense. This will
     /// allow us to use find the correct qualified items rather than resorting
     /// to the more expensive and less accurate environment lookup.
-    val GetCompleteIdentifierIsland : tolerateJustAfter: bool -> tokenText: string -> index: int -> (string * int * bool) option
+    val GetCompleteIdentifierIsland : tolerateJustAfter: bool -> lineStr: string? -> index: int -> (string * int * bool) option
     
     /// Get the partial long name of the identifier to the left of index.
-    val GetPartialLongName : lineStr: string * index: int -> (string list * string)
+    val GetPartialLongName : lineStr: string? * index: int -> (string list * string)
     
     /// Get the partial long name of the identifier to the left of index.
     /// For example, for `System.DateTime.Now` it returns PartialLongName ([|"System"; "DateTime"|], "Now", Some 32), where "32" pos of the last dot.
-    val GetPartialLongNameEx : lineStr: string * index: int -> PartialLongName
+    val GetPartialLongNameEx : lineStr: string? * index: int -> PartialLongName
     
     /// Tests whether the user is typing something like "member x." or "override (*comment*) x."
     val TestMemberOrOverrideDeclaration : tokens: FSharpTokenInfo[] -> bool
\ No newline at end of file
diff --git a/src/fsharp/service/ServiceDeclarationLists.fs b/src/fsharp/service/ServiceDeclarationLists.fs
index d85f7c74f30..95ddbcf7530 100644
--- a/src/fsharp/service/ServiceDeclarationLists.fs
+++ b/src/fsharp/service/ServiceDeclarationLists.fs
@@ -180,7 +180,7 @@ module internal DescriptionListsImpl =
                 |> Array.map (fun sp -> 
                     let ty = Import.ImportProvidedType amap m (sp.PApply((fun x -> x.ParameterType),m))
                     let spKind = NicePrint.prettyLayoutOfType denv ty
-                    let spName = sp.PUntaint((fun sp -> sp.Name), m)
+                    let spName = sp.PUntaint((fun sp -> nonNull sp.Name), m)
                     let spOpt = sp.PUntaint((fun sp -> sp.IsOptional), m)
                     FSharpMethodGroupItemParameter(
                       name = spName,
diff --git a/src/fsharp/service/ServiceParamInfoLocations.fs b/src/fsharp/service/ServiceParamInfoLocations.fs
index e0e9affd2d5..8c74a4c4b82 100755
--- a/src/fsharp/service/ServiceParamInfoLocations.fs
+++ b/src/fsharp/service/ServiceParamInfoLocations.fs
@@ -33,7 +33,10 @@ module internal NoteworthyParamInfoLocationsImpl =
 
     let isStaticArg a =
         match a with
-        | SynType.StaticConstant _ | SynType.StaticConstantExpr _ | SynType.StaticConstantNamed _ -> true
+        | SynType.StaticConstant _ 
+        | SynType.StaticConstantNull _ 
+        | SynType.StaticConstantExpr _ 
+        | SynType.StaticConstantNamed _ -> true
         | SynType.LongIdent _ -> true // NOTE: this is not a static constant, but it is a prefix of incomplete code, e.g. "TP<42, Arg3" is a prefix of "TP<42, Arg3=6>" and Arg3 shows up as a LongId
         | _ -> false
 
diff --git a/src/fsharp/service/service.fs b/src/fsharp/service/service.fs
index 82a4f51e553..0c2d3a5c34c 100644
--- a/src/fsharp/service/service.fs
+++ b/src/fsharp/service/service.fs
@@ -1667,9 +1667,11 @@ module internal Parser =
                     // If there was a loadClosure, replay the errors and warnings from resolution, excluding parsing
                     loadClosure.LoadClosureRootFileDiagnostics |> List.iter diagnosticSink
             
-                    let fileOfBackgroundError err = (match GetRangeOfDiagnostic (fst err) with Some m-> m.FileName | None -> null)
+                    let fileOfBackgroundError err = match GetRangeOfDiagnostic (fst err) with Some m-> Some m.FileName | None -> None
                     let sameFile file hashLoadInFile = 
-                        (0 = String.Compare(hashLoadInFile, file, StringComparison.OrdinalIgnoreCase))
+                        match file with 
+                        | None -> false
+                        | Some file -> (0 = String.Compare(hashLoadInFile, file, StringComparison.OrdinalIgnoreCase))
             
                     //  walk the list of #loads and keep the ones for this file.
                     let hashLoadsInFile = 
@@ -3239,7 +3241,7 @@ type FSharpChecker(legacyReferenceResolver, projectCacheSize, keepAssemblyConten
     member ic.GetParsingOptionsFromCommandLineArgs(initialSourceFiles, argv, ?isInteractive) =
         let isInteractive = defaultArg isInteractive false
         use errorScope = new ErrorScope()
-        let tcConfigBuilder = TcConfigBuilder.Initial
+        let tcConfigBuilder = TcConfigBuilder.Initial(legacyReferenceResolver)
 
         // Apply command-line arguments and collect more source files if they are in the arguments
         let sourceFilesNew = ApplyCommandLineArgs(tcConfigBuilder, initialSourceFiles, argv)
diff --git a/src/fsharp/tainted.fs b/src/fsharp/tainted.fs
index 5d43f463900..ec63955c1e3 100644
--- a/src/fsharp/tainted.fs
+++ b/src/fsharp/tainted.fs
@@ -126,12 +126,13 @@ type internal Tainted<'T> (context : TaintedContext, value : 'T) =
         let u = this.Protect (fun x -> f (x,context.TypeProvider)) range
         Tainted(context, u)
 
-    member this.PApplyArray(f,methodName,range:range) =        
-        let a = this.Protect f range
+    member this.PApplyArray(f, methodName, range:range) =        
+        let a : 'U[]? = this.Protect f range
         match a with 
-        |   null -> raise <| TypeProviderError(FSComp.SR.etProviderReturnedNull(methodName), this.TypeProviderDesignation, range)
-        |   _ -> a |> Array.map (fun u -> Tainted(context,u))
-
+        | null -> raise <| TypeProviderError(FSComp.SR.etProviderReturnedNull(methodName), this.TypeProviderDesignation, range)
+        | _ -> 
+            let a = nonNull a
+            a |> Array.map (fun u -> Tainted(context,u))  // TODO NULLNESS: this use of nonNull should not be needed
 
     member this.PApplyOption(f,range:range) =        
         let a = this.Protect f range
@@ -140,7 +141,9 @@ type internal Tainted<'T> (context : TaintedContext, value : 'T) =
         | Some x -> Some (Tainted(context,x))
 
     member this.PUntaint(f,range:range) = this.Protect f range
+
     member this.PUntaintNoFailure f = this.PUntaint(f, range0)
+
     /// Access the target object directly. Use with extreme caution.
     member this.AccessObjectDirectly = value
 
@@ -157,8 +160,9 @@ type internal Tainted<'T> (context : TaintedContext, value : 'T) =
         Tainted(context, this.Protect(fun value -> box value :?> 'U) range)
 
 module internal Tainted =
-    let (|Null|_|) (p:Tainted<'T>) =
-        if p.PUntaintNoFailure(fun p -> match p with null -> true | _ -> false) then Some() else None
+
+    let (|Null|NonNull|) (p:Tainted< 'T? >) : Choice> when 'T : not null =
+        if p.PUntaintNoFailure isNull then Null else NonNull (p.PApplyNoFailure nonNull)
 
     let Eq (p:Tainted<'T>) (v:'T) = p.PUntaintNoFailure((fun pv -> pv = v))
 
diff --git a/src/fsharp/tainted.fsi b/src/fsharp/tainted.fsi
index 228efbf606f..c8ca1f1f8a8 100644
--- a/src/fsharp/tainted.fsi
+++ b/src/fsharp/tainted.fsi
@@ -72,7 +72,7 @@ type internal Tainted<'T> =
     member PApplyWithProvider : ('T * ITypeProvider -> 'U) * range:range -> Tainted<'U>
 
     /// Apply an operation that returns an array. Unwrap array. Any exception will be attributed to the type provider with an error located at the given range.  String is method name of thing-returning-array, to diagnostically attribute if it is null
-    member PApplyArray : ('T -> 'U[]) * string * range:range -> Tainted<'U>[]
+    member PApplyArray : ('T -> 'U[]?) * string * range:range -> Tainted<'U>[]
 
     /// Apply an operation that returns an option. Unwrap option. Any exception will be attributed to the type provider with an error located at the given range
     member PApplyOption : ('T -> 'U option) * range:range -> Tainted<'U> option
@@ -96,7 +96,7 @@ type internal Tainted<'T> =
 module internal Tainted =
 
     /// Test whether the tainted value is null
-    val (|Null|_|) : Tainted<'T> -> unit option when 'T : null
+    val (|Null|NonNull|) : Tainted< 'T? > -> Choice> when 'T : not null and 'T : not struct
 
     /// Test whether the tainted value equals given value. 
     /// Failure in call to equality operation will be blamed on type provider of first operand
diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs
index 22ceb8d9b84..ca0e5b52027 100644
--- a/src/fsharp/tast.fs
+++ b/src/fsharp/tast.fs
@@ -510,6 +510,7 @@ let ComputeDefinitionLocationOfProvidedItem (p : Tainted<#IProvidedCustomAttribu
     match attrs with
     | None | Some (null, _, _) -> None
     | Some (filePath, line, column) -> 
+        let filePath = nonNull filePath   // TODO NULLNESS: this use of nonNull should not be needed
         // Coordinates from type provider are 1-based for lines and columns
         // Coordinates internally in the F# compiler are 1-based for lines and 0-based for columns
         let pos = Range.mkPos line (max 0 (column - 1)) 
@@ -1965,7 +1966,7 @@ and Construct =
         let lazyBaseTy = 
             LazyWithContext.Create 
                 ((fun (m,objTy) -> 
-                      let baseSystemTy = st.PApplyOption((fun st -> match st.BaseType with null -> None | ty -> Some ty), m)
+                      let baseSystemTy = st.PApplyOption((fun st -> match st.BaseType with null -> None | ty -> Some (nonNull ty)), m)
                       match baseSystemTy with 
                       | None -> objTy 
                       | Some t -> importProvidedType t), 
@@ -3080,7 +3081,7 @@ and
             let rec tryResolveNestedTypeOf(parentEntity:Entity,resolutionEnvironment,st:Tainted,i) = 
                 match st.PApply((fun st -> st.GetNestedType path.[i]),m) with
                 | Tainted.Null -> ValueNone
-                | st -> 
+                | Tainted.NonNull st -> 
                     let newEntity = Construct.NewProvidedTycon(resolutionEnvironment, st, ccu.ImportProvidedType, false, m)
                     parentEntity.ModuleOrNamespaceType.AddProvidedTypeEntity(newEntity)
                     if i = path.Length-1 then ValueSome(newEntity)
@@ -3111,12 +3112,15 @@ and
                 assert (j <= path.Length - 1)
                 let matched = 
                     [ for resolver in resolvers  do
-                        let moduleOrNamespace = if j = 0 then null else path.[0..j-1]
+                        let moduleOrNamespace = if j = 0 then [| |] else path.[0..j-1]
                         let typename = path.[j]
                         let resolution = ExtensionTyping.TryLinkProvidedType(resolver,moduleOrNamespace,typename,m)
                         match resolution with
-                        | None | Some (Tainted.Null) -> ()
-                        | Some st -> yield (resolver,st) ]
+                        | None -> ()
+                        | Some st -> 
+                            match st with
+                            | Tainted.Null -> ()
+                            | Tainted.NonNull st -> yield (resolver,st) ]
                 match matched with
                 | [(_,st)] ->
                     // 'entity' is at position i in the dereference chain. We resolved to position 'j'.
@@ -3916,10 +3920,10 @@ and Nullness =
        | Known info -> info
        | Variable v -> v.Evaluate()
 
-   //member n.TryEvaluate() = 
-   //    match n with 
-   //    | Known info -> Some info
-   //    | Variable v -> v.TryEvaluate()
+   member n.TryEvaluate() = 
+       match n with 
+       | Known info -> ValueSome info
+       | Variable v -> v.TryEvaluate()
 
    override n.ToString() = match n.Evaluate() with NullnessInfo.WithNull -> "?"  | NullnessInfo.WithoutNull -> "" | NullnessInfo.AmbivalentToNull -> "%"
 
@@ -3932,10 +3936,10 @@ and NullnessVar() =
        | None -> NullnessInfo.WithoutNull
        | Some soln -> soln.Evaluate()
 
-    //member nv.TryEvaluate() = 
-    //   match solution with 
-    //   | None -> None
-    //   | Some soln -> soln.TryEvaluate()
+    member nv.TryEvaluate() = 
+       match solution with 
+       | None -> ValueNone
+       | Some soln -> soln.TryEvaluate()
 
     member nv.IsSolved = solution.IsSome
 
@@ -4093,7 +4097,7 @@ and [] AnonRecdTypeInfo =
         x.Stamp <- d.Stamp
         x.SortedNames <- sortedNames
 
-    member x.IsLinked = (match x.SortedIds with null -> true | _ -> false)
+    member x.IsLinked = (match box x.SortedIds with null -> true | _ -> false)
     
 and [] TupInfo = 
     /// Some constant, e.g. true or false for tupInfo
@@ -4209,8 +4213,12 @@ and CcuReference =  string // ILAssemblyRef
 and 
     []
     CcuThunk = 
-    { mutable target: CcuData
-
+    { 
+#if BUILDING_WITH_LKG
+      mutable target: CcuData
+#else
+      mutable target: CcuData?
+#endif
       /// ccu.orphanfixup is true when a reference is missing in the transitive closure of static references that
       /// may potentially be required for the metadata of referenced DLLs. It is set to true if the "loader"
       /// used in the F# metadata-deserializer or the .NET metadata reader returns a failing value (e.g. None).
@@ -4220,12 +4228,22 @@ and
 
       name: CcuReference  }
 
+#if BUILDING_WITH_LKG
     member ccu.Deref = 
-        if isNull (ccu.target :> obj) || ccu.orphanfixup then 
+        if isNull (box ccu.target) || ccu.orphanfixup then 
             raise(UnresolvedReferenceNoRange ccu.name)
         ccu.target
+
+    member ccu.IsUnresolvedReference = isNull (box ccu.target) || ccu.orphanfixup
+#else
+    member ccu.Deref = 
+        if isNull ccu.target || ccu.orphanfixup then 
+            raise(UnresolvedReferenceNoRange ccu.name)
+        nonNull ccu.target
+
+    member ccu.IsUnresolvedReference = isNull ccu.target || ccu.orphanfixup
+#endif
    
-    member ccu.IsUnresolvedReference = isNull (ccu.target :> obj) || ccu.orphanfixup
 
     /// Ensure the ccu is derefable in advance. Supply a path to attach to any resulting error message.
     member ccu.EnsureDerefable(requiringPath:string[]) = 
@@ -5460,6 +5478,16 @@ let addNullnessToTy (nullness: Nullness) (ty:TType) =
     //| TType_anon _ -> None // TODO NULLNESS
     | _ -> ty
 
+let replaceNullnessOfTy nullness (ty:TType) =
+    match ty with
+    | TType_var (tp, _nullnessOrig) -> TType_var (tp, nullness)
+    | TType_app (tcr, tinst, _nullnessOrig) -> TType_app (tcr, tinst, nullness)
+    | TType_fun (d, r, _nullnessOrig) -> TType_fun (d, r, nullness)
+    //| TType_ucase _ -> None // TODO NULLNESS
+    //| TType_tuple _ -> None // TODOTODO NULLNESS
+    //| TType_anon _ -> None // TODO NULLNESS
+    | _ -> ty
+
 let rec stripTyparEqnsAux nullness0 canShortcut ty = 
     match ty with 
     | TType_var (r, nullness) -> 
diff --git a/src/utils/CompilerLocationUtils.fs b/src/utils/CompilerLocationUtils.fs
index 95f1dfe4287..4c19789b092 100644
--- a/src/utils/CompilerLocationUtils.fs
+++ b/src/utils/CompilerLocationUtils.fs
@@ -106,7 +106,7 @@ module internal FSharpEnvironment =
                         let mutable cbData = maxDataLength;
 
 #if BUILDING_WITH_LKG
-                        let res = RegQueryValueExW(hkey, null, 0u, &uType, pathResult, &cbData); // TODO use of nonNull should not be required
+                        let res = RegQueryValueExW(hkey, null, 0u, &uType, pathResult, &cbData);
 #else
                         let res = RegQueryValueExW(hkey, nonNull null, 0u, &uType, pathResult, &cbData); // TODO use of nonNull should not be required
 #endif
diff --git a/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs b/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs
index c1494b9081a..e1cafe9ec01 100644
--- a/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs
+++ b/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs
@@ -149,7 +149,6 @@ namespace ProviderImplementation.ProvidedTypes
         /// Internal code of .NET expects the obj[] returned by GetCustomAttributes to be an Attribute[] even in the case of empty arrays
         let emptyAttributes = (([| |]: Attribute[]) |> box |> unbox)
 
-        let nonNull str x = if isNull x then failwithf "Null in '%s', stacktrace = '%s'" str Environment.StackTrace else x
         let nonNone str x = match x with None -> failwithf "No value has been specified for '%s', stacktrace = '%s'" str Environment.StackTrace | Some v -> v
         let patchOption v f = match v with None -> f() | Some _ -> failwithf "Already patched, stacktrace = '%s'" Environment.StackTrace 
 
diff --git a/tests/fsharp/core/nullness/test.fsx b/tests/fsharp/core/nullness/test.fsx
index 65c401dac01..b2588eaa77d 100644
--- a/tests/fsharp/core/nullness/test.fsx
+++ b/tests/fsharp/core/nullness/test.fsx
@@ -6,14 +6,15 @@ open System.Runtime.CompilerServices
 //let f<'T when 'T : not struct> (x: 'T?) = 1
 
 module Basics = 
-    let x1 : string = null // Expected to give a nullability warning
+    let x1 : string = null // ** Expected to give a nullability warning
     let x2 : string? = null // Should not give a nullability warning
     let x3 : string? = "a" // Should not give a nullability warning
     let x4 : string = "" // Should not give a nullability warning
 
     let x5 = nonNull "" // Should not give a nullability warning
-    let x6 = nonNull< string? > "" // QUESTION: should this give a nullability warning due to (T?)?  Should there be a non-null constraint?
+    let x6 = nonNull< string? > "" // **Expected to give a nullability warning
     let x7 = nonNull ""
+    let _x7 : string = x7
     let x8 = nonNull Array.empty
     let x9 = nonNull [| "" |]
     let x10 = nonNullV (Nullable(3))
@@ -22,13 +23,17 @@ module Basics =
     let x13 = nullV
     let x14 = withNullV 6L
     let x15 : string? = withNull x4
+    let x15a : string? = withNull ""
+    let x15b : string? = withNull x4
+    let x15c : string? = withNull< string? > x4 // **Expected to give a nullability warning
     let x16 : Nullable = withNullV 3
     
-    let y0 = isNull null // QUESTION: gives a nullability warning due to 'obj' being the default. This seems ok
+    let y0 = isNull null // Should not give a nullability warning (obj)
     let y1 = isNull (null: obj?) // Should not give a nullability warning
-    let y2 = isNull "" // Should not give a nullability warning
-    let y9 = isNull "" // Should not give a nullability warning
-    let y10 = isNull< string? > "" // QUESTION: should this give a nullability warning due to (T?)?  Should there be a non-null constraint?
+    let y1b = isNull (null: string?) // Should not give a nullability warning
+    let y2 = isNull "" // **Expected to give a nullability warning - type instantiation of a nullable type is non-nullable string
+    let y9 = isNull "" // **Expected to give a nullability warning - type instantiation of a nullable type is non-nullable string
+    let y10 = isNull< string? > "" // Should not give a nullability warning.
 
 module NotNullConstraint =
     let f3 (x: 'T when 'T : not null) = 1
diff --git a/tests/service/data/TestTP/ProvidedTypes.fs b/tests/service/data/TestTP/ProvidedTypes.fs
index 51cdb0bddd0..323df18d426 100644
--- a/tests/service/data/TestTP/ProvidedTypes.fs
+++ b/tests/service/data/TestTP/ProvidedTypes.fs
@@ -50,7 +50,7 @@ module internal Misc =
     let isEmpty s = s = ExpectedStackState.Empty
     let isAddress s = s = ExpectedStackState.Address
 
-    let nonNull str x = if x=null then failwith ("Null in " + str) else x
+    let failIfNull str x = if x=null then failwith ("Null in " + str) else x
     
     let notRequired opname item = 
         let msg = sprintf "The operation '%s' on item '%s' should not be called on provided type, member or parameter" opname item
@@ -651,7 +651,7 @@ type ProvidedConstructor(parameters : ProvidedParameter list) =
     override __.GetParameters() = parameters |> List.toArray 
     override __.Attributes = ctorAttributes
     override __.Name = if isStatic() then ".cctor" else ".ctor"
-    override __.DeclaringType = declaringType |> nonNull "ProvidedConstructor.DeclaringType"                                   
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedConstructor.DeclaringType"                                   
     override __.IsDefined(_attributeType, _inherit) = true 
 
     override __.Invoke(_invokeAttr, _binder, _parameters, _culture)      = notRequired "Invoke" (nameText())
@@ -737,7 +737,7 @@ type ProvidedMethod(methodName: string, parameters: ProvidedParameter list, retu
     override __.GetParameters() = argParams |> Array.ofList
     override __.Attributes = methodAttrs
     override __.Name = methodName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedMethod.DeclaringType"                                   
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedMethod.DeclaringType"                                   
     override __.IsDefined(_attributeType, _inherit) : bool = true
     override __.MemberType = MemberTypes.Method
     override __.CallingConvention = 
@@ -820,7 +820,7 @@ type ProvidedProperty(propertyName: string, propertyType: Type, ?parameters: Pro
     override __.CanWrite = hasSetter()
     override __.GetValue(_obj, _invokeAttr, _binder, _index, _culture) : obj = notRequired "GetValue" propertyName
     override __.Name = propertyName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedProperty.DeclaringType"
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedProperty.DeclaringType"
     override __.MemberType : MemberTypes = MemberTypes.Property
 
     override __.ReflectedType                                     = notRequired "ReflectedType" propertyName
@@ -874,7 +874,7 @@ type ProvidedEvent(eventName:string,eventHandlerType:Type) =
     override __.GetRemoveMethod _nonPublic = remover.Force() :> MethodInfo
     override __.Attributes = EventAttributes.None
     override __.Name = eventName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedEvent.DeclaringType"
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedEvent.DeclaringType"
     override __.MemberType : MemberTypes = MemberTypes.Event
 
     override __.GetRaiseMethod _nonPublic                      = notRequired "GetRaiseMethod" eventName
@@ -909,7 +909,7 @@ type ProvidedLiteralField(fieldName:string,fieldType:Type,literalValue:obj) =
     override __.GetRawConstantValue()  = literalValue
     override __.Attributes = FieldAttributes.Static ||| FieldAttributes.Literal ||| FieldAttributes.Public
     override __.Name = fieldName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedLiteralField.DeclaringType"
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedLiteralField.DeclaringType"
     override __.MemberType : MemberTypes = MemberTypes.Field
 
     override __.ReflectedType                                     = notRequired "ReflectedType" fieldName
@@ -948,7 +948,7 @@ type ProvidedField(fieldName:string,fieldType:Type) =
     override __.GetRawConstantValue()  = null
     override __.Attributes = fieldAttrs
     override __.Name = fieldName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedField.DeclaringType"
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedField.DeclaringType"
     override __.MemberType : MemberTypes = MemberTypes.Field
 
     override __.ReflectedType                                     = notRequired "ReflectedType" fieldName
diff --git a/vsintegration/src/FSharp.VS.FSI/sessions.fs b/vsintegration/src/FSharp.VS.FSI/sessions.fs
index 35744a899e9..394730c39f0 100644
--- a/vsintegration/src/FSharp.VS.FSI/sessions.fs
+++ b/vsintegration/src/FSharp.VS.FSI/sessions.fs
@@ -247,8 +247,6 @@ let fsiStartInfo channelName =
     procInfo
 
 
-let nonNull = function null -> false | (s:string) -> true
-
 /// Represents an active F# Interactive process to which Visual Studio is connected via stdin/stdout/stderr and a remoting channel
 type FsiSession() = 
     let randomSalt = System.Random()
@@ -328,9 +326,9 @@ type FsiSession() =
 
     member x.SendInput (str: string) = inputQueue.Post(str)
 
-    member x.Output      = Observable.filter nonNull fsiOutput.Publish
+    member x.Output      = Observable.filter (isNull >> not) fsiOutput.Publish
 
-    member x.Error       = Observable.filter nonNull fsiError.Publish
+    member x.Error       = Observable.filter (isNull >> not) fsiError.Publish
 
     member x.Exited      = (cmdProcess.Exited |> Observable.map id)
 
diff --git a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fs b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fs
index f01c8bdac18..bf318be647d 100644
--- a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fs
+++ b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/ProvidedTypes.fs
@@ -596,7 +596,7 @@ module internal Misc =
     let isEmpty s = s = ExpectedStackState.Empty
     let isAddress s = s = ExpectedStackState.Address
 
-    let nonNull str x = if x=null then failwith ("Null in " + str) else x
+    let failIfNull str x = if x=null then failwith ("Null in " + str) else x
     
     let notRequired opname item = 
         let msg = sprintf "The operation '%s' on item '%s' should not be called on provided type, member or parameter" opname item
@@ -844,7 +844,7 @@ type ProvidedConstructor(parameters : ProvidedParameter list) =
     override __.GetParameters() = parameters |> List.toArray 
     override __.Attributes = ctorAttributes
     override __.Name = if isStatic() then ".cctor" else ".ctor"
-    override __.DeclaringType = declaringType |> nonNull "ProvidedConstructor.DeclaringType"                                   
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedConstructor.DeclaringType"                                   
     override __.IsDefined(_attributeType, _inherit) = true 
 
     override __.Invoke(_invokeAttr, _binder, _parameters, _culture)      = notRequired "Invoke" (nameText())
@@ -930,7 +930,7 @@ type ProvidedMethod(methodName: string, parameters: ProvidedParameter list, retu
     override __.GetParameters() = argParams |> Array.ofList
     override __.Attributes = methodAttrs
     override __.Name = methodName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedMethod.DeclaringType"                                   
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedMethod.DeclaringType"                                   
     override __.IsDefined(_attributeType, _inherit) : bool = true
     override __.MemberType = MemberTypes.Method
     override __.CallingConvention = 
@@ -1013,7 +1013,7 @@ type ProvidedProperty(propertyName: string, propertyType: Type, ?parameters: Pro
     override __.CanWrite = hasSetter()
     override __.GetValue(_obj, _invokeAttr, _binder, _index, _culture) : obj = notRequired "GetValue" propertyName
     override __.Name = propertyName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedProperty.DeclaringType"
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedProperty.DeclaringType"
     override __.MemberType : MemberTypes = MemberTypes.Property
 
     override __.ReflectedType                                     = notRequired "ReflectedType" propertyName
@@ -1067,7 +1067,7 @@ type ProvidedEvent(eventName:string,eventHandlerType:Type) =
     override __.GetRemoveMethod _nonPublic = remover.Force() :> MethodInfo
     override __.Attributes = EventAttributes.None
     override __.Name = eventName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedEvent.DeclaringType"
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedEvent.DeclaringType"
     override __.MemberType : MemberTypes = MemberTypes.Event
 
     override __.GetRaiseMethod _nonPublic                      = notRequired "GetRaiseMethod" eventName
@@ -1102,7 +1102,7 @@ type ProvidedLiteralField(fieldName:string,fieldType:Type,literalValue:obj) =
     override __.GetRawConstantValue()  = literalValue
     override __.Attributes = FieldAttributes.Static ||| FieldAttributes.Literal ||| FieldAttributes.Public
     override __.Name = fieldName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedLiteralField.DeclaringType"
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedLiteralField.DeclaringType"
     override __.MemberType : MemberTypes = MemberTypes.Field
 
     override __.ReflectedType                                     = notRequired "ReflectedType" fieldName
@@ -1141,7 +1141,7 @@ type ProvidedField(fieldName:string,fieldType:Type) =
     override __.GetRawConstantValue()  = null
     override __.Attributes = fieldAttrs
     override __.Name = fieldName
-    override __.DeclaringType = declaringType |> nonNull "ProvidedField.DeclaringType"
+    override __.DeclaringType = declaringType |> failIfNull "ProvidedField.DeclaringType"
     override __.MemberType : MemberTypes = MemberTypes.Field
 
     override __.ReflectedType                                     = notRequired "ReflectedType" fieldName

From 81d147e7217e18c304b61a5a3d0a89646fd8d3c7 Mon Sep 17 00:00:00 2001
From: Don Syme 
Date: Tue, 13 Nov 2018 23:46:42 +0000
Subject: [PATCH 022/137] simplify diff

---
 src/absil/ilread.fs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs
index 7e863e7cae4..643faaaf00f 100644
--- a/src/absil/ilread.fs
+++ b/src/absil/ilread.fs
@@ -895,14 +895,14 @@ type GenericParamsIdx = GenericParamsIdx of int * TypeOrMethodDefTag * int
 
 let mkCacheInt32 lowMem _inbase _nm _sz  =
     if lowMem then (fun f x -> f x) else
-    let cache = ref Unchecked.defaultof<_> 
+    let cache : Dictionary<_,_>? ref = ref null 
     let count = ref 0
 #if STATISTICS
     addReport (fun oc -> if !count <> 0 then oc.WriteLine ((_inbase + string !count + " "+ _nm + " cache hits")  : string))
 #endif
     fun f (idx:int32) ->
         let cache = 
-            match box !cache with
+            match !cache with
             | null -> cache :=  new Dictionary(11)
             | _ -> ()
             !cache
@@ -918,14 +918,14 @@ let mkCacheInt32 lowMem _inbase _nm _sz  =
 
 let mkCacheGeneric lowMem _inbase _nm _sz  =
     if lowMem then (fun f x -> f x) else
-    let cache = ref Unchecked.defaultof<_>
+    let cache : Dictionary<_,_>? ref = ref null 
     let count = ref 0
 #if STATISTICS
     addReport (fun oc -> if !count <> 0 then oc.WriteLine ((_inbase + string !count + " " + _nm + " cache hits") : string))
 #endif
     fun f (idx :'T) ->
         let cache = 
-            match box !cache with
+            match !cache with
             | null -> cache := new Dictionary<_, _>(11 (* sz:int *) ) 
             | _ -> ()
             !cache

From 70be98137340b60e76c69509419351ecbe67b786 Mon Sep 17 00:00:00 2001
From: Don Syme 
Date: Tue, 13 Nov 2018 23:52:39 +0000
Subject: [PATCH 023/137] simplify diff

---
 src/absil/ilreflect.fs           | 8 ++++----
 src/fsharp/AccessibilityLogic.fs | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs
index 7e68ce3338a..7bbb4be1e80 100644
--- a/src/absil/ilreflect.fs
+++ b/src/absil/ilreflect.fs
@@ -1297,9 +1297,9 @@ let rec emitInstr cenv (modB : ModuleBuilder) emEnv (ilG:ILGenerator) instr =
                 else
 #endif
 #if BUILDING_WITH_LKG
-                    modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, (null:Type), Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) 
+                    modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, null, Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) 
 #else
-                    modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, (null:Type?), Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) 
+                    modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, null, Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) 
 #endif
             ilG.EmitAndLog(OpCodes.Call, meth)
 
@@ -1309,9 +1309,9 @@ let rec emitInstr cenv (modB : ModuleBuilder) emEnv (ilG:ILGenerator) instr =
         else 
             let aty = convType cenv emEnv  (ILType.Array(shape, ty)) 
 #if BUILDING_WITH_LKG
-            let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, (null:Type), Array.create shape.Rank (typeof))
+            let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, null, Array.create shape.Rank (typeof))
 #else
-            let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, (null:Type?), Array.create shape.Rank (typeof))
+            let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, null, Array.create shape.Rank (typeof))
 #endif
             ilG.EmitAndLog(OpCodes.Newobj, meth)
 
diff --git a/src/fsharp/AccessibilityLogic.fs b/src/fsharp/AccessibilityLogic.fs
index 551d3c324f6..93a5fd894cd 100644
--- a/src/fsharp/AccessibilityLogic.fs
+++ b/src/fsharp/AccessibilityLogic.fs
@@ -81,8 +81,7 @@ let private IsILMemberAccessible g amap m (tcrefOfViewedItem : TyconRef) ad acce
                 match tcrefViewedFromOption with 
                 | None -> false
                 | Some tcrefViewedFrom ->
-                    let tcrefViewedFromTy = generalizedTyOfTyconRef g tcrefViewedFrom
-                    ExistsHeadTypeInEntireHierarchy  g amap m tcrefViewedFromTy tcrefOfViewedItem)     
+                    ExistsHeadTypeInEntireHierarchy  g amap m (generalizedTyOfTyconRef g tcrefViewedFrom) tcrefOfViewedItem)     
 
             let accessibleByInternalsVisibleTo = 
                 (access = ILMemberAccess.Assembly || access = ILMemberAccess.FamilyOrAssembly) && 
@@ -94,8 +93,7 @@ let private IsILMemberAccessible g amap m (tcrefOfViewedItem : TyconRef) ad acce
                 match tcrefViewedFromOption with 
                 | None -> false
                 | Some tcrefViewedFrom ->
-                    let tcrefViewedFromTy = generalizedTyOfTyconRef g tcrefViewedFrom
-                    ExistsHeadTypeInEntireHierarchy  g amap m tcrefViewedFromTy tcrefOfViewedItem    
+                    ExistsHeadTypeInEntireHierarchy  g amap m (generalizedTyOfTyconRef g tcrefViewedFrom) tcrefOfViewedItem    
 
             (access = ILMemberAccess.Public) || accessibleByFamily || accessibleByInternalsVisibleTo || accessibleByFamilyAndAssembly
 
@@ -329,7 +327,7 @@ let IsPropInfoAccessible g amap m ad = function
     | ProvidedProp (amap, tppi, m) as pp-> 
         let access = 
             let a = tppi.PUntaint((fun ppi -> 
-                let tryGetILAccessForProvidedMethodBase (mi : ProvidedMethodInfo?) = 
+                let tryGetILAccessForProvidedMethodBase (mi : ProvidedMethodInfo?) = // TODO NULLNESS: using ProvidedMethodBase? gives a nullness warning
                     match mi with
                     | null -> None
                     | NullChecked mi -> Some(ComputeILAccess mi.IsPublic mi.IsFamily mi.IsFamilyOrAssembly mi.IsFamilyAndAssembly)

From bc3b5f5a5909f442b11533ae9e06c86d40bdc5b5 Mon Sep 17 00:00:00 2001
From: Don Syme 
Date: Wed, 14 Nov 2018 12:35:52 +0000
Subject: [PATCH 024/137] check nulls on this pointer

---
 src/absil/illib.fs                    | 15 ++++++++---
 src/absil/ilread.fs                   | 33 ++++++++++++++++++-----
 src/fsharp/CompileOps.fs              |  8 +++---
 src/fsharp/ConstraintSolver.fs        |  6 ++++-
 src/fsharp/ErrorLogger.fs             |  4 ++-
 src/fsharp/ExtensionTyping.fs         | 22 ++++++++++++---
 src/fsharp/FSharp.Build/Fsc.fs        | 39 ++++++++++++++++++++++-----
 src/fsharp/FSharp.Core/prim-types.fs  |  8 ++++++
 src/fsharp/FSharp.Core/prim-types.fsi | 16 ++++++++---
 src/fsharp/MethodCalls.fs             |  4 +--
 src/fsharp/TypeRelations.fs           |  2 +-
 src/fsharp/fsi/fsi.fs                 | 11 +++++---
 src/fsharp/infos.fs                   |  4 +--
 src/fsharp/lib.fs                     | 11 +++++---
 src/fsharp/tast.fs                    | 23 +++++++++-------
 tests/fsharp/core/nullness/test.fsx   | 10 +++++++
 16 files changed, 166 insertions(+), 50 deletions(-)

diff --git a/src/absil/illib.fs b/src/absil/illib.fs
index 41a5397aff9..4a6083f198e 100644
--- a/src/absil/illib.fs
+++ b/src/absil/illib.fs
@@ -1241,24 +1241,33 @@ module Shim =
             member __.IsInvalidPathShim(path: string) = 
 #if BUILDING_WITH_LKG
                 let isInvalidPath(p:string) = 
+                    String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidPathChars()) <> -1
 #else
                 let isInvalidPath(p:string?) = 
+                    match p with 
+                    | null | "" -> true
+                    | NullChecked p -> p.IndexOfAny(Path.GetInvalidPathChars()) <> -1
 #endif
-                    String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidPathChars()) <> -1
 
 #if BUILDING_WITH_LKG
                 let isInvalidFilename(p:string) = 
+                    String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1
 #else
                 let isInvalidFilename(p:string?) = 
+                    match p with 
+                    | null | "" -> true
+                    | NullChecked p -> p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1
 #endif
-                    String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1
 
 #if BUILDING_WITH_LKG
                 let isInvalidDirectory(d:string) = 
+                    d=null || d.IndexOfAny(Path.GetInvalidPathChars()) <> -1
 #else
                 let isInvalidDirectory(d:string?) = 
+                    match d with 
+                    | null -> true
+                    | NullChecked d -> d.IndexOfAny(Path.GetInvalidPathChars()) <> -1
 #endif
-                    d=null || d.IndexOfAny(Path.GetInvalidPathChars()) <> -1
 
                 isInvalidPath (path) || 
                 let directory = Path.GetDirectoryName(path)
diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs
index 643faaaf00f..6afd456cc1b 100644
--- a/src/absil/ilread.fs
+++ b/src/absil/ilread.fs
@@ -895,7 +895,11 @@ type GenericParamsIdx = GenericParamsIdx of int * TypeOrMethodDefTag * int
 
 let mkCacheInt32 lowMem _inbase _nm _sz  =
     if lowMem then (fun f x -> f x) else
+#if BUILDING_WITH_LKG
+    let cache = ref null 
+#else
     let cache : Dictionary<_,_>? ref = ref null 
+#endif
     let count = ref 0
 #if STATISTICS
     addReport (fun oc -> if !count <> 0 then oc.WriteLine ((_inbase + string !count + " "+ _nm + " cache hits")  : string))
@@ -903,9 +907,15 @@ let mkCacheInt32 lowMem _inbase _nm _sz  =
     fun f (idx:int32) ->
         let cache = 
             match !cache with
-            | null -> cache :=  new Dictionary(11)
-            | _ -> ()
-            !cache
+            | null -> 
+                let c = new Dictionary(11)
+                cache :=  c
+                c
+#if BUILDING_WITH_LKG
+            | c -> c 
+#else
+            | NullChecked c -> c 
+#endif
         let mutable res = Unchecked.defaultof<_>
         let ok = cache.TryGetValue(idx, &res)
         if ok then 
@@ -918,7 +928,11 @@ let mkCacheInt32 lowMem _inbase _nm _sz  =
 
 let mkCacheGeneric lowMem _inbase _nm _sz  =
     if lowMem then (fun f x -> f x) else
+#if BUILDING_WITH_LKG
+    let cache = ref null 
+#else
     let cache : Dictionary<_,_>? ref = ref null 
+#endif
     let count = ref 0
 #if STATISTICS
     addReport (fun oc -> if !count <> 0 then oc.WriteLine ((_inbase + string !count + " " + _nm + " cache hits") : string))
@@ -926,9 +940,16 @@ let mkCacheGeneric lowMem _inbase _nm _sz  =
     fun f (idx :'T) ->
         let cache = 
             match !cache with
-            | null -> cache := new Dictionary<_, _>(11 (* sz:int *) ) 
-            | _ -> ()
-            !cache
+            | null -> 
+                let c = new Dictionary<_, _>(11) 
+                cache := c
+                c
+#if BUILDING_WITH_LKG
+            | c -> c
+#else
+            | NullChecked c -> c
+#endif
+
         match cache.TryGetValue(idx) with
         | true, v ->
             incr count
diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
index 3217d282c1f..9000fbc404a 100644
--- a/src/fsharp/CompileOps.fs
+++ b/src/fsharp/CompileOps.fs
@@ -4151,10 +4151,10 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
 
 #if !NO_EXTENSIONTYPING
     member tcImports.GetProvidedAssemblyInfo(ctok, m, assembly: Tainted< ProvidedAssembly? >) = 
-        let anameOpt = assembly.PUntaint((fun assembly -> match assembly with null -> None | a -> Some (a.GetName())), m)
-        match anameOpt with 
-        | None -> false, None
-        | Some aname -> 
+        match assembly with 
+        | Tainted.Null -> false,None
+        | Tainted.NonNull assembly -> 
+        let aname = assembly.PUntaint((fun a -> a.GetName()), m)
         let ilShortAssemName = aname.Name
         match tcImports.FindCcu (ctok, m, ilShortAssemName, lookupOnly=true) with 
         | ResolvedCcu ccu -> 
diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs
index 4cf2f54a13b..e8b8475fdc9 100644
--- a/src/fsharp/ConstraintSolver.fs
+++ b/src/fsharp/ConstraintSolver.fs
@@ -2288,12 +2288,16 @@ and CanMemberSigsMatchUpToCheck
                         else
                             return! ErrorD(Error (FSComp.SR.csMemberIsNotInstance(minfo.LogicalName), m))
                     else
-                        do! Iterate2D subsumeTypes calledObjArgTys callerObjArgTys
+                        // The object types must be non-null
+                        let nonNullCalledObjArgTys = calledObjArgTys |> List.map (replaceNullnessOfTy g.knownWithoutNull)
+                        do! Iterate2D subsumeTypes nonNullCalledObjArgTys callerObjArgTys
+
                 for argSet in calledMeth.ArgSets do
                     if argSet.UnnamedCalledArgs.Length <> argSet.UnnamedCallerArgs.Length then 
                         return! ErrorD(Error(FSComp.SR.csArgumentLengthMismatch(), m))
                     else
                         do! Iterate2D subsumeArg argSet.UnnamedCalledArgs argSet.UnnamedCallerArgs
+
                 match calledMeth.ParamArrayCalledArgOpt with
                 | Some calledArg ->
                     if isArray1DTy g calledArg.CalledArgumentType then 
diff --git a/src/fsharp/ErrorLogger.fs b/src/fsharp/ErrorLogger.fs
index 470e07f49cd..bcbb606e79d 100755
--- a/src/fsharp/ErrorLogger.fs
+++ b/src/fsharp/ErrorLogger.fs
@@ -627,10 +627,12 @@ let NewlineifyErrorString (message:string) = message.Replace(stringThatIsAProxyF
 /// which is decoded by the IDE with 'NewlineifyErrorString' back into newlines, so that multi-line errors can be displayed in QuickInfo
 #if BUILDING_WITH_LKG
 let NormalizeErrorString (text : string) =
+    if isNull text then nullArg "text"
 #else
 let NormalizeErrorString (text : string?) =
+    let text = nullArgCheck "text" text
 #endif
-    if isNull text then nullArg "text"
+
     let text = text.Trim()
 
     let buf = System.Text.StringBuilder()
diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs
index de1f73f2b39..bbda2cb37ab 100755
--- a/src/fsharp/ExtensionTyping.fs
+++ b/src/fsharp/ExtensionTyping.fs
@@ -614,8 +614,12 @@ module internal ExtensionTyping =
         member __.GetParameters() = x.GetParameters() |> ProvidedParameterInfo.CreateArray ctxt 
         member __.GetGenericArguments() = x.GetGenericArguments() |> ProvidedType.CreateArray ctxt
         member __.Handle = x
+
         static member TaintedGetHashCode (x:Tainted) =            
-           Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, st.DeclaringType.Assembly.FullName, st.DeclaringType.FullName))) 
+           Tainted.GetHashCodeTainted 
+               (x.PApplyNoFailure(fun st -> (st.Name, (nonNull (nonNull st.DeclaringType).Assembly).FullName, 
+                                                      (nonNull st.DeclaringType).FullName))) 
+
         static member TaintedEquals (pt1:Tainted, pt2:Tainted) = 
            Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle))
 
@@ -749,10 +753,16 @@ module internal ExtensionTyping =
             | _ -> xs |> Array.map (ProvidedPropertyInfo.CreateNonNull ctxt)
 
         member __.Handle = x
+
         override __.Equals y = assert false; match y with :? ProvidedPropertyInfo as y -> x.Equals y.Handle | _ -> false
+
         override __.GetHashCode() = assert false; x.GetHashCode()
+
         static member TaintedGetHashCode (x:Tainted) = 
-           Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, st.DeclaringType.Assembly.FullName, st.DeclaringType.FullName))) 
+           Tainted.GetHashCodeTainted
+               (x.PApplyNoFailure(fun st -> (st.Name, (nonNull (nonNull st.DeclaringType).Assembly).FullName, 
+                                                      (nonNull st.DeclaringType).FullName))) 
+
         static member TaintedEquals (pt1:Tainted, pt2:Tainted) = 
            Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle))
 
@@ -777,10 +787,16 @@ module internal ExtensionTyping =
             | _ -> xs |> Array.map (ProvidedEventInfo.CreateNonNull ctxt)
         
         member __.Handle = x
+
         override __.Equals y = assert false; match y with :? ProvidedEventInfo as y -> x.Equals y.Handle | _ -> false
+
         override __.GetHashCode() = assert false; x.GetHashCode()
+
         static member TaintedGetHashCode (x:Tainted) = 
-           Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, st.DeclaringType.Assembly.FullName, st.DeclaringType.FullName))) 
+           Tainted.GetHashCodeTainted 
+               (x.PApplyNoFailure(fun st -> (st.Name, (nonNull (nonNull st.DeclaringType).Assembly).FullName, 
+                                                      (nonNull st.DeclaringType).FullName))) 
+
         static member TaintedEquals (pt1:Tainted, pt2:Tainted) = 
            Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle))
 
diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs
index 53a24b08bef..3fdae5acd82 100644
--- a/src/fsharp/FSharp.Build/Fsc.fs
+++ b/src/fsharp/FSharp.Build/Fsc.fs
@@ -125,7 +125,13 @@ type public Fsc () as this =
             builder.AppendSwitch("-g")
         // DebugType
         builder.AppendSwitchIfNotNull("--debug:",
-            if debugType = null then null else
+            match debugType with 
+            | null -> null
+#if BUILDING_WITH_LKG
+            | debugType ->
+#else
+            | NullChecked debugType -> 
+#endif             
                 match debugType.ToUpperInvariant() with
                 | "NONE"     -> null
                 | "PORTABLE" -> "portable"
@@ -168,7 +174,7 @@ type public Fsc () as this =
 #if BUILDING_WITH_LKG
             let ToUpperInvariant (s:string) = if s = null then null else s.ToUpperInvariant()
 #else
-            let ToUpperInvariant (s:string?) = if s = null then null else s.ToUpperInvariant()
+            let ToUpperInvariant (s:string?) = match s with null -> null | NullChecked s -> s.ToUpperInvariant()
 #endif
             match ToUpperInvariant(platform), prefer32bit, ToUpperInvariant(targetType) with
                 | "ANYCPU", true, "EXE"
@@ -195,13 +201,24 @@ type public Fsc () as this =
         let referencePathArray = // create a array of strings
             match referencePath with
             | null -> null
-            | _ -> referencePath.Split([|';'; ','|], StringSplitOptions.RemoveEmptyEntries)
+#if BUILDING_WITH_LKG
+            | referencePath ->
+#else
+            | NullChecked referencePath ->
+#endif
+                 referencePath.Split([|';'; ','|], StringSplitOptions.RemoveEmptyEntries)
 
         builder.AppendSwitchIfNotNull("--lib:", referencePathArray, ",")   
 
         // TargetType
         builder.AppendSwitchIfNotNull("--target:", 
-            if targetType = null then null else
+            match targetType with 
+            | null -> null
+#if BUILDING_WITH_LKG
+            | targetType -> 
+#else
+            | NullChecked targetType -> 
+#endif            
                 match targetType.ToUpperInvariant() with
                 | "LIBRARY" -> "library"
                 | "EXE" -> "exe"
@@ -212,7 +229,12 @@ type public Fsc () as this =
         // NoWarn
         match disabledWarnings with
         | null -> ()
-        | _ -> builder.AppendSwitchIfNotNull("--nowarn:", disabledWarnings.Split([|' '; ';'; ','; '\r'; '\n'|], StringSplitOptions.RemoveEmptyEntries), ",")
+#if BUILDING_WITH_LKG
+        | disabledWarnings ->
+#else
+        | NullChecked disabledWarnings ->
+#endif
+            builder.AppendSwitchIfNotNull("--nowarn:", disabledWarnings.Split([|' '; ';'; ','; '\r'; '\n'|], StringSplitOptions.RemoveEmptyEntries), ",")
         
         // WarningLevel
         builder.AppendSwitchIfNotNull("--warn:", warningLevel)
@@ -239,7 +261,12 @@ type public Fsc () as this =
         // WarningsNotAsErrors
         match warningsNotAsErrors with
         | null -> ()
-        | _ -> builder.AppendSwitchIfNotNull("--warnaserror-:", warningsNotAsErrors.Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",")
+#if BUILDING_WITH_LKG
+        | warningsNotAsErrors ->
+#else
+        | NullChecked warningsNotAsErrors ->
+#endif
+            builder.AppendSwitchIfNotNull("--warnaserror-:", warningsNotAsErrors.Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",")
 
         // Win32ResourceFile
         builder.AppendSwitchIfNotNull("--win32res:", win32res)
diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs
index 518a49c94b7..dc3dfeda50e 100644
--- a/src/fsharp/FSharp.Core/prim-types.fs
+++ b/src/fsharp/FSharp.Core/prim-types.fs
@@ -3435,6 +3435,14 @@ namespace Microsoft.FSharp.Core
         let inline nullArg (argumentName:string) = 
             raise (new System.ArgumentNullException(argumentName))        
 
+#if !BUILDING_WITH_LKG
+        []
+        let inline nullArgCheck (argumentName:string) (value: 'T? when 'T : not struct) = 
+            match value with 
+            | null -> raise (new System.ArgumentNullException(argumentName))        
+            | _ ->  (# "" value : 'T #)
+#endif
+
         []
         []
         let inline invalidOp message = raise (System.InvalidOperationException(message))
diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi
index 4c4ffe233e2..5c4cc9cc642 100644
--- a/src/fsharp/FSharp.Core/prim-types.fsi
+++ b/src/fsharp/FSharp.Core/prim-types.fsi
@@ -2306,7 +2306,7 @@ namespace Microsoft.FSharp.Core
         /// The value to check.
         /// True when value is null, false otherwise.
         []
-        val inline nonNull : value: (('T)?) -> 'T when 'T : not struct
+        val inline nonNull : value: 'T? -> 'T when 'T : not struct
 
         /// Asserts that the value is non-null.
         /// The value to check.
@@ -2329,7 +2329,7 @@ namespace Microsoft.FSharp.Core
 
         /// Throw a System.Exception exception.
         /// The exception message.
-        /// The result value.
+        /// Never returns.
         []
         val inline failwith : message:string -> 'T 
 
@@ -2337,16 +2337,24 @@ namespace Microsoft.FSharp.Core
         /// the given argument name and message.
 /// The argument name. /// The exception message. - /// The result value. + /// Never returns. [] val inline invalidArg : argumentName:string -> message:string -> 'T /// Throw a System.ArgumentNullException exception /// The argument name. - /// The result value. + /// Never returns. [] val inline nullArg : argumentName:string -> 'T +#if !BUILDING_WITH_LKG + /// Throw a System.ArgumentNullException if the given value is null exception + /// The argument name. + /// The result value. + [] + val inline nullArgCheck : argumentName:string -> 'T? -> 'T when 'T : not struct +#endif + /// Throw a System.InvalidOperationException exception /// The exception message. /// The result value. diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs index 298cad9cf27..6a8a822fb58 100644 --- a/src/fsharp/MethodCalls.fs +++ b/src/fsharp/MethodCalls.fs @@ -693,7 +693,7 @@ let MakeMethInfoCall amap m minfo minst args = let isProp = false // not necessarily correct, but this is only used post-creflect where this flag is irrelevant let ilMethodRef = Import.ImportProvidedMethodBaseAsILMethodRef amap m mi let isConstructor = mi.PUntaint((fun c -> c.IsConstructor), m) - let valu = mi.PUntaint((fun c -> c.DeclaringType.IsValueType), m) + let valu = mi.PUntaint((fun c -> (nonNull c.DeclaringType).IsValueType), m) let actualTypeInst = [] // GENERIC TYPE PROVIDERS: for generics, we would have something here let actualMethInst = [] // GENERIC TYPE PROVIDERS: for generics, we would have something here let ilReturnTys = Option.toList (minfo.GetCompiledReturnTy(amap, m, [])) // GENERIC TYPE PROVIDERS: for generics, we would have more here @@ -1259,7 +1259,7 @@ module ProvidedMethodCalls = methInfoOpt, expr, exprty with | :? TypeProviderError as tpe -> - let typeName = mi.PUntaint((fun mb -> mb.DeclaringType.FullName), m) + let typeName = mi.PUntaint((fun mb -> (nonNull mb.DeclaringType).FullName), m) let methName = mi.PUntaint((fun mb -> mb.Name), m) raise( tpe.WithContext(typeName, methName) ) // loses original stack trace #endif diff --git a/src/fsharp/TypeRelations.fs b/src/fsharp/TypeRelations.fs index e2e257e225c..8dd490c035d 100755 --- a/src/fsharp/TypeRelations.fs +++ b/src/fsharp/TypeRelations.fs @@ -149,7 +149,7 @@ let ChooseTyparSolutionAndRange (g: TcGlobals) amap (tp:Typar) = | TyparConstraint.SupportsNull m -> addNullnessToTy KnownWithNull maxSoFar,m | TyparConstraint.NotSupportsNull m -> - maxSoFar,m // TODO: this doesn't force non-nullness + maxSoFar,m // NOTE: this doesn't "force" non-nullness, since it is the default choice in 'obj' or 'int' | TyparConstraint.SupportsComparison m -> join m g.mk_IComparable_ty,m | TyparConstraint.SupportsEquality m -> diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index fbab81d84b1..4c0ba636e0b 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -1763,10 +1763,13 @@ type internal FsiStdinLexerProvider #else let removeZeroCharsFromString (str:string?) : string? = (* bug://4466 *) #endif - if str<>null && str.Contains("\000") then - System.String(str |> Seq.filter (fun c -> c<>'\000') |> Seq.toArray) - else - str + match str with + | null -> str + | NullChecked str -> + if str.Contains("\000") then + System.String(str |> Seq.filter (fun c -> c<>'\000') |> Seq.toArray) + else + str let CreateLexerForLexBuffer (sourceFileName, lexbuf, errorLogger) = diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs index c58d4a2f8d0..783db6e146a 100755 --- a/src/fsharp/infos.fs +++ b/src/fsharp/infos.fs @@ -652,7 +652,7 @@ let OptionalArgInfoOfProvidedParameter (amap:Import.ImportMap) m (provParam : Ta /// Compute the ILFieldInit for the given provided constant value for a provided enum type. let GetAndSanityCheckProviderMethod m (mi: Tainted<'T :> ProvidedMemberInfo>) (get : 'T -> ProvidedMethodInfo?) err = match mi.PApply((fun mi -> (get mi :> ProvidedMethodBase?)),m) with - | Tainted.Null -> error(Error(err(mi.PUntaint((fun mi -> mi.Name),m),mi.PUntaint((fun mi -> mi.DeclaringType.Name),m)),m)) + | Tainted.Null -> error(Error(err(mi.PUntaint((fun mi -> mi.Name),m),mi.PUntaint((fun mi -> (nonNull mi.DeclaringType).Name),m)),m)) | Tainted.NonNull meth -> meth /// Try to get an arbitrary ProvidedMethodInfo associated with a property. @@ -662,7 +662,7 @@ let ArbitraryMethodInfoOfPropertyInfo (pi:Tainted) m = elif pi.PUntaint((fun pi -> pi.CanWrite), m) then GetAndSanityCheckProviderMethod m pi (fun pi -> pi.GetSetMethod()) FSComp.SR.etPropertyCanWriteButHasNoSetter else - error(Error(FSComp.SR.etPropertyNeedsCanWriteOrCanRead(pi.PUntaint((fun mi -> mi.Name),m),pi.PUntaint((fun mi -> mi.DeclaringType.Name),m)),m)) + error(Error(FSComp.SR.etPropertyNeedsCanWriteOrCanRead(pi.PUntaint((fun mi -> mi.Name),m),pi.PUntaint((fun mi -> (nonNull mi.DeclaringType).Name),m)),m)) #endif diff --git a/src/fsharp/lib.fs b/src/fsharp/lib.fs index 9b230be14a4..a26ab6b175e 100755 --- a/src/fsharp/lib.fs +++ b/src/fsharp/lib.fs @@ -24,7 +24,7 @@ let GetEnvInteger e dflt = match System.Environment.GetEnvironmentVariable(e) wi #if BUILDING_WITH_LKG let dispose (x:System.IDisposable) = match x with null -> () | x -> x.Dispose() #else -let dispose (x:System.IDisposable?) = match x with null -> () | x -> x.Dispose() +let dispose (x:System.IDisposable?) = match x with null -> () | NullChecked x -> x.Dispose() #endif type SaveAndRestoreConsoleEncoding () = @@ -468,8 +468,13 @@ module internal AsyncUtil = let postOrQueue (sc:SynchronizationContext?,cont) = #endif match sc with - | null -> ThreadPool.QueueUserWorkItem(fun _ -> cont res) |> ignore - | sc -> sc.Post((fun _ -> cont res), state=null) + | null -> ThreadPool.QueueUserWorkItem(fun _ -> cont res) |> ignore +#if BUILDING_WITH_LKG + | sc -> +#else + | NullChecked sc -> +#endif + sc.Post((fun _ -> cont res), state=null) // Run continuations outside the lock match grabbedConts with diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index a6385f8b3cb..c39571e36f4 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -1981,6 +1981,8 @@ and Construct = let baseType = st.BaseType match baseType with | null -> false + | NullChecked x -> + match x with | x when x.IsGenericType -> false | x when x.DeclaringType <> null -> false | x -> x.FullName = "System.Delegate" || x.FullName = "System.MulticastDelegate"), m)) @@ -5478,16 +5480,6 @@ let addNullnessToTy (nullness: Nullness) (ty:TType) = //| TType_anon _ -> None // TODO NULLNESS | _ -> ty -let replaceNullnessOfTy nullness (ty:TType) = - match ty with - | TType_var (tp, _nullnessOrig) -> TType_var (tp, nullness) - | TType_app (tcr, tinst, _nullnessOrig) -> TType_app (tcr, tinst, nullness) - | TType_fun (d, r, _nullnessOrig) -> TType_fun (d, r, nullness) - //| TType_ucase _ -> None // TODO NULLNESS - //| TType_tuple _ -> None // TODOTODO NULLNESS - //| TType_anon _ -> None // TODO NULLNESS - | _ -> ty - let rec stripTyparEqnsAux nullness0 canShortcut ty = match ty with | TType_var (r, nullness) -> @@ -5518,6 +5510,17 @@ let rec stripTyparEqnsAux nullness0 canShortcut ty = let stripTyparEqns ty = stripTyparEqnsAux KnownWithoutNull false ty let stripUnitEqns unt = stripUnitEqnsAux false unt +let replaceNullnessOfTy nullness (ty:TType) = + match stripTyparEqns ty with + | TType_var (tp, _nullnessOrig) -> TType_var (tp, nullness) + | TType_app (tcr, tinst, _nullnessOrig) -> TType_app (tcr, tinst, nullness) + | TType_fun (d, r, _nullnessOrig) -> TType_fun (d, r, nullness) + //| TType_ucase _ -> None // TODO NULLNESS + //| TType_tuple _ -> None // TODOTODO NULLNESS + //| TType_anon _ -> None // TODO NULLNESS + | sty -> sty + + //--------------------------------------------------------------------------- // These make local/non-local references to values according to whether // the item is globally stable ("published") or not. diff --git a/tests/fsharp/core/nullness/test.fsx b/tests/fsharp/core/nullness/test.fsx index b2588eaa77d..01caaed0472 100644 --- a/tests/fsharp/core/nullness/test.fsx +++ b/tests/fsharp/core/nullness/test.fsx @@ -45,6 +45,16 @@ module NotNullConstraint = f3 (Some 1) // Expect to give an error #endif +module MemberBasics = + type C() = + member x.P = 1 + member x.M() = 1 + + let c : C? = C() + let v1 = c.P // Expected to give a warning + let v2 = c.M() // Expected to give a warning + let f1 = c.M // Expected to give a warning + module Basics2 = let f1 () = null // val f : unit -> 'a when 'a : null From 92db74c07f0ee04ba7574d45cc86fa4f1485fc82 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 14 Nov 2018 14:51:01 +0000 Subject: [PATCH 025/137] NullChecked --> NonNull --- src/absil/illib.fs | 6 +++--- src/absil/ilread.fs | 4 ++-- src/absil/ilreflect.fs | 2 +- src/fsharp/AccessibilityLogic.fs | 2 +- src/fsharp/CompileOps.fs | 2 +- src/fsharp/ExtensionTyping.fs | 26 +++++++++++++------------- src/fsharp/FSharp.Build/Fsc.fs | 12 ++++++------ src/fsharp/FSharp.Core/prim-types.fs | 26 ++++++++++++++++++-------- src/fsharp/FSharp.Core/prim-types.fsi | 22 +++++++++++++++++----- src/fsharp/MethodCalls.fs | 2 +- src/fsharp/fsi/fsi.fs | 6 +++--- src/fsharp/lib.fs | 4 ++-- src/fsharp/service/QuickParse.fs | 6 +++--- src/fsharp/tast.fs | 2 +- 14 files changed, 72 insertions(+), 50 deletions(-) diff --git a/src/absil/illib.fs b/src/absil/illib.fs index 4a6083f198e..a8a90ad360c 100644 --- a/src/absil/illib.fs +++ b/src/absil/illib.fs @@ -1246,7 +1246,7 @@ module Shim = let isInvalidPath(p:string?) = match p with | null | "" -> true - | NullChecked p -> p.IndexOfAny(Path.GetInvalidPathChars()) <> -1 + | NonNull p -> p.IndexOfAny(Path.GetInvalidPathChars()) <> -1 #endif #if BUILDING_WITH_LKG @@ -1256,7 +1256,7 @@ module Shim = let isInvalidFilename(p:string?) = match p with | null | "" -> true - | NullChecked p -> p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1 + | NonNull p -> p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1 #endif #if BUILDING_WITH_LKG @@ -1266,7 +1266,7 @@ module Shim = let isInvalidDirectory(d:string?) = match d with | null -> true - | NullChecked d -> d.IndexOfAny(Path.GetInvalidPathChars()) <> -1 + | NonNull d -> d.IndexOfAny(Path.GetInvalidPathChars()) <> -1 #endif isInvalidPath (path) || diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index 6afd456cc1b..5c89bcd9fe5 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -914,7 +914,7 @@ let mkCacheInt32 lowMem _inbase _nm _sz = #if BUILDING_WITH_LKG | c -> c #else - | NullChecked c -> c + | NonNull c -> c #endif let mutable res = Unchecked.defaultof<_> let ok = cache.TryGetValue(idx, &res) @@ -947,7 +947,7 @@ let mkCacheGeneric lowMem _inbase _nm _sz = #if BUILDING_WITH_LKG | c -> c #else - | NullChecked c -> c + | NonNull c -> c #endif match cache.TryGetValue(idx) with diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs index 7bbb4be1e80..3616bc9a09f 100644 --- a/src/absil/ilreflect.fs +++ b/src/absil/ilreflect.fs @@ -833,7 +833,7 @@ let convMethodRef cenv emEnv (parentTI:Type) (mref:ILMethodRef) : MethodInfo = #if BUILDING_WITH_LKG | _ -> res #else - | NullChecked res -> res + | NonNull res -> res #endif //---------------------------------------------------------------------------- diff --git a/src/fsharp/AccessibilityLogic.fs b/src/fsharp/AccessibilityLogic.fs index 93a5fd894cd..2472642cb66 100644 --- a/src/fsharp/AccessibilityLogic.fs +++ b/src/fsharp/AccessibilityLogic.fs @@ -330,7 +330,7 @@ let IsPropInfoAccessible g amap m ad = function let tryGetILAccessForProvidedMethodBase (mi : ProvidedMethodInfo?) = // TODO NULLNESS: using ProvidedMethodBase? gives a nullness warning match mi with | null -> None - | NullChecked mi -> Some(ComputeILAccess mi.IsPublic mi.IsFamily mi.IsFamilyOrAssembly mi.IsFamilyAndAssembly) + | NonNull mi -> Some(ComputeILAccess mi.IsPublic mi.IsFamily mi.IsFamilyOrAssembly mi.IsFamilyAndAssembly) match tryGetILAccessForProvidedMethodBase(ppi.GetGetMethod()) with | None -> tryGetILAccessForProvidedMethodBase(ppi.GetSetMethod()) diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 9000fbc404a..717dee27d05 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -4402,7 +4402,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti runtimeAssemblyAttributes |> List.choose (TryDecodeTypeProviderAssemblyAttr (defaultArg ilGlobalsOpt EcmaMscorlibILGlobals)) // If no design-time assembly is specified, use the runtime assembly - |> List.map (function null -> fileNameOfRuntimeAssembly | NullChecked s -> s) + |> List.map (function null -> fileNameOfRuntimeAssembly | NonNull s -> s) // For each simple name of a design-time assembly, we take the first matching one in the order they are // specified in the attributes |> List.distinctBy (fun s -> try Path.GetFileNameWithoutExtension(s) with _ -> s) diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs index bbda2cb37ab..10d93baa336 100755 --- a/src/fsharp/ExtensionTyping.fs +++ b/src/fsharp/ExtensionTyping.fs @@ -278,7 +278,7 @@ module internal ExtensionTyping = let ValidateNamespaceName(name, typeProvider:Tainted, m, nsp:string?) = match nsp with | null -> () - | NullChecked nsp -> + | NonNull nsp -> if String.IsNullOrWhiteSpace nsp then // Empty namespace is not allowed errorR(Error(FSComp.SR.etEmptyNamespaceOfTypeNotAllowed(name, typeProvider.PUntaint((fun tp -> tp.GetType().Name), m)), m)) @@ -448,7 +448,7 @@ module internal ExtensionTyping = static member Create ctxt x : ProvidedType? = match x with | null -> null - | NullChecked t -> ProvidedType (t, ctxt) + | NonNull t -> ProvidedType (t, ctxt) static member CreateNonNull ctxt x = ProvidedType (x, ctxt) @@ -567,7 +567,7 @@ module internal ExtensionTyping = static member Create ctxt (x: ParameterInfo?) : ProvidedParameterInfo? = match x with | null -> null - | NullChecked x -> ProvidedParameterInfo (x, ctxt) + | NonNull x -> ProvidedParameterInfo (x, ctxt) static member CreateNonNull ctxt x = ProvidedParameterInfo (x, ctxt) @@ -676,7 +676,7 @@ module internal ExtensionTyping = static member Create ctxt x : ProvidedFieldInfo? = match x with | null -> null - | NullChecked x -> ProvidedFieldInfo (x, ctxt) + | NonNull x -> ProvidedFieldInfo (x, ctxt) static member CreateArray ctxt xs : ProvidedFieldInfo[] = match box xs with @@ -715,7 +715,7 @@ module internal ExtensionTyping = static member Create ctxt (x: MethodInfo?) : ProvidedMethodInfo? = match x with | null -> null - | NullChecked x -> ProvidedMethodInfo (x, ctxt) + | NonNull x -> ProvidedMethodInfo (x, ctxt) static member CreateArray ctxt (xs: MethodInfo[]?) : ProvidedMethodInfo[] = match box xs with @@ -745,7 +745,7 @@ module internal ExtensionTyping = static member Create ctxt x : ProvidedPropertyInfo? = match x with | null -> null - | NullChecked x -> ProvidedPropertyInfo (x, ctxt) + | NonNull x -> ProvidedPropertyInfo (x, ctxt) static member CreateArray ctxt xs : ProvidedPropertyInfo[] = match box xs with @@ -779,7 +779,7 @@ module internal ExtensionTyping = static member Create ctxt x : ProvidedEventInfo? = match x with | null -> null - | NullChecked x -> ProvidedEventInfo (x, ctxt) + | NonNull x -> ProvidedEventInfo (x, ctxt) static member CreateArray ctxt xs : ProvidedEventInfo[] = match box xs with @@ -809,7 +809,7 @@ module internal ExtensionTyping = static member Create ctxt (x: ConstructorInfo?) : ProvidedConstructorInfo? = match x with | null -> null - | NullChecked x -> ProvidedConstructorInfo (x, ctxt) + | NonNull x -> ProvidedConstructorInfo (x, ctxt) static member CreateArray ctxt xs : ProvidedConstructorInfo[] = match box xs with @@ -1037,7 +1037,7 @@ module internal ExtensionTyping = if name <> expectedName then raise (TypeProviderError(FSComp.SR.etProvidedTypeHasUnexpectedName(expectedName, name), st.TypeProviderDesignation, m)) - let namespaceName = TryTypeMember<_, (string?)>(st, name, "Namespace", m, withNull "", fun st -> st.Namespace) |> unmarshal // TODO NULLNESS: why is this explicit instantiation needed? + let namespaceName = TryTypeMember<_, (string?)>(st, name, "Namespace", m, "", fun st -> st.Namespace) |> unmarshal // TODO NULLNESS: why is this explicit instantiation needed? let rec declaringTypes (st:Tainted) accu = match TryTypeMember(st, name, "DeclaringType", m, null, fun st -> st.DeclaringType) with @@ -1047,7 +1047,7 @@ module internal ExtensionTyping = let path = [| match namespaceName with | null -> () - | NullChecked namespaceName -> yield! namespaceName.Split([|'.'|]) + | NonNull namespaceName -> yield! namespaceName.Split([|'.'|]) yield! declaringTypes st [] |] if path <> expectedPath then @@ -1229,7 +1229,7 @@ module internal ExtensionTyping = | Tainted.Null -> match st.PUntaint((fun st -> st.Namespace), m) with | null -> typeName - | NullChecked ns -> ns + "." + typeName + | NonNull ns -> ns + "." + typeName | _ -> typeName let rec encContrib (st:Tainted) = @@ -1367,7 +1367,7 @@ module internal ExtensionTyping = let GetPartsOfNamespaceRecover(namespaceName:string?) = match namespaceName with | null -> [] - | NullChecked namespaceName -> + | NonNull namespaceName -> if namespaceName.Length = 0 then [""] else splitNamespace (nonNull namespaceName) @@ -1375,7 +1375,7 @@ module internal ExtensionTyping = let GetProvidedNamespaceAsPath (m, resolver:Tainted, namespaceName:string?) = match namespaceName with | null -> [] - | NullChecked namespaceName -> + | NonNull namespaceName -> if namespaceName.Length = 0 then errorR(Error(FSComp.SR.etEmptyNamespaceNotAllowed(DisplayNameOfTypeProvider(resolver.TypeProvider, m)), m)) GetPartsOfNamespaceRecover namespaceName diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs index 3fdae5acd82..10e3312b8fe 100644 --- a/src/fsharp/FSharp.Build/Fsc.fs +++ b/src/fsharp/FSharp.Build/Fsc.fs @@ -130,7 +130,7 @@ type public Fsc () as this = #if BUILDING_WITH_LKG | debugType -> #else - | NullChecked debugType -> + | NonNull debugType -> #endif match debugType.ToUpperInvariant() with | "NONE" -> null @@ -174,7 +174,7 @@ type public Fsc () as this = #if BUILDING_WITH_LKG let ToUpperInvariant (s:string) = if s = null then null else s.ToUpperInvariant() #else - let ToUpperInvariant (s:string?) = match s with null -> null | NullChecked s -> s.ToUpperInvariant() + let ToUpperInvariant (s:string?) = match s with null -> null | NonNull s -> s.ToUpperInvariant() #endif match ToUpperInvariant(platform), prefer32bit, ToUpperInvariant(targetType) with | "ANYCPU", true, "EXE" @@ -204,7 +204,7 @@ type public Fsc () as this = #if BUILDING_WITH_LKG | referencePath -> #else - | NullChecked referencePath -> + | NonNull referencePath -> #endif referencePath.Split([|';'; ','|], StringSplitOptions.RemoveEmptyEntries) @@ -217,7 +217,7 @@ type public Fsc () as this = #if BUILDING_WITH_LKG | targetType -> #else - | NullChecked targetType -> + | NonNull targetType -> #endif match targetType.ToUpperInvariant() with | "LIBRARY" -> "library" @@ -232,7 +232,7 @@ type public Fsc () as this = #if BUILDING_WITH_LKG | disabledWarnings -> #else - | NullChecked disabledWarnings -> + | NonNull disabledWarnings -> #endif builder.AppendSwitchIfNotNull("--nowarn:", disabledWarnings.Split([|' '; ';'; ','; '\r'; '\n'|], StringSplitOptions.RemoveEmptyEntries), ",") @@ -264,7 +264,7 @@ type public Fsc () as this = #if BUILDING_WITH_LKG | warningsNotAsErrors -> #else - | NullChecked warningsNotAsErrors -> + | NonNull warningsNotAsErrors -> #endif builder.AppendSwitchIfNotNull("--warnaserror-:", warningsNotAsErrors.Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",") diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index dc3dfeda50e..f7a09868088 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3362,28 +3362,38 @@ namespace Microsoft.FSharp.Core [] let inline nonNull (value : 'T? when 'T : not struct) = match box value with - | null -> raise (System.NullReferenceException()) // TODO NULLNESS: decide if this raises an exception or ploughs on + | null -> raise (System.NullReferenceException()) | _ -> (# "" value : 'T #) [] let inline nonNullV (value : Nullable<'T>) = if value.HasValue then - value.Value + value.Value else raise (System.NullReferenceException()) [] - let inline (|Null|NonNull|) (value : 'T?) = + let inline (|Null|NotNull|) (value : 'T?) = match value with - | null -> Choice1Of2 () - | _ -> Choice2Of2 (# "" value : 'T #) + | null -> Null () + | _ -> NotNull (# "" value : 'T #) - [] - let inline (|NullChecked|) (value : 'T?) = + [] + let inline (|NullV|NotNullV|) (value : Nullable<'T>) = + if value.HasValue then NonNullV value.Value + else NullV () + + [] + let inline (|NonNull|) (value : 'T?) = match box value with - | null -> raise (System.NullReferenceException()) // TODO NULLNESS: decide if this raises an exception or ploughs on + | null -> raise (System.NullReferenceException()) | _ -> (# "" value : 'T #) + [] + let inline (|NonNullV|) (value : Nullable<'T>) = + if value.HasValue then value.Value + else raise (System.NullReferenceException()) + [] let inline withNull (value : 'T when 'T : not struct) = (# "" value : 'T? #) diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index 5c4cc9cc642..e6f6c93e898 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -2275,13 +2275,25 @@ namespace Microsoft.FSharp.Core /// The value to check. /// A choice indicating whether the value is null or not-null. [] - val inline (|Null|NonNull|) : value: 'T? -> Choice + val inline (|Null|NotNull|) : value: 'T? -> Choice - /// When used in a pattern checks the given value is not null. + /// Determines whether the given value is null. /// The value to check. /// A choice indicating whether the value is null or not-null. - [] - val inline (|NullChecked|) : value: 'T? -> 'T + [] + val inline (|NullV|NotNullV|) : value: Nullable<'T> -> Choice + + /// When used in a pattern checks the given value is not null. + /// The value to check. + /// The non-null value. + [] + val inline (|NonNull|) : value: 'T? -> 'T + + /// When used in a pattern checks the given value is not null. + /// The value to check. + /// The non-null value. + [] + val inline (|NonNullV|) : value: Nullable<'T> -> 'T /// Determines whether the given value is null. /// The value to check. @@ -2318,7 +2330,7 @@ namespace Microsoft.FSharp.Core /// The value to check. /// True when value is null, false otherwise. [] - val inline withNull : value:'T -> (('T)?) when 'T : not struct + val inline withNull : value:'T -> 'T? when 'T : not struct /// Asserts that the value is non-null. /// The value to check. diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs index 6a8a822fb58..dc3e1336c22 100644 --- a/src/fsharp/MethodCalls.fs +++ b/src/fsharp/MethodCalls.fs @@ -936,7 +936,7 @@ module ProvidedMethodCalls = st.PApply((fun st -> match st.BaseType with | null -> ProvidedType.CreateNoContext(typeof) // it might be an interface - | NullChecked st -> st), m) + | NonNull st -> st), m) loop baseType else if isGeneric then diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index 4c0ba636e0b..222dc475f34 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -1739,12 +1739,12 @@ type internal FsiStdinLexerProvider (fun (buf: char[], start, len) -> //fprintf fsiConsoleOutput.Out "Calling ReadLine\n" let inputOption = try Some(readf()) with :? EndOfStreamException -> None - inputOption |> Option.iter (fun t -> fsiStdinSyphon.Add ((match t with null -> "" | NullChecked s -> s) + "\n")) + inputOption |> Option.iter (fun t -> fsiStdinSyphon.Add ((match t with null -> "" | NonNull s -> s) + "\n")) match inputOption with | Some(null) | None -> if !progress then fprintfn fsiConsoleOutput.Out "End of file from TextReader.ReadLine" 0 - | Some (NullChecked input) -> + | Some (NonNull input) -> let input = input + "\n" let ninput = input.Length if ninput > len then fprintf fsiConsoleOutput.Error "%s" (FSIstrings.SR.fsiLineTooLong()) @@ -1765,7 +1765,7 @@ type internal FsiStdinLexerProvider #endif match str with | null -> str - | NullChecked str -> + | NonNull str -> if str.Contains("\000") then System.String(str |> Seq.filter (fun c -> c<>'\000') |> Seq.toArray) else diff --git a/src/fsharp/lib.fs b/src/fsharp/lib.fs index a26ab6b175e..72339d0f4e2 100755 --- a/src/fsharp/lib.fs +++ b/src/fsharp/lib.fs @@ -24,7 +24,7 @@ let GetEnvInteger e dflt = match System.Environment.GetEnvironmentVariable(e) wi #if BUILDING_WITH_LKG let dispose (x:System.IDisposable) = match x with null -> () | x -> x.Dispose() #else -let dispose (x:System.IDisposable?) = match x with null -> () | NullChecked x -> x.Dispose() +let dispose (x:System.IDisposable?) = match x with null -> () | NonNull x -> x.Dispose() #endif type SaveAndRestoreConsoleEncoding () = @@ -472,7 +472,7 @@ module internal AsyncUtil = #if BUILDING_WITH_LKG | sc -> #else - | NullChecked sc -> + | NonNull sc -> #endif sc.Post((fun _ -> cont res), state=null) diff --git a/src/fsharp/service/QuickParse.fs b/src/fsharp/service/QuickParse.fs index 02d84ab143c..9bc30b8ce92 100644 --- a/src/fsharp/service/QuickParse.fs +++ b/src/fsharp/service/QuickParse.fs @@ -71,7 +71,7 @@ module QuickParse = let GetCompleteIdentifierIslandImpl (lineStr: string?) (index: int) : (string * int * bool) option = match lineStr with | null -> None - | NullChecked lineStr -> + | NonNull lineStr -> if index < 0 || index >= lineStr.Length then None else let fixup = @@ -182,7 +182,7 @@ module QuickParse = let GetPartialLongName(lineStr: string?, index: int) = match lineStr with | null -> defaultName - | NullChecked lineStr -> + | NonNull lineStr -> if index < 0 then defaultName elif index >= lineStr.Length then defaultName else @@ -223,7 +223,7 @@ module QuickParse = let GetPartialLongNameEx(lineStr: string?, index: int) : PartialLongName = match lineStr with | null -> PartialLongName.Empty(index) - | NullChecked lineStr -> + | NonNull lineStr -> if index < 0 then PartialLongName.Empty(index) elif index >= lineStr.Length then PartialLongName.Empty(index) else diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index c39571e36f4..058dfebc550 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -1981,7 +1981,7 @@ and Construct = let baseType = st.BaseType match baseType with | null -> false - | NullChecked x -> + | NonNull x -> match x with | x when x.IsGenericType -> false | x when x.DeclaringType <> null -> false From 824e33c6d80dd3d603e3607cbdc98f8fc4302e0c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 15 Nov 2018 17:14:56 +0000 Subject: [PATCH 026/137] further refinement of prototype --- src/absil/illib.fs | 20 ++-- src/absil/ilread.fs | 4 +- src/absil/ilreflect.fs | 17 +-- .../FSharp.Compiler.Private/FSComp.fs | 8 ++ .../FSharp.Compiler.Private/FSComp.resx | 6 + src/fsharp/ConstraintSolver.fs | 53 +++++---- src/fsharp/FSComp.txt | 4 +- .../FSharp.Build/FSharpCommandLineBuilder.fs | 12 +- src/fsharp/FSharp.Build/Fsc.fs | 19 +-- src/fsharp/FSharp.Build/WriteCodeFragment.fs | 29 +++-- src/fsharp/FSharp.Core/prim-types.fs | 2 +- src/fsharp/FSharp.Core/prim-types.fsi | 13 +- src/fsharp/FSharp.Core/reflect.fsi | 112 ------------------ src/fsharp/MethodCalls.fs | 10 +- src/fsharp/PostInferenceChecks.fs | 32 ++++- src/fsharp/TastOps.fs | 50 ++++---- src/fsharp/TastOps.fsi | 3 +- src/fsharp/tast.fs | 7 +- src/fsharp/xlf/FSComp.txt.cs.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.de.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.en.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.es.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.fr.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.it.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.ja.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.ko.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.pl.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.ru.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.tr.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 10 ++ src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 10 ++ tests/fsharp/core/nullness/test.fsx | 103 ++++++++++++++++ 33 files changed, 413 insertions(+), 231 deletions(-) diff --git a/src/absil/illib.fs b/src/absil/illib.fs index a8a90ad360c..1164fffdd02 100644 --- a/src/absil/illib.fs +++ b/src/absil/illib.fs @@ -940,13 +940,11 @@ type LazyWithContextFailure(exn:exn) = type LazyWithContext<'T,'ctxt> = { /// This field holds the result of a successful computation. It's initial value is Unchecked.defaultof mutable value : 'T + /// This field holds either the function to run or a LazyWithContextFailure object recording the exception raised /// from running the function. It is null if the thunk has been evaluated successfully. -#if BUILDING_WITH_LKG - mutable funcOrException: obj -#else - mutable funcOrException: obj? -#endif + mutable funcOrException: obj + /// A helper to ensure we rethrow the "original" exception findOriginalException : exn -> exn } @@ -959,8 +957,11 @@ type LazyWithContext<'T,'ctxt> = { value = x funcOrException = null findOriginalException = id } + member x.IsDelayed = (match x.funcOrException with null -> false | :? LazyWithContextFailure -> false | _ -> true) + member x.IsForced = (match x.funcOrException with null -> true | _ -> false) + member x.Force(ctxt:'ctxt) = match x.funcOrException with | null -> x.value @@ -975,19 +976,22 @@ type LazyWithContext<'T,'ctxt> = member x.UnsynchronizedForce(ctxt) = match x.funcOrException with | null -> x.value + | :? LazyWithContextFailure as res -> // Re-raise the original exception raise (x.findOriginalException res.Exception) + | :? ('ctxt -> 'T) as f -> x.funcOrException <- box(LazyWithContextFailure.Undefined) try let res = f ctxt - x.value <- res; - x.funcOrException <- null; + x.value <- res + x.funcOrException <- null res with e -> - x.funcOrException <- box(new LazyWithContextFailure(e)); + x.funcOrException <- box(new LazyWithContextFailure(e)) reraise() + | _ -> failwith "unreachable" diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index 5c89bcd9fe5..57548872331 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -898,7 +898,7 @@ let mkCacheInt32 lowMem _inbase _nm _sz = #if BUILDING_WITH_LKG let cache = ref null #else - let cache : Dictionary<_,_>? ref = ref null + let cache : Dictionary<_,_>? ref = ref null // TODO NULLNESS: this explicit annotation should not be needed #endif let count = ref 0 #if STATISTICS @@ -931,7 +931,7 @@ let mkCacheGeneric lowMem _inbase _nm _sz = #if BUILDING_WITH_LKG let cache = ref null #else - let cache : Dictionary<_,_>? ref = ref null + let cache : Dictionary<_,_>? ref = ref null // TODO NULLNESS: this explicit annotation should not be needed #endif let count = ref 0 #if STATISTICS diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs index 3616bc9a09f..422cba43923 100644 --- a/src/absil/ilreflect.fs +++ b/src/absil/ilreflect.fs @@ -398,9 +398,10 @@ let envBindTypeRef emEnv (tref:ILTypeRef) (typT: System.Type?, typB, typeDef)= #endif match typT with | null -> failwithf "binding null type in envBindTypeRef: %s\n" tref.Name; - | _ -> -#if !BUILDING_WITH_LKG - let typT = nonNull typT // TODO NULLNESS +#if BUILDING_WITH_LKG + | typT -> +#else + | NonNull typT -> #endif {emEnv with emTypMap = Zmap.add tref (typT, typB, typeDef, None) emEnv.emTypMap} @@ -898,7 +899,7 @@ let convConstructorSpec cenv emEnv (mspec:ILMethodSpec) = #if BUILDING_WITH_LKG | _ -> res #else - | _ -> nonNull res // TODO NULLNESS + | NonNull res -> res #endif //---------------------------------------------------------------------------- @@ -1296,11 +1297,7 @@ let rec emitInstr cenv (modB : ModuleBuilder) emEnv (ilG:ILGenerator) instr = setArrayMethInfo shape.Rank ety else #endif -#if BUILDING_WITH_LKG - modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, null, Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) -#else modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, null, Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) -#endif ilG.EmitAndLog(OpCodes.Call, meth) | I_newarr (shape, ty) -> @@ -1308,11 +1305,7 @@ let rec emitInstr cenv (modB : ModuleBuilder) emEnv (ilG:ILGenerator) instr = then ilG.EmitAndLog(OpCodes.Newarr, convType cenv emEnv ty) else let aty = convType cenv emEnv (ILType.Array(shape, ty)) -#if BUILDING_WITH_LKG let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, null, Array.create shape.Rank (typeof)) -#else - let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, null, Array.create shape.Rank (typeof)) -#endif ilG.EmitAndLog(OpCodes.Newobj, meth) | I_ldlen -> ilG.EmitAndLog(OpCodes.Ldlen) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index 91f3d9c5218..2edf88b1737 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -4417,6 +4417,12 @@ type internal SR private() = /// This language feature is not enabled, use /langversion:5.0 or greater to enable it /// (Originally from ..\FSComp.txt:1467) static member tcLangFeatureNotEnabled50() = (3265, GetStringFunc("tcLangFeatureNotEnabled50",",,,") ) + /// Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + /// (Originally from ..\FSComp.txt:1468) + static member tcDefaultStructConstructorCallNulls() = (3266, GetStringFunc("tcDefaultStructConstructorCallNulls",",,,") ) + /// Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + /// (Originally from ..\FSComp.txt:1469) + static member chkValueWithDefaultValueMustHaveDefaultValueNulls() = (3267, GetStringFunc("chkValueWithDefaultValueMustHaveDefaultValueNulls",",,,") ) /// Call this method once to validate that all known resources are valid; throws if not static member RunStartupValidation() = @@ -5854,4 +5860,6 @@ type internal SR private() = ignore(GetString("tcCopyAndUpdateNeedsRecordType")) ignore(GetString("tcTypeDoesNotHaveAnyNull")) ignore(GetString("tcLangFeatureNotEnabled50")) + ignore(GetString("tcDefaultStructConstructorCallNulls")) + ignore(GetString("chkValueWithDefaultValueMustHaveDefaultValueNulls")) () diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index 9665c389061..a20e16a6866 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -4420,4 +4420,10 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + \ No newline at end of file diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index e8b8475fdc9..043851f2d2a 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -1949,6 +1949,26 @@ and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Optio else CompleteD +and SolveTypeSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = + let g = csenv.g + let m = csenv.m + let denv = csenv.DisplayEnv + if TypeNullIsExtraValueNew g m ty then + CompleteD + else + match ty with + | NullableTy g _ -> + ErrorD (ConstraintSolverError(FSComp.SR.csNullableTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) + | _ -> + if g.langFeatureNullness then + let nullness = nullnessOfTy g ty + SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness + else + if TypeNullIsExtraValueOld g m ty then + CompleteD + else + ErrorD (ConstraintSolverError(FSComp.SR.csTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) + and SolveNullnessNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) ty nullness = let m = csenv.m let denv = csenv.DisplayEnv @@ -1969,23 +1989,6 @@ and SolveNullnessNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: Op else CompleteD -and SolveTypeSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = - let g = csenv.g - let m = csenv.m - let denv = csenv.DisplayEnv - if TypeNullIsExtraValueNew g m ty then CompleteD else - let sty = stripTyparEqns ty - match sty with - | TType_fun (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness - | TType_app (_, _, nullness) -> SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness - | _ -> - if TypeNullIsExtraValueOld g m ty then CompleteD else - match sty with - | NullableTy g _ -> - ErrorD (ConstraintSolverError(FSComp.SR.csNullableTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) - | _ -> - ErrorD (ConstraintSolverError(FSComp.SR.csTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) - and SolveTypeNotSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let g = csenv.g let m = csenv.m @@ -1993,13 +1996,15 @@ and SolveTypeNotSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = if TypeNullIsTrueValue g ty then ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsTrueValue(NicePrint.minimalStringOfType denv ty), m, m2)) elif TypeNullIsExtraValueNew g m ty then - ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) + if g.checkNullness then + WarnD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) + else + CompleteD else - let sty = stripTyparEqns ty - match sty with - | TType_fun (_, _, nullness) - | TType_app (_, _, nullness) -> SolveNullnessNotSupportsNull csenv ndeep m2 trace ty nullness - | _ -> + if g.checkNullness then + let nullness = nullnessOfTy g ty + SolveNullnessNotSupportsNull csenv ndeep m2 trace ty nullness + else CompleteD // This version prefers to constrain a type parameter definiton @@ -2225,7 +2230,7 @@ and SolveTypeRequiresDefaultConstructor (csenv:ConstraintSolverEnv) ndeep m2 tra | ValueSome destTypar -> AddConstraint csenv ndeep m2 trace destTypar (TyparConstraint.RequiresDefaultConstructor m) | _ -> - if isStructTy g ty && TypeHasDefaultValue g m ty then + if isStructTy g ty && TypeHasDefaultValueOld g m ty then CompleteD else if GetIntrinsicConstructorInfosOfType csenv.InfoReader m ty diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index fc1ad44cf10..25f481ac936 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -1464,4 +1464,6 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl #3262 reserved for ConstraintSolverNullnessWarningWithTypes #3263 reserved for ConstraintSolverNullnessWarningWithType #3264 reserved for ConstraintSolverNonNullnessWarningWithType -3265,tcLangFeatureNotEnabled50,"This language feature is not enabled, use /langversion:5.0 or greater to enable it" \ No newline at end of file +3265,tcLangFeatureNotEnabled50,"This language feature is not enabled, use /langversion:5.0 or greater to enable it" +3266,tcDefaultStructConstructorCallNulls,"Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable." +3267,chkValueWithDefaultValueMustHaveDefaultValueNulls,"Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable." diff --git a/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs b/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs index e3193bdc97c..2d9a1e9a486 100644 --- a/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs +++ b/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs @@ -32,7 +32,7 @@ type FSharpCommandLineBuilder () = /// Return a full command line (with quoting for the cmd.exe shell) override x.ToString() = builder.ToString() - member x.AppendFileNamesIfNotNull(filenames:ITaskItem array, sep:string) = + member x.AppendFileNamesIfNotNull(filenames:ITaskItem[], sep:string) = builder.AppendFileNamesIfNotNull(filenames, sep) // do not update "args", not used for item in filenames do @@ -42,11 +42,7 @@ type FSharpCommandLineBuilder () = if s <> String.Empty then srcs <- tmp.ToString() :: srcs -#if BUILDING_WITH_LKG - member x.AppendSwitchIfNotNull(switch:string, values:string array, sep:string) = -#else - member x.AppendSwitchIfNotNull(switch:string, values:string? array, sep:string) = -#endif + member x.AppendSwitchesIfNotNull(switch:string, values:string[], sep:string) = builder.AppendSwitchIfNotNull(switch, values, sep) let tmp = new CommandLineBuilder() tmp.AppendSwitchUnquotedIfNotNull(switch, values, sep) @@ -55,9 +51,9 @@ type FSharpCommandLineBuilder () = args <- s :: args #if BUILDING_WITH_LKG - member x.AppendSwitchIfNotNull(switch:string, value:string, ?metadataNames:string array) = + member x.AppendSwitchIfNotNull(switch:string, value:string, ?metadataNames:string[]) = #else - member x.AppendSwitchIfNotNull(switch:string, value:string?, ?metadataNames:string array) = + member x.AppendSwitchIfNotNull(switch:string, value:string?, ?metadataNames:string[]) = #endif let metadataNames = defaultArg metadataNames [||] builder.AppendSwitchIfNotNull(switch, value) diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs index 10e3312b8fe..27ddab72295 100644 --- a/src/fsharp/FSharp.Build/Fsc.fs +++ b/src/fsharp/FSharp.Build/Fsc.fs @@ -208,7 +208,7 @@ type public Fsc () as this = #endif referencePath.Split([|';'; ','|], StringSplitOptions.RemoveEmptyEntries) - builder.AppendSwitchIfNotNull("--lib:", referencePathArray, ",") + builder.AppendSwitchesIfNotNull("--lib:", referencePathArray, ",") // TargetType builder.AppendSwitchIfNotNull("--target:", @@ -234,7 +234,7 @@ type public Fsc () as this = #else | NonNull disabledWarnings -> #endif - builder.AppendSwitchIfNotNull("--nowarn:", disabledWarnings.Split([|' '; ';'; ','; '\r'; '\n'|], StringSplitOptions.RemoveEmptyEntries), ",") + builder.AppendSwitchesIfNotNull("--nowarn:", disabledWarnings.Split([|' '; ';'; ','; '\r'; '\n'|], StringSplitOptions.RemoveEmptyEntries), ",") // WarningLevel builder.AppendSwitchIfNotNull("--warn:", warningLevel) @@ -251,12 +251,12 @@ type public Fsc () as this = | null -> [|"76"|] // TODO NULLNESS: nonNull should not be needed #if BUILDING_WITH_LKG - | _ -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) + | warningsAsErrors -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) #else - | _ -> (nonNull warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) + | NonNull warningsAsErrors -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) #endif - builder.AppendSwitchIfNotNull("--warnaserror:", warningsAsErrorsArray, ",") + builder.AppendSwitchesIfNotNull("--warnaserror:", warningsAsErrorsArray, ",") // WarningsNotAsErrors match warningsNotAsErrors with @@ -266,7 +266,7 @@ type public Fsc () as this = #else | NonNull warningsNotAsErrors -> #endif - builder.AppendSwitchIfNotNull("--warnaserror-:", warningsNotAsErrors.Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",") + builder.AppendSwitchesIfNotNull("--warnaserror-:", warningsNotAsErrors.Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",") // Win32ResourceFile builder.AppendSwitchIfNotNull("--win32res:", win32res) @@ -612,11 +612,14 @@ type public Fsc () as this = override fsc.GenerateCommandLineCommands() = let builder = new FSharpCommandLineBuilder() - if not (String.IsNullOrEmpty(dotnetFscCompilerPath)) then #if BUILDING_WITH_LKG + if not (String.IsNullOrEmpty(dotnetFscCompilerPath)) then builder.AppendSwitch(dotnetFscCompilerPath) #else - builder.AppendSwitch(nonNull dotnetFscCompilerPath) // TODO NULLNESS: why is this explicit instantiation needed? + match dotnetFscCompilerPath with + | null | "" -> () + | NonNull dotnetFscCompilerPath -> + builder.AppendSwitch(dotnetFscCompilerPath) // TODO NULLNESS: why is this explicit instantiation needed? #endif builder.ToString() diff --git a/src/fsharp/FSharp.Build/WriteCodeFragment.fs b/src/fsharp/FSharp.Build/WriteCodeFragment.fs index bd91df88ba0..c945d3aace5 100644 --- a/src/fsharp/FSharp.Build/WriteCodeFragment.fs +++ b/src/fsharp/FSharp.Build/WriteCodeFragment.fs @@ -116,8 +116,13 @@ type WriteCodeFragment() = member this.Execute() = try - if isNull _outputFile && isNull _outputDirectory then - failwith "Output location must be specified" +#if BUILDING_WITH_LKG + if isNull _outputFile then failwith "Output location must be specified" +#else + match _outputFile with + | null -> failwith "Output location must be specified" + | NonNull outputFile -> +#endif let boilerplate = match _language.ToLowerInvariant() with @@ -130,24 +135,26 @@ type WriteCodeFragment() = let code = Array.fold (fun (sb:StringBuilder) (item:ITaskItem) -> sb.AppendLine(WriteCodeFragment.GenerateAttribute (item, _language.ToLowerInvariant()))) sb _assemblyAttributes if _language.ToLowerInvariant() = "f#" then code.AppendLine("do()") |> ignore + #if BUILDING_WITH_LKG let fileName = _outputFile.ItemSpec -#else - let fileName = (nonNull _outputFile).ItemSpec -#endif let outputFileItem = if not (isNull _outputFile) && not (isNull _outputDirectory) && not (Path.IsPathRooted(fileName)) then -#if BUILDING_WITH_LKG TaskItem(Path.Combine(_outputDirectory.ItemSpec, fileName)) :> ITaskItem -#else - TaskItem(Path.Combine((nonNull _outputDirectory).ItemSpec, fileName)) :> ITaskItem -#endif else -#if BUILDING_WITH_LKG _outputFile #else - nonNull _outputFile // TODO NULLNESS: why is this explicit instantiation needed + let fileName = outputFile.ItemSpec + + let outputFileItem = + match _outputDirectory with + | null -> outputFile + | NonNull outputDirectory -> + if Path.IsPathRooted(fileName) then + outputFile + else + TaskItem(Path.Combine(outputDirectory.ItemSpec, fileName)) :> ITaskItem #endif let codeText = code.ToString() diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index f7a09868088..fe186fd6d30 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3380,7 +3380,7 @@ namespace Microsoft.FSharp.Core [] let inline (|NullV|NotNullV|) (value : Nullable<'T>) = - if value.HasValue then NonNullV value.Value + if value.HasValue then NotNullV value.Value else NullV () [] diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index e6f6c93e898..f4796414787 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -2239,30 +2239,19 @@ namespace Microsoft.FSharp.Core /// The boxed value. /// The unboxed result. [] -#if BUILDING_WITH_LKG val inline unbox : value:obj -> 'T -#else - val inline unbox : value:obj? -> 'T -#endif /// Boxes a strongly typed value. /// The value to box. /// The boxed object. [] -#if BUILDING_WITH_LKG val inline box : value:'T -> obj -#else - val inline box : value:'T -> obj __ambivalent -#endif + /// Try to unbox a strongly typed value. /// The boxed value. /// The unboxed result as an option. [] -#if BUILDING_WITH_LKG val inline tryUnbox : value:obj -> 'T option -#else - val inline tryUnbox : value:obj? -> 'T option -#endif /// Determines whether the given value is null. /// The value to check. diff --git a/src/fsharp/FSharp.Core/reflect.fsi b/src/fsharp/FSharp.Core/reflect.fsi index 773a9ceb6e8..42ba9b7fc34 100644 --- a/src/fsharp/FSharp.Core/reflect.fsi +++ b/src/fsharp/FSharp.Core/reflect.fsi @@ -58,11 +58,7 @@ type FSharpValue = /// The PropertyInfo describing the field to read. /// Thrown when the input type is not a record type. /// The field from the record. -#if BUILDING_WITH_LKG static member GetRecordField: record:obj * info:PropertyInfo -> obj -#else - static member GetRecordField: record:obj? * info:PropertyInfo -> obj? -#endif /// Precompute a function for reading a particular field from a record. /// Assumes the given type is a RecordType with a field of the given name. @@ -74,11 +70,7 @@ type FSharpValue = /// The PropertyInfo of the field to read. /// Thrown when the input type is not a record type. /// A function to read the specified field from the record. -#if BUILDING_WITH_LKG static member PreComputeRecordFieldReader : info:PropertyInfo -> (obj -> obj) -#else - static member PreComputeRecordFieldReader : info:PropertyInfo -> (obj? -> obj?) -#endif /// Creates an instance of a record type. /// @@ -88,11 +80,7 @@ type FSharpValue = /// Optional binding flags for the record. /// Thrown when the input type is not a record type. /// The created record. -#if BUILDING_WITH_LKG static member MakeRecord: recordType:Type * values:obj [] * ?bindingFlags:BindingFlags -> obj -#else - static member MakeRecord: recordType:Type * values:obj? [] * ?bindingFlags:BindingFlags -> obj -#endif /// Reads all the fields from a record value. /// @@ -101,11 +89,7 @@ type FSharpValue = /// Optional binding flags for the record. /// Thrown when the input type is not a record type. /// The array of fields from the record. -#if BUILDING_WITH_LKG static member GetRecordFields: record:obj * ?bindingFlags:BindingFlags -> obj[] -#else - static member GetRecordFields: record:obj? * ?bindingFlags:BindingFlags -> obj?[] -#endif /// Precompute a function for reading all the fields from a record. The fields are returned in the /// same order as the fields reported by a call to Microsoft.FSharp.Reflection.Type.GetInfo for @@ -121,11 +105,7 @@ type FSharpValue = /// Optional binding flags. /// Thrown when the input type is not a record type. /// An optimized reader for the given record type. -#if BUILDING_WITH_LKG static member PreComputeRecordReader : recordType:Type * ?bindingFlags:BindingFlags -> (obj -> obj[]) -#else - static member PreComputeRecordReader : recordType:Type * ?bindingFlags:BindingFlags -> (obj? -> obj?[]) -#endif /// Precompute a function for constructing a record value. /// @@ -135,11 +115,7 @@ type FSharpValue = /// Optional binding flags. /// Thrown when the input type is not a record type. /// A function to construct records of the given type. -#if BUILDING_WITH_LKG static member PreComputeRecordConstructor : recordType:Type * ?bindingFlags:BindingFlags -> (obj[] -> obj) -#else - static member PreComputeRecordConstructor : recordType:Type * ?bindingFlags:BindingFlags -> (obj?[] -> obj) -#endif /// Get a ConstructorInfo for a record type /// The record type. @@ -152,11 +128,7 @@ type FSharpValue = /// The array of arguments to construct the given case. /// Optional binding flags. /// The constructed union case. -#if BUILDING_WITH_LKG static member MakeUnion: unionCase:UnionCaseInfo * args:obj [] * ?bindingFlags:BindingFlags -> obj -#else - static member MakeUnion: unionCase:UnionCaseInfo * args:obj? [] * ?bindingFlags:BindingFlags -> obj -#endif /// Identify the union case and its fields for an object /// @@ -170,11 +142,7 @@ type FSharpValue = /// Optional binding flags. /// Thrown when the input type is not a union case value. /// The description of the union case and its fields. -#if BUILDING_WITH_LKG static member GetUnionFields: value:obj * unionType:Type * ?bindingFlags:BindingFlags -> UnionCaseInfo * obj [] -#else - static member GetUnionFields: value:obj? * unionType:Type * ?bindingFlags:BindingFlags -> UnionCaseInfo * obj? [] -#endif /// Assumes the given type is a union type. /// If not, ArgumentException is raised during pre-computation. @@ -185,11 +153,7 @@ type FSharpValue = /// The type of union to optimize reading. /// Optional binding flags. /// An optimized function to read the tags of the given union type. -#if BUILDING_WITH_LKG static member PreComputeUnionTagReader : unionType:Type * ?bindingFlags:BindingFlags -> (obj -> int) -#else - static member PreComputeUnionTagReader : unionType:Type * ?bindingFlags:BindingFlags -> (obj? -> int) -#endif /// Precompute a property or static method for reading an integer representing the case tag of a union type. /// The type of union to read. @@ -203,21 +167,13 @@ type FSharpValue = /// The description of the union case to read. /// Optional binding flags. /// A function to for reading the fields of the given union case. -#if BUILDING_WITH_LKG static member PreComputeUnionReader : unionCase:UnionCaseInfo * ?bindingFlags:BindingFlags -> (obj -> obj[]) -#else - static member PreComputeUnionReader : unionCase:UnionCaseInfo * ?bindingFlags:BindingFlags -> (obj? -> obj?[]) -#endif /// Precompute a function for constructing a discriminated union value for a particular union case. /// The description of the union case. /// Optional binding flags. /// A function for constructing values of the given union case. -#if BUILDING_WITH_LKG static member PreComputeUnionConstructor : unionCase:UnionCaseInfo * ?bindingFlags:BindingFlags -> (obj[] -> obj) -#else - static member PreComputeUnionConstructor : unionCase:UnionCaseInfo * ?bindingFlags:BindingFlags -> (obj?[] -> obj) -#endif /// A method that constructs objects of the given case /// The description of the union case. @@ -232,11 +188,7 @@ type FSharpValue = /// Optional binding flags. /// Thrown when the input type is not an F# exception. /// The fields from the given exception. -#if BUILDING_WITH_LKG static member GetExceptionFields: exn:obj * ?bindingFlags:BindingFlags -> obj[] -#else - static member GetExceptionFields: exn:obj? * ?bindingFlags:BindingFlags -> obj?[] -#endif /// Creates an instance of a tuple type /// @@ -245,11 +197,7 @@ type FSharpValue = /// The tuple type to create. /// Thrown if no elements are given. /// An instance of the tuple type with the given elements. -#if BUILDING_WITH_LKG static member MakeTuple: tupleElements:obj[] * tupleType:Type -> obj -#else - static member MakeTuple: tupleElements:obj?[] * tupleType:Type -> obj -#endif /// Reads a field from a tuple value. /// @@ -257,11 +205,7 @@ type FSharpValue = /// The input tuple. /// The index of the field to read. /// The value of the field. -#if BUILDING_WITH_LKG static member GetTupleField: tuple:obj * index:int -> obj -#else - static member GetTupleField: tuple:obj * index:int -> obj? -#endif /// Reads all fields from a tuple. /// @@ -269,11 +213,7 @@ type FSharpValue = /// The input tuple. /// Thrown when the input is not a tuple value. /// An array of the fields from the given tuple. -#if BUILDING_WITH_LKG static member GetTupleFields: tuple:obj -> obj[] -#else - static member GetTupleFields: tuple:obj -> obj? [] -#endif /// Precompute a function for reading the values of a particular tuple type /// @@ -282,11 +222,7 @@ type FSharpValue = /// The tuple type to read. /// Thrown when the given type is not a tuple type. /// A function to read values of the given tuple type. -#if BUILDING_WITH_LKG static member PreComputeTupleReader : tupleType:Type -> (obj -> obj[]) -#else - static member PreComputeTupleReader : tupleType:Type -> (obj? -> obj?[]) -#endif /// Gets information that indicates how to read a field of a tuple /// The input tuple type. @@ -301,11 +237,7 @@ type FSharpValue = /// The type of tuple to read. /// Thrown when the given type is not a tuple type. /// A function to read a particular tuple type. -#if BUILDING_WITH_LKG static member PreComputeTupleConstructor : tupleType:Type -> (obj[] -> obj) -#else - static member PreComputeTupleConstructor : tupleType:Type -> (obj?[] -> obj) -#endif /// Gets a method that constructs objects of the given tuple type. /// For small tuples, no additional type will be returned. @@ -325,11 +257,7 @@ type FSharpValue = /// The function type of the implementation. /// The untyped lambda of the function implementation. /// A typed function from the given dynamic implementation. -#if BUILDING_WITH_LKG static member MakeFunction : functionType:Type * implementation:(obj -> obj) -> obj -#else - static member MakeFunction : functionType:Type * implementation:(obj? -> obj?) -> obj -#endif [] /// Contains operations associated with constructing and analyzing F# types such as records, unions and tuples @@ -438,11 +366,7 @@ module FSharpReflectionExtensions = /// Optional flags that denotes accessibility of the private representation. /// Thrown when the input type is not a record type. /// The created record. -#if BUILDING_WITH_LKG static member MakeRecord: recordType:Type * values:obj[] * ?allowAccessToPrivateRepresentation : bool -> obj -#else - static member MakeRecord: recordType:Type * values:obj? [] * ?allowAccessToPrivateRepresentation : bool -> obj -#endif /// Reads all the fields from a record value. /// @@ -451,11 +375,7 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not a record type. /// The array of fields from the record. -#if BUILDING_WITH_LKG static member GetRecordFields: record:obj * ?allowAccessToPrivateRepresentation : bool -> obj[] -#else - static member GetRecordFields: record:obj? * ?allowAccessToPrivateRepresentation : bool -> obj?[] -#endif /// Precompute a function for reading all the fields from a record. The fields are returned in the /// same order as the fields reported by a call to Microsoft.FSharp.Reflection.Type.GetInfo for @@ -471,11 +391,7 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not a record type. /// An optimized reader for the given record type. -#if BUILDING_WITH_LKG static member PreComputeRecordReader : recordType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj -> obj[]) -#else - static member PreComputeRecordReader : recordType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj? -> obj?[]) -#endif /// Precompute a function for constructing a record value. /// @@ -485,11 +401,7 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not a record type. /// A function to construct records of the given type. -#if BUILDING_WITH_LKG static member PreComputeRecordConstructor : recordType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj[] -> obj) -#else - static member PreComputeRecordConstructor : recordType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj?[] -> obj?) -#endif /// Get a ConstructorInfo for a record type /// The record type. @@ -502,11 +414,7 @@ module FSharpReflectionExtensions = /// The array of arguments to construct the given case. /// Optional flag that denotes accessibility of the private representation. /// The constructed union case. -#if BUILDING_WITH_LKG static member MakeUnion: unionCase:UnionCaseInfo * args:obj[] * ?allowAccessToPrivateRepresentation : bool-> obj -#else - static member MakeUnion: unionCase:UnionCaseInfo * args:obj? [] * ?allowAccessToPrivateRepresentation : bool-> obj -#endif /// Identify the union case and its fields for an object /// @@ -520,11 +428,7 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not a union case value. /// The description of the union case and its fields. -#if BUILDING_WITH_LKG static member GetUnionFields: value:obj * unionType:Type * ?allowAccessToPrivateRepresentation : bool -> UnionCaseInfo * obj[] -#else - static member GetUnionFields: value:obj? * unionType:Type * ?allowAccessToPrivateRepresentation : bool -> UnionCaseInfo * obj? [] -#endif /// Assumes the given type is a union type. /// If not, ArgumentException is raised during pre-computation. @@ -535,11 +439,7 @@ module FSharpReflectionExtensions = /// The type of union to optimize reading. /// Optional flag that denotes accessibility of the private representation. /// An optimized function to read the tags of the given union type. -#if BUILDING_WITH_LKG static member PreComputeUnionTagReader : unionType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj -> int) -#else - static member PreComputeUnionTagReader : unionType:Type * ?allowAccessToPrivateRepresentation : bool -> (obj? -> int) -#endif /// Precompute a property or static method for reading an integer representing the case tag of a union type. /// The type of union to read. @@ -553,21 +453,13 @@ module FSharpReflectionExtensions = /// The description of the union case to read. /// Optional flag that denotes accessibility of the private representation. /// A function to for reading the fields of the given union case. -#if BUILDING_WITH_LKG static member PreComputeUnionReader : unionCase:UnionCaseInfo * ?allowAccessToPrivateRepresentation : bool -> (obj -> obj[]) -#else - static member PreComputeUnionReader : unionCase:UnionCaseInfo * ?allowAccessToPrivateRepresentation : bool -> (obj? -> obj?[]) -#endif /// Precompute a function for constructing a discriminated union value for a particular union case. /// The description of the union case. /// Optional flag that denotes accessibility of the private representation. /// A function for constructing values of the given union case. -#if BUILDING_WITH_LKG static member PreComputeUnionConstructor : unionCase:UnionCaseInfo * ?allowAccessToPrivateRepresentation : bool -> (obj[] -> obj) -#else - static member PreComputeUnionConstructor : unionCase:UnionCaseInfo * ?allowAccessToPrivateRepresentation : bool -> (obj?[] -> obj?) -#endif /// A method that constructs objects of the given case /// The description of the union case. @@ -582,11 +474,7 @@ module FSharpReflectionExtensions = /// Optional flag that denotes accessibility of the private representation. /// Thrown when the input type is not an F# exception. /// The fields from the given exception. -#if BUILDING_WITH_LKG static member GetExceptionFields: exn:obj * ?allowAccessToPrivateRepresentation : bool -> obj[] -#else - static member GetExceptionFields: exn:obj * ?allowAccessToPrivateRepresentation : bool -> obj?[] -#endif type FSharpType with /// Reads all the fields from a record value, in declaration order diff --git a/src/fsharp/MethodCalls.fs b/src/fsharp/MethodCalls.fs index dc3e1336c22..338c41e063a 100644 --- a/src/fsharp/MethodCalls.fs +++ b/src/fsharp/MethodCalls.fs @@ -808,8 +808,14 @@ let BuildMethodCall tcVal g amap isMutable m isProp minfo valUseFlags minst objA // Build a 'call' to a struct default constructor | DefaultStructCtor (g, ty) -> - if not (TypeHasDefaultValue g m ty) then - errorR(Error(FSComp.SR.tcDefaultStructConstructorCall(), m)) + if g.langFeatureNullness then + if not (TypeHasDefaultValueNew g m ty) && not (TypeHasDefaultValueOld g m ty) then + errorR(Error(FSComp.SR.tcDefaultStructConstructorCall(), m)) + if g.checkNullness && not (TypeHasDefaultValueNew g m ty) then + warning(Error(FSComp.SR.tcDefaultStructConstructorCallNulls(), m)) + else + if not (TypeHasDefaultValueOld g m ty) then + errorR(Error(FSComp.SR.tcDefaultStructConstructorCall(), m)) mkDefault (m, ty), ty) //------------------------------------------------------------------------- diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index ab488f10914..136e986a605 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -2121,15 +2121,37 @@ let CheckEntityDefn cenv env (tycon:Entity) = yield! AllSuperTypesOfType g cenv.amap m AllowMultiIntfInstantiations.Yes ty ] CheckMultipleInterfaceInstantiations cenv interfaces m - // Check struct fields. We check these late because we have to have first checked that the structs are + // Check fields. We check these late because we have to have first checked that the structs are // free of cycles - if tycon.IsStructOrEnumTycon then + if g.langFeatureNullness then for f in tycon.AllInstanceFieldsAsList do + let m = f.Range // Check if it's marked unsafe let zeroInitUnsafe = TryFindFSharpBoolAttribute g g.attrib_DefaultValueAttribute f.FieldAttribs - if zeroInitUnsafe = Some(true) then - if not (TypeHasDefaultValue g m ty) then - errorR(Error(FSComp.SR.chkValueWithDefaultValueMustHaveDefaultValue(), m)) + if zeroInitUnsafe = Some true then + let ty = f.FormalType + if not (TypeHasDefaultValueNew g m ty) && not (TypeHasDefaultValueOld g m ty) then + if tycon.IsStructOrEnumTycon then + // Under F# 4.5 we gave a hard error for this case so we can give it now + errorR(Error(FSComp.SR.chkValueWithDefaultValueMustHaveDefaultValue(), m)) + else + if g.checkNullness then + // Under F# 5.0 rules with checkNullness we can now give a warning for this case + warning(Error(FSComp.SR.chkValueWithDefaultValueMustHaveDefaultValue(), m)) + + elif g.checkNullness && not (TypeHasDefaultValueNew g m ty) then + // Under F# 5.0 rules with checkNullness we can now give a warning for this case + warning(Error(FSComp.SR.chkValueWithDefaultValueMustHaveDefaultValueNulls(), m)) + else + // These are the F# 4.5 rules, mistakenly only applied to structs + if tycon.IsStructOrEnumTycon then + for f in tycon.AllInstanceFieldsAsList do + let m = f.Range + // Check if it's marked unsafe + let zeroInitUnsafe = TryFindFSharpBoolAttribute g g.attrib_DefaultValueAttribute f.FieldAttribs + if zeroInitUnsafe = Some true then + if not (TypeHasDefaultValueOld g m ty) then + errorR(Error(FSComp.SR.chkValueWithDefaultValueMustHaveDefaultValue(), m)) // Check type abbreviations match tycon.TypeAbbrev with diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index 0fa12b64ca6..58fe2444827 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -7593,37 +7593,42 @@ let TypeNullNever g ty = (isStructTy g underlyingTy) || (isByrefTy g underlyingTy) -let TyconRefNullIsExtraValueOld g m (tcref: TyconRef) = +let TyconRefNullIsExtraValue isNew g m (tcref: TyconRef) = not tcref.IsStructOrEnumTycon && not (isByrefLikeTyconRef g m tcref) && (if tcref.IsILTycon then // Putting AllowNullLiteralAttribute(false) on an IL or provided type means 'null' can't be used with that type - (TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref <> Some false) + (not isNew && TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref <> Some false) else +// Putting AllowNullLiteralAttribute(true) on an F# type means it always admits null even in the new model (TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true)) -let TyconRefNullIsExtraValueNew g m (tcref: TyconRef) = - not tcref.IsStructOrEnumTycon && - not (isByrefLikeTyconRef g m tcref) && - (if tcref.IsILTycon then - false - else - // Putting AllowNullLiteralAttribute(true) on an F# type means it always admits null even in the new model - (TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true)) +let TyconRefNullIsExtraValueOld g m tcref = TyconRefNullIsExtraValue false g m tcref +let TyconRefNullIsExtraValueNew g m tcref = TyconRefNullIsExtraValue true g m tcref /// Indicates if the type admits the use of 'null' as a value -let TypeNullIsExtraValueNew g m ty = - match tryDestAppTy g ty with ValueSome tcref -> TyconRefNullIsExtraValueNew g m tcref | _ -> true +let TypeNullIsExtraValueOld g m ty = + match tryDestAppTy g ty with + | ValueSome tcref -> TyconRefNullIsExtraValueOld g m tcref + | _ -> false /// Indicates if the type admits the use of 'null' as a value -let TypeNullIsExtraValueOld g m ty = - match tryDestAppTy g ty with ValueSome tcref -> TyconRefNullIsExtraValueOld g m tcref | _ -> true +let TypeNullIsExtraValueNew g m ty = + let sty = stripTyparEqns ty + (match tryDestAppTy g sty with + | ValueSome tcref -> TyconRefNullIsExtraValueNew g m tcref + | _ -> false) + || + (match (nullnessOfTy g sty).Evaluate() with + | NullnessInfo.AmbivalentToNull -> false + | NullnessInfo.WithoutNull -> false + | NullnessInfo.WithNull -> true) -// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this let TypeNullIsTrueValue g ty = (match tryDestAppTy g ty with | ValueSome tcref -> IsUnionTypeWithNullAsTrueValue g tcref.Deref - | _ -> false) || (isUnitTy g ty) + | _ -> false) + || (isUnitTy g ty) /// Indicates if unbox(null) is actively rejected at runtime. See nullability RFC. This applies to types that don't have null /// as a valid runtime representation under old compatiblity rules. @@ -7634,9 +7639,9 @@ let TypeNullNotLiked g m ty = && not (TypeNullIsTrueValue g ty) && not (TypeNullNever g ty) -let rec TypeHasDefaultValue g m ty = +let rec TypeHasDefaultValue isNew g m ty = let ty = stripTyEqnsAndMeasureEqns g ty - TypeNullIsExtraValueOld g m ty // consider, should this be TypeNullIsExtraValueNew + (if isNew then TypeNullIsExtraValueNew g m ty else TypeNullIsExtraValueOld g m ty) || (isStructTy g ty && // Is it an F# struct type? (if isFSharpStructTy g ty then @@ -7647,18 +7652,21 @@ let rec TypeHasDefaultValue g m ty = // We can ignore fields with the DefaultValue(false) attribute |> List.filter (fun fld -> not (TryFindFSharpBoolAttribute g g.attrib_DefaultValueAttribute fld.FieldAttribs = Some(false))) - flds |> List.forall (actualTyOfRecdField (mkTyconRefInst tcref tinst) >> TypeHasDefaultValue g m) + flds |> List.forall (actualTyOfRecdField (mkTyconRefInst tcref tinst) >> TypeHasDefaultValue isNew g m) elif isStructTupleTy g ty then - destStructTupleTy g ty |> List.forall (TypeHasDefaultValue g m) + destStructTupleTy g ty |> List.forall (TypeHasDefaultValue isNew g m) elif isStructAnonRecdTy g ty then match tryDestAnonRecdTy g ty with | ValueNone -> true - | ValueSome (_, ptys) -> ptys |> List.forall (TypeHasDefaultValue g m) + | ValueSome (_, ptys) -> ptys |> List.forall (TypeHasDefaultValue isNew g m) else // All struct types defined in other .NET languages have a DefaultValue regardless of their // instantiation true)) +let TypeHasDefaultValueOld g m ty = TypeHasDefaultValue false g m ty + +let TypeHasDefaultValueNew g m ty = TypeHasDefaultValue true g m ty /// Determines types that are potentially known to satisfy the 'comparable' constraint and returns /// a set of residual types that must also satisfy the constraint diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index 786c5a3f34b..c7b544028d2 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -1148,7 +1148,8 @@ val TyconRefNullIsExtraValueOld : TcGlobals -> range -> TyconRef -> bool val TyconRefNullIsExtraValueNew : TcGlobals -> range -> TyconRef -> bool val TypeNullNever : TcGlobals -> TType -> bool -val TypeHasDefaultValue : TcGlobals -> range -> TType -> bool +val TypeHasDefaultValueNew: TcGlobals -> range -> TType -> bool +val TypeHasDefaultValueOld: TcGlobals -> range -> TType -> bool val isAbstractTycon : Tycon -> bool diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 058dfebc550..6eebe48ddd0 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -4239,9 +4239,10 @@ and member ccu.IsUnresolvedReference = isNull (box ccu.target) || ccu.orphanfixup #else member ccu.Deref = - if isNull ccu.target || ccu.orphanfixup then - raise(UnresolvedReferenceNoRange ccu.name) - nonNull ccu.target + match ccu.target with + | null -> raise(UnresolvedReferenceNoRange ccu.name) + | _ when ccu.orphanfixup -> raise(UnresolvedReferenceNoRange ccu.name) + | NonNull tg -> tg member ccu.IsUnresolvedReference = isNull ccu.target || ccu.orphanfixup #endif diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index 4ac942b4a0a..e6047b88f84 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index f1932f54254..80245aa6641 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.en.xlf b/src/fsharp/xlf/FSComp.txt.en.xlf index 7ee457dee81..0ce65bd9d77 100644 --- a/src/fsharp/xlf/FSComp.txt.en.xlf +++ b/src/fsharp/xlf/FSComp.txt.en.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index c19624b33a3..b3ab8982543 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index f78e4971445..869cb375b7c 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 0b5024f36e9..cb17ede4115 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index 9ce4536ab86..c2e1ec04e25 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index 5c247a140b4..a109856029d 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index c0671b9364f..95078975221 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 06af966238a..46a81b6512c 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index e3d22199bc9..8478b1fee93 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index bcf94d86653..67ec8085090 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index 3019883ef53..63fc63ce94d 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index 245299f2f45..b575023e64c 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -7167,6 +7167,16 @@ The constraints 'delegate' and 'comparison' are inconsistent + + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + \ No newline at end of file diff --git a/tests/fsharp/core/nullness/test.fsx b/tests/fsharp/core/nullness/test.fsx index 01caaed0472..fb7598f986e 100644 --- a/tests/fsharp/core/nullness/test.fsx +++ b/tests/fsharp/core/nullness/test.fsx @@ -207,3 +207,106 @@ let f5 x = (x: int) //let f3 x = (x: (string | null)) +module NullConstraintTests = + type C<'T when 'T : null>() = class end + +#if NEGATIVE + let f1 (y : C< (int * int) >) = y // This gave an error in F# 4.5 and we expect it to continue to give an error + +#endif + + // This gave an error in F# 4.5. It now only gives a warning when /checknulls is on which is sort of ok + // since we are treating .NET and F# types more symmetrically. + // + // TODO: However it gives no error or warning at all with /checknulls off in F# 5.0... That seems bad. + let f2 (y : C) = y + + let f3 (y : C) = y // Expect a nullability warning + + let f4 (y : C) = y // No warning expected + + let f5 (y : C) = y // No warning expected + +module DefaultValueTests = + + + module StructExamples = + [] + type C1 = + [] + val mutable Whoops : string // expect a warning + + [] + type C2 = + [] + val mutable Whoops : string // expect no warning + + [] + type C3 = + [] + val mutable Whoops : string? // expect no warning + +#if NEGATIVE + [] + type C4a = + [] + val mutable Whoops : int list // expect a hard error like in F# 4.5 +#endif + + [] + type C4b = + [] + val mutable Whoops : int list? // expect no warning + +#if NEGATIVE + [] + type C5 = + [] + val mutable Whoops : int * int // expect an error like F# 4.5 + + [] + type C6 = + [] + val mutable Whoops : int -> int // expect an error like F# 4.5 +#endif + + [] + type C7 = + [] + val mutable Whoops : (int -> int)? // expect no warning + + module ClassExamples = + type C1 = + [] + val mutable Whoops : string // expect a warning + + type C2 = + [] + val mutable Whoops : string // expect no warning + + type C3 = + [] + val mutable Whoops : string? // expect no warning + + type C4a = + [] + val mutable Whoops : int list // ** expect a warning + + type C4b = + [] + val mutable Whoops : int list? // expect no warning + + #if NEGATIVE + type C5 = + [] + val mutable Whoops : int * int // expect an error like F# 4.5 + + type C6 = + [] + val mutable Whoops : int -> int // expect an error like F# 4.5 + #endif + + type C7 = + [] + val mutable Whoops : (int -> int)? // expect no warning + \ No newline at end of file From 21f4cd5096c67381cd0f7c56e802d48aef8a5727 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 15 Nov 2018 19:25:02 +0000 Subject: [PATCH 027/137] FSharp.Editor --- src/fsharp/FSharp.Core/option.fs | 20 +++++++++++++ src/fsharp/FSharp.Core/option.fsi | 12 ++++++-- .../BraceCompletionSessionProvider.fs | 28 ++++++++++--------- .../ClassificationDefinitions.fs | 10 +++---- .../CodeLens/CodeLensProvider.fs | 4 +-- .../CodeLens/FSharpCodeLensService.fs | 14 ++++++---- .../Commands/FsiCommandService.fs | 5 ++-- .../src/FSharp.Editor/Common/Extensions.fs | 18 ++++++------ .../src/FSharp.Editor/Common/Logging.fs | 2 +- .../src/FSharp.Editor/Common/RoslynHelpers.fs | 2 +- vsintegration/src/FSharp.Editor/Common/Vs.fs | 6 ++-- .../src/FSharp.Editor/FSharp.Editor.fsproj | 2 +- .../LanguageService/FSharpEditorFactory.fs | 6 ++-- .../LanguageService/LanguageService.fs | 12 ++++---- .../LegacyProjectWorkspaceMap.fs | 2 +- .../LanguageService/ProjectSitesAndFiles.fs | 2 +- .../Navigation/GoToDefinition.fs | 8 +++--- .../Navigation/NavigableSymbolsService.fs | 6 ++-- .../Navigation/NavigationBarItemService.fs | 2 +- .../QuickInfo/QuickInfoProvider.fs | 8 +++--- .../src/FSharp.VS.FSI/fsiPackageHooks.fs | 2 +- 21 files changed, 102 insertions(+), 69 deletions(-) diff --git a/src/fsharp/FSharp.Core/option.fs b/src/fsharp/FSharp.Core/option.fs index 552d1c9231f..2a1d65f672a 100644 --- a/src/fsharp/FSharp.Core/option.fs +++ b/src/fsharp/FSharp.Core/option.fs @@ -85,11 +85,21 @@ module Option = [] let ofNullable (value:System.Nullable<'T>) = if value.HasValue then Some value.Value else None +#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? [] let ofObj value = match value with null -> None | _ -> Some value [] let toObj value = match value with None -> null | Some x -> x +#else + [] + let ofObj (value: 'T?) : 'T option when 'T: not struct and 'T : not null = + match value with null -> None | _ -> Some value + + [] + let toObj (value: 'T option) : 'T? when 'T: not struct and 'T : not null = + match value with None -> null | Some x -> x +#endif module ValueOption = @@ -171,8 +181,18 @@ module ValueOption = [] let ofNullable (value:System.Nullable<'T>) = if value.HasValue then ValueSome value.Value else ValueNone +#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? [] let ofObj value = match value with null -> ValueNone | _ -> ValueSome value [] let toObj value = match value with ValueNone -> null | ValueSome x -> x +#else + [] + let ofObj (value: 'T?) : 'T voption when 'T: not struct and 'T : not null = + match value with null -> ValueNone | _ -> ValueSome value + + [] + let toObj (value : 'T voption) : 'T? when 'T: not struct and 'T : not null = + match value with ValueNone -> null | ValueSome x -> x +#endif \ No newline at end of file diff --git a/src/fsharp/FSharp.Core/option.fsi b/src/fsharp/FSharp.Core/option.fsi index 739484ae8cf..a74273f88d2 100644 --- a/src/fsharp/FSharp.Core/option.fsi +++ b/src/fsharp/FSharp.Core/option.fsi @@ -190,13 +190,13 @@ module Option = /// The input value. /// The result option. [] - val ofObj: value: 'T -> 'T option when 'T : null + val ofObj: value: 'T? -> 'T option when 'T : not struct and 'T : not null /// Convert an option to a potentially null value. /// The input value. /// The result value, which is null if the input was None. [] - val toObj: value: 'T option -> 'T when 'T : null + val toObj: value: 'T option -> 'T? when 'T : not struct and 'T : not null /// Basic operations on value options. module ValueOption = @@ -379,10 +379,18 @@ module ValueOption = /// The input value. /// The result value option. [] +#if BUILDING_WITH_LKG // TODO NULLNESS: assess this - is it a breaking change? val ofObj: value: 'T -> 'T voption when 'T : null +#else + val ofObj: value: 'T? -> 'T voption when 'T : not struct and 'T : not null +#endif /// Convert an option to a potentially null value. /// The input value. /// The result value, which is null if the input was ValueNone. [] +#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? val toObj: value: 'T voption -> 'T when 'T : null +#else + val toObj: value: 'T voption -> 'T? when 'T : not struct and 'T : not null +#endif diff --git a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs index dd3be821094..53127e72e56 100644 --- a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs +++ b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs @@ -42,7 +42,6 @@ module BraceCompletionSessionProviderHelpers = [] let BraceCompletion = "Brace_Completion" -[] type IEditorBraceCompletionSession = inherit ILanguageService @@ -58,7 +57,7 @@ type IEditorBraceCompletionSession = type IEditorBraceCompletionSessionFactory = inherit ILanguageService - abstract TryCreateSession : Document * openingPosition: int * openingBrace: char * CancellationToken -> IEditorBraceCompletionSession + abstract TryCreateSession : Document * openingPosition: int * openingBrace: char * CancellationToken -> IEditorBraceCompletionSession? type BraceCompletionSession ( @@ -73,7 +72,7 @@ type BraceCompletionSession ) = let mutable closingPoint = subjectBuffer.CurrentSnapshot.CreateTrackingPoint(openingPoint.Position, PointTrackingMode.Positive) - let mutable openingPoint : ITrackingPoint = null + let mutable openingPoint : ITrackingPoint? = null let editorOperations = editorOperationsFactoryService.GetEditorOperations(textView) member __.EndSession() = @@ -193,6 +192,9 @@ type BraceCompletionSession member this.PreBackspace handledCommand = handledCommand <- false + match openingPoint with + | null -> () + | NonNull openingPoint -> let caretPos = tryGetCaretPosition this let snapshot = subjectBuffer.CurrentSnapshot @@ -484,20 +486,20 @@ type EditorBraceCompletionSessionFactory() = | _ -> true // anything else is a valid classification type )) - member __.CreateEditorSession(_document, _openingPosition, openingBrace, _cancellationToken) = + member __.CreateEditorSession(_document, _openingPosition, openingBrace, _cancellationToken) : IEditorBraceCompletionSession? = match openingBrace with - | Parenthesis.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession - | CurlyBrackets.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession - | SquareBrackets.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession - | VerticalBar.OpenCharacter -> VerticalBarCompletionSession() :> IEditorBraceCompletionSession - | AngleBrackets.OpenCharacter -> AngleBracketCompletionSession() :> IEditorBraceCompletionSession - | DoubleQuote.OpenCharacter -> DoubleQuoteCompletionSession() :> IEditorBraceCompletionSession - | Asterisk.OpenCharacter -> AsteriskCompletionSession() :> IEditorBraceCompletionSession + | Parenthesis.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession? + | CurlyBrackets.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession? + | SquareBrackets.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession? + | VerticalBar.OpenCharacter -> VerticalBarCompletionSession() :> IEditorBraceCompletionSession? + | AngleBrackets.OpenCharacter -> AngleBracketCompletionSession() :> IEditorBraceCompletionSession? + | DoubleQuote.OpenCharacter -> DoubleQuoteCompletionSession() :> IEditorBraceCompletionSession? + | Asterisk.OpenCharacter -> AsteriskCompletionSession() :> IEditorBraceCompletionSession? | _ -> null interface IEditorBraceCompletionSessionFactory with - member this.TryCreateSession(document, openingPosition, openingBrace, cancellationToken) = + member this.TryCreateSession(document, openingPosition, openingBrace, cancellationToken) : IEditorBraceCompletionSession? = if this.IsSupportedOpeningBrace(openingBrace) && this.CheckCodeContext(document, openingPosition, openingBrace, cancellationToken) then this.CreateEditorSession(document, openingPosition, openingBrace, cancellationToken) else @@ -526,7 +528,7 @@ type BraceCompletionSessionProvider maybe { let! document = openingPoint.Snapshot.GetOpenDocumentInCurrentContextWithChanges() |> Option.ofObj let! sessionFactory = document.TryGetLanguageService() - let! session = sessionFactory.TryCreateSession(document, openingPoint.Position, openingBrace, CancellationToken.None) |> Option.ofObj + let! session = sessionFactory.TryCreateSession(document, openingPoint.Position, openingBrace, CancellationToken.None) |> Option.ofObj let undoHistory = undoManager.GetTextBufferUndoManager(textView.TextBuffer).TextBufferUndoHistory return BraceCompletionSession( diff --git a/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs b/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs index 806c54b0b35..009baad07b3 100644 --- a/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs +++ b/vsintegration/src/FSharp.Editor/Classification/ClassificationDefinitions.fs @@ -118,19 +118,19 @@ module internal ClassificationDefinitions = [] - let FSharpFunctionClassificationType : ClassificationTypeDefinition = null + let FSharpFunctionClassificationType : ClassificationTypeDefinition? = null [] - let FSharpMutableVarClassificationType : ClassificationTypeDefinition = null + let FSharpMutableVarClassificationType : ClassificationTypeDefinition? = null [] - let FSharpPrintfClassificationType : ClassificationTypeDefinition = null + let FSharpPrintfClassificationType : ClassificationTypeDefinition? = null [] - let FSharpPropertyClassificationType : ClassificationTypeDefinition = null + let FSharpPropertyClassificationType : ClassificationTypeDefinition? = null [] - let FSharpDisposableClassificationType : ClassificationTypeDefinition = null + let FSharpDisposableClassificationType : ClassificationTypeDefinition? = null [)>] [] diff --git a/vsintegration/src/FSharp.Editor/CodeLens/CodeLensProvider.fs b/vsintegration/src/FSharp.Editor/CodeLens/CodeLensProvider.fs index 415f9e5fa6d..108fcae2a02 100644 --- a/vsintegration/src/FSharp.Editor/CodeLens/CodeLensProvider.fs +++ b/vsintegration/src/FSharp.Editor/CodeLens/CodeLensProvider.fs @@ -85,12 +85,12 @@ type internal CodeLensProvider [); Name("CodeLens"); Order(Before = PredefinedAdornmentLayers.Text); TextViewRole(PredefinedTextViewRoles.Document)>] - member val CodeLensAdornmentLayerDefinition : AdornmentLayerDefinition = null with get, set + member val CodeLensAdornmentLayerDefinition : AdornmentLayerDefinition? = null with get, set [); Name("LineLens"); Order(Before = PredefinedAdornmentLayers.Text); TextViewRole(PredefinedTextViewRoles.Document)>] - member val LineLensAdornmentLayerDefinition : AdornmentLayerDefinition = null with get, set + member val LineLensAdornmentLayerDefinition : AdornmentLayerDefinition? = null with get, set interface IViewTaggerProvider with override __.CreateTagger(view, buffer) = diff --git a/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs b/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs index 902de15332a..a9b038d57ef 100644 --- a/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs +++ b/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs @@ -35,7 +35,7 @@ type internal CodeLens(taggedText, computed, fullTypeSignature, uiElement) = member val TaggedText: Async<(ResizeArray * QuickInfoNavigation) option> = taggedText member val Computed: bool = computed with get, set member val FullTypeSignature: string = fullTypeSignature - member val UiElement: UIElement = uiElement with get, set + member val UiElement: UIElement? = uiElement with get, set type internal FSharpCodeLensService ( @@ -306,7 +306,9 @@ type internal FSharpCodeLensService if res then do! Async.SwitchToContext uiContext logInfof "Adding ui element for %A" (codeLens.TaggedText) - let uiElement = codeLens.UiElement + match codeLens.UiElement with + | null -> () + | NonNull uiElement -> let animation = DoubleAnimation( To = Nullable 0.8, @@ -331,9 +333,11 @@ type internal FSharpCodeLensService lineLens.RemoveCodeLens trackingSpan |> ignore let Grid = lineLens.AddCodeLens newTrackingSpan // logInfof "Trackingspan %A is being added." trackingSpan - if codeLens.Computed && (isNull codeLens.UiElement |> not) then - let uiElement = codeLens.UiElement - lineLens.AddUiElementToCodeLensOnce (newTrackingSpan, uiElement) + if codeLens.Computed then + match codeLens.UiElement with + | null -> () + | NonNull uiElement -> + lineLens.AddUiElementToCodeLensOnce (newTrackingSpan, uiElement) else Grid.IsVisibleChanged |> Event.filter (fun eventArgs -> eventArgs.NewValue :?> bool) diff --git a/vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs b/vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs index 389d50b3cba..372947c1d97 100644 --- a/vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs +++ b/vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs @@ -17,13 +17,12 @@ open Microsoft.VisualStudio.FSharp.Interactive type internal FsiCommandFilter(serviceProvider: System.IServiceProvider) = - let loadPackage (guidString: string) = + let loadPackage (guidString: string) : Lazy< Package? > = lazy( let shell = serviceProvider.GetService(typeof) :?> IVsShell let packageToBeLoadedGuid = ref (Guid(guidString)) match shell.LoadPackage packageToBeLoadedGuid with - | VSConstants.S_OK, pkg -> - pkg :?> Package + | VSConstants.S_OK, pkg -> unbox pkg | _ -> null) let fsiPackage = loadPackage FSharpConstants.fsiPackageGuidString diff --git a/vsintegration/src/FSharp.Editor/Common/Extensions.fs b/vsintegration/src/FSharp.Editor/Common/Extensions.fs index d1de7e83508..4ad4418f4cb 100644 --- a/vsintegration/src/FSharp.Editor/Common/Extensions.fs +++ b/vsintegration/src/FSharp.Editor/Common/Extensions.fs @@ -181,13 +181,13 @@ module Array = /// Optimized arrays equality. ~100x faster than `array1 = array2` on strings. /// ~2x faster for floats /// ~0.8x slower for ints - let areEqual (xs: 'T []) (ys: 'T []) = + let areEqual (xs: 'T []?) (ys: 'T []?) = match xs, ys with | null, null -> true | [||], [||] -> true | null, _ | _, null -> false - | _ when xs.Length <> ys.Length -> false - | _ -> + | NonNull xs, NonNull ys when xs.Length <> ys.Length -> false + | NonNull xs, NonNull ys -> let mutable stop = false let mutable i = 0 let mutable result = true @@ -200,9 +200,11 @@ module Array = /// check if subArray is found in the wholeArray starting /// at the provided index - let isSubArray (subArray: 'T []) (wholeArray:'T []) index = - if isNull subArray || isNull wholeArray then false - elif subArray.Length = 0 then true + let isSubArray (subArray: 'T []?) (wholeArray:'T []?) index = + match subArray, wholeArray with + | null, _ | _, null -> false + | NonNull subArray, NonNull wholeArray -> + if subArray.Length = 0 then true elif subArray.Length > wholeArray.Length then false elif subArray.Length = wholeArray.Length then areEqual subArray wholeArray else let rec loop subidx idx = @@ -227,10 +229,10 @@ module Exception = /// messages recursively. let flattenMessage (root: System.Exception) = - let rec flattenInner (exc: System.Exception) = + let rec flattenInner (exc: System.Exception?) = match exc with | null -> [] - | _ -> [exc.Message] @ (flattenInner exc.InnerException) + | NonNull exc -> [exc.Message] @ (flattenInner exc.InnerException) // If an aggregate exception only has a single inner exception, use that as the root match root with diff --git a/vsintegration/src/FSharp.Editor/Common/Logging.fs b/vsintegration/src/FSharp.Editor/Common/Logging.fs index cc37f948f42..674ddbb8ccb 100644 --- a/vsintegration/src/FSharp.Editor/Common/Logging.fs +++ b/vsintegration/src/FSharp.Editor/Common/Logging.fs @@ -29,7 +29,7 @@ open Config type [] Logger [] ([)>] serviceProvider: IServiceProvider) = - let outputWindow = serviceProvider.GetService() |> Option.ofObj + let outputWindow = serviceProvider.GetService() |> Option.ofObj let createPane () = outputWindow |> Option.iter (fun x -> diff --git a/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs b/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs index a3d499da0c8..cd095767cc4 100644 --- a/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs +++ b/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs @@ -141,7 +141,7 @@ module internal RoslynHelpers = // Normalize the error message into the same format that we will receive it from the compiler. // This ensures that IntelliSense and Compiler errors in the 'Error List' are de-duplicated. // (i.e the same error does not appear twice, where the only difference is the line endings.) - let normalizedMessage = error.Message |> ErrorLogger.NormalizeErrorString |> ErrorLogger.NewlineifyErrorString + let normalizedMessage = error.Message |> withNull |> ErrorLogger.NormalizeErrorString |> ErrorLogger.NewlineifyErrorString let id = "FS" + error.ErrorNumber.ToString("0000") let emptyString = LocalizableString.op_Implicit("") diff --git a/vsintegration/src/FSharp.Editor/Common/Vs.fs b/vsintegration/src/FSharp.Editor/Common/Vs.fs index ee17ab8b381..2d56ef60419 100644 --- a/vsintegration/src/FSharp.Editor/Common/Vs.fs +++ b/vsintegration/src/FSharp.Editor/Common/Vs.fs @@ -65,14 +65,14 @@ module internal VsTextLines = dataBuffer.CurrentSnapshot.GetText() module internal VsRunningDocumentTable = - let FindDocumentWithoutLocking(rdt:IVsRunningDocumentTable, url:string) : (IVsHierarchy * IVsTextLines) option = - let (hr:int, hier:IVsHierarchy, _itemid:uint32, unkData:IntPtr, _cookie:uint32) = rdt.FindAndLockDocument(uint32 _VSRDTFLAGS.RDT_NoLock, url) + let FindDocumentWithoutLocking(rdt:IVsRunningDocumentTable, url:string) : (IVsHierarchy? * IVsTextLines?) option = + let (hr:int, hier:IVsHierarchy?, _itemid:uint32, unkData:IntPtr, _cookie:uint32) = rdt.FindAndLockDocument(uint32 _VSRDTFLAGS.RDT_NoLock, url) try if Com.Succeeded(hr) then let bufferObject = if unkData=IntPtr.Zero then null else Marshal.GetObjectForIUnknown(unkData) - let buffer = + let buffer : IVsTextLines? = match bufferObject with | :? IVsTextLines as tl -> tl | _ -> null diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index b171042315e..47cb62e548c 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -11,7 +11,7 @@ true $(SystemValueTuplePackageVersion) $(OtherFlags) --warnon:1182 --subsystemversion:6.00 - + $(OtherFlags) /checknulls true false diff --git a/vsintegration/src/FSharp.Editor/LanguageService/FSharpEditorFactory.fs b/vsintegration/src/FSharp.Editor/LanguageService/FSharpEditorFactory.fs index cadf0d33e06..95364adfe46 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/FSharpEditorFactory.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/FSharpEditorFactory.fs @@ -29,10 +29,8 @@ module Constants = [] type FSharpEditorFactory(parentPackage: ShellPackage) = - let serviceProvider = - if parentPackage = null then - nullArg "parentPackage" - parentPackage :> IServiceProvider + let parentPackage = nullArgCheck "parentPackage" parentPackage + let serviceProvider = parentPackage :> IServiceProvider let componentModel = serviceProvider.GetService(typeof) :?> IComponentModel let editorAdaptersFactoryService = componentModel.GetService() let contentTypeRegistryService = componentModel.GetService() diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs index 0621b0fd9b4..0ba28ffd5e2 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs @@ -52,11 +52,11 @@ type internal FSharpCheckerWorkspaceService = type internal RoamingProfileStorageLocation(keyName: string) = inherit OptionStorageLocation() - member __.GetKeyNameForLanguage(languageName: string) = + member __.GetKeyNameForLanguage(languageName: string?) = let unsubstitutedKeyName = keyName match languageName with | null -> unsubstitutedKeyName - | _ -> + | NonNull languageName -> let substituteLanguageName = if languageName = FSharpConstants.FSharpLanguageName then "FSharp" else languageName unsubstitutedKeyName.Replace("%LANGUAGE%", substituteLanguageName) @@ -271,23 +271,23 @@ type internal FSharpLanguageService(package : FSharpPackage, solution: IVsSoluti // This is the path for .fs/.fsi files in legacy projects () - | h when not (isNull h) && not (IsScript(filename)) -> + | NotNull hier when not (IsScript(filename)) -> let docId = this.Workspace.CurrentSolution.GetDocumentIdsWithFilePath(filename).FirstOrDefault() match docId with | null -> - if not (h.IsCapabilityMatch("CPS")) then + if not (hier.IsCapabilityMatch("CPS")) then // This is the path when opening out-of-project .fs/.fsi files in CPS projects let fileContents = VsTextLines.GetFileContents(textLines, textViewAdapter) this.SetupStandAloneFile(filename, fileContents, this.Workspace, hier) | _ -> () - | _ -> + | NotNull hier -> // This is the path for both in-project and out-of-project .fsx files let fileContents = VsTextLines.GetFileContents(textLines, textViewAdapter) this.SetupStandAloneFile(filename, fileContents, this.Workspace, hier) - + | _ -> () | _ -> () | _ -> () diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LegacyProjectWorkspaceMap.fs b/vsintegration/src/FSharp.Editor/LanguageService/LegacyProjectWorkspaceMap.fs index dfca72cba99..f4402dc4290 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LegacyProjectWorkspaceMap.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/LegacyProjectWorkspaceMap.fs @@ -122,7 +122,7 @@ type internal LegacyProjectWorkspaceMap(workspace: VisualStudioWorkspaceImpl, let fakeProjectId = workspace.ProjectTracker.GetOrCreateProjectIdForPath(projectFileName, projectDisplayName) if isNull (workspace.ProjectTracker.GetProject fakeProjectId) then - let hierarchy = + let hierarchy : IVsHierarchy? = site.ProjectProvider |> Option.map (fun p -> p :?> IVsHierarchy) |> Option.toObj diff --git a/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs b/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs index e9ce1769584..74881a686be 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/ProjectSitesAndFiles.fs @@ -212,7 +212,7 @@ type internal ProjectSitesAndFiles() = | None -> None | Some (:? IVsHierarchy as hier) -> match hier.GetProperty(VSConstants.VSITEMID_ROOT, int __VSHPROPID.VSHPROPID_ExtObject) with - | VSConstants.S_OK, (:? EnvDTE.Project as p) when not (isNull p) -> + | VSConstants.S_OK, (:? EnvDTE.Project as p) -> Some ((p.Object :?> VSLangProj.VSProject).References |> Seq.cast |> Seq.choose (fun r -> diff --git a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs index daaa1e6fa57..9344040d0bb 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs @@ -22,16 +22,16 @@ open Microsoft.FSharp.Compiler.SourceCodeServices module private Symbol = let fullName (root: ISymbol) : string = - let rec inner parts (sym: ISymbol) = + let rec inner parts (sym: ISymbol?) = match sym with | null -> parts // TODO: do we have any other terminating cases? - | sym when sym.Kind = SymbolKind.NetModule || sym.Kind = SymbolKind.Assembly -> + | NonNull sym when sym.Kind = SymbolKind.NetModule || sym.Kind = SymbolKind.Assembly -> parts - | sym when sym.MetadataName <> "" -> + | NonNull sym when sym.MetadataName <> "" -> inner (sym.MetadataName :: parts) sym.ContainingSymbol - | sym -> + | NonNull sym -> inner parts sym.ContainingSymbol inner [] root |> String.concat "." diff --git a/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs b/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs index 4ec1ef238fb..1c00b196137 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs @@ -34,7 +34,7 @@ type internal FSharpNavigableSymbolSource(checkerProvider: FSharpCheckerProvider let statusBar = StatusBar(serviceProvider.GetService()) interface INavigableSymbolSource with - member __.GetNavigableSymbolAsync(triggerSpan: SnapshotSpan, cancellationToken: CancellationToken) = + member __.GetNavigableSymbolAsync(triggerSpan: SnapshotSpan, cancellationToken: CancellationToken) : Task< INavigableSymbol? > = // Yes, this is a code smell. But this is how the editor API accepts what we would treat as None. if disposed then null else @@ -68,7 +68,7 @@ type internal FSharpNavigableSymbolSource(checkerProvider: FSharpCheckerProvider let declarationSpan = Span(declarationTextSpan.Start, declarationTextSpan.Length) let symbolSpan = SnapshotSpan(snapshot, declarationSpan) - return FSharpNavigableSymbol(navigableItem, symbolSpan, gtd, statusBar) :> INavigableSymbol + return FSharpNavigableSymbol(navigableItem, symbolSpan, gtd, statusBar) :> INavigableSymbol? else statusBar.TempMessage (SR.CannotDetermineSymbol()) @@ -80,7 +80,7 @@ type internal FSharpNavigableSymbolSource(checkerProvider: FSharpCheckerProvider // The NavigableSymbols API accepts 'null' when there's nothing to navigate to. return null } - |> Async.map Option.toObj + |> Async.map Option.toObj // TODO NULLNESS - why is this annotation needed? |> RoslynHelpers.StartAsyncAsTask cancellationToken member __.Dispose() = diff --git a/vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs b/vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs index 34fad074bac..2a6d8b65561 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/NavigationBarItemService.fs @@ -15,7 +15,7 @@ open Microsoft.CodeAnalysis.Notification open Microsoft.FSharp.Compiler.SourceCodeServices -type internal NavigationBarSymbolItem(text, glyph, spans, childItems) = +type internal NavigationBarSymbolItem(text, glyph, spans, childItems: NavigationBarItem[]?) = inherit NavigationBarItem(text, glyph, spans, childItems) [, FSharpConstants.FSharpLanguageName); Shared>] diff --git a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs index d612ecc7432..3600c4843ac 100644 --- a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs +++ b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs @@ -189,10 +189,10 @@ type internal FSharpAsyncQuickInfoSource // This method can be called from the background thread. // Do not call IServiceProvider.GetService here. - override __.GetQuickInfoItemAsync(session:IAsyncQuickInfoSession, cancellationToken:CancellationToken) : Task = + override __.GetQuickInfoItemAsync(session:IAsyncQuickInfoSession, cancellationToken:CancellationToken) : Task< QuickInfoItem? > = let triggerPoint = session.GetTriggerPoint(textBuffer.CurrentSnapshot) match triggerPoint.HasValue with - | false -> Task.FromResult(null) + | false -> Task.FromResult< QuickInfoItem? >(null) | true -> let triggerPoint = triggerPoint.GetValueOrDefault() let documentationBuilder = XmlDocumentation.CreateDocumentationBuilder(xmlMemberIndexService) @@ -218,7 +218,7 @@ type internal FSharpAsyncQuickInfoSource let docs = joinWithLineBreaks [documentation; typeParameterMap; usage; exceptions] let content = QuickInfoViewProvider.provideContent(imageId, mainDescription, docs, navigation) let span = getTrackingSpan quickInfo.Span - return QuickInfoItem(span, content) + return (QuickInfoItem(span, content) : QuickInfoItem?) | Some sigQuickInfo, Some targetQuickInfo -> let mainDescription, targetDocumentation, sigDocumentation, typeParameterMap, exceptions, usage = ResizeArray(), ResizeArray(), ResizeArray(), ResizeArray(), ResizeArray(), ResizeArray() @@ -249,7 +249,7 @@ type internal FSharpAsyncQuickInfoSource let content = QuickInfoViewProvider.provideContent(imageId, mainDescription, docs, navigation) let span = getTrackingSpan targetQuickInfo.Span return QuickInfoItem(span, content) - } |> Async.map Option.toObj + } |> Async.map Option.toObj // TODO NULLNESS - why is this annotation needed? |> RoslynHelpers.StartAsyncAsTask cancellationToken [)>] diff --git a/vsintegration/src/FSharp.VS.FSI/fsiPackageHooks.fs b/vsintegration/src/FSharp.VS.FSI/fsiPackageHooks.fs index bbe816faf91..0f0b1dbda15 100644 --- a/vsintegration/src/FSharp.VS.FSI/fsiPackageHooks.fs +++ b/vsintegration/src/FSharp.VS.FSI/fsiPackageHooks.fs @@ -66,7 +66,7 @@ module internal Hooks = let private withFSIToolWindow (this:Package) f = queryFSIToolWindow true this f () - let OnMLSend (this:Package) (action : FsiEditorSendAction) (sender:obj) (e:EventArgs) = + let OnMLSend (this:Package) (action : FsiEditorSendAction) (sender:obj) (e:EventArgs?) = withFSIToolWindow this (fun window -> match action with | ExecuteSelection -> window.MLSendSelection(sender, e) From 8c0d9f4a5acd8171dc817d68eb8078c0c676d30c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 15 Nov 2018 19:35:32 +0000 Subject: [PATCH 028/137] FSharp.Editor --- .../BraceCompletionSessionProvider.fs | 14 +++++++------- .../CodeLens/FSharpCodeLensService.fs | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs index 53127e72e56..8ec155c9450 100644 --- a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs +++ b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs @@ -488,13 +488,13 @@ type EditorBraceCompletionSessionFactory() = member __.CreateEditorSession(_document, _openingPosition, openingBrace, _cancellationToken) : IEditorBraceCompletionSession? = match openingBrace with - | Parenthesis.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession? - | CurlyBrackets.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession? - | SquareBrackets.OpenCharacter -> ParenthesisCompletionSession() :> IEditorBraceCompletionSession? - | VerticalBar.OpenCharacter -> VerticalBarCompletionSession() :> IEditorBraceCompletionSession? - | AngleBrackets.OpenCharacter -> AngleBracketCompletionSession() :> IEditorBraceCompletionSession? - | DoubleQuote.OpenCharacter -> DoubleQuoteCompletionSession() :> IEditorBraceCompletionSession? - | Asterisk.OpenCharacter -> AsteriskCompletionSession() :> IEditorBraceCompletionSession? + | Parenthesis.OpenCharacter -> ParenthesisCompletionSession() :> _ + | CurlyBrackets.OpenCharacter -> ParenthesisCompletionSession() :> _ + | SquareBrackets.OpenCharacter -> ParenthesisCompletionSession() :> _ + | VerticalBar.OpenCharacter -> VerticalBarCompletionSession() :> _ + | AngleBrackets.OpenCharacter -> AngleBracketCompletionSession() :> _ + | DoubleQuote.OpenCharacter -> DoubleQuoteCompletionSession() :> _ + | Asterisk.OpenCharacter -> AsteriskCompletionSession() :> _ | _ -> null interface IEditorBraceCompletionSessionFactory with diff --git a/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs b/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs index a9b038d57ef..d8b859a203b 100644 --- a/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs +++ b/vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs @@ -306,6 +306,7 @@ type internal FSharpCodeLensService if res then do! Async.SwitchToContext uiContext logInfof "Adding ui element for %A" (codeLens.TaggedText) + // TODO NULLNESS - check that doing nothing when codeLens.UiElement is null is ok match codeLens.UiElement with | null -> () | NonNull uiElement -> @@ -334,6 +335,7 @@ type internal FSharpCodeLensService let Grid = lineLens.AddCodeLens newTrackingSpan // logInfof "Trackingspan %A is being added." trackingSpan if codeLens.Computed then + // TODO NULLNESS: this slightly changes control flow in the case where codeLens.UIElement is noll match codeLens.UiElement with | null -> () | NonNull uiElement -> From aa42b9db1830e133b456c05ae9717fb3a1354aa7 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 16 Nov 2018 00:40:54 +0000 Subject: [PATCH 029/137] get tests working --- src/fsharp/FSharp.Core/option.fsi | 8 ++++++++ src/fsharp/NicePrint.fs | 2 +- .../FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs | 2 +- .../FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/fsharp/FSharp.Core/option.fsi b/src/fsharp/FSharp.Core/option.fsi index a74273f88d2..7c4b0eb0320 100644 --- a/src/fsharp/FSharp.Core/option.fsi +++ b/src/fsharp/FSharp.Core/option.fsi @@ -190,13 +190,21 @@ module Option = /// The input value. /// The result option. [] +#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? + val ofObj: value: 'T -> 'T option when 'T : null +#else val ofObj: value: 'T? -> 'T option when 'T : not struct and 'T : not null +#endif /// Convert an option to a potentially null value. /// The input value. /// The result value, which is null if the input was None. [] +#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? + val toObj: value: 'T option -> 'T when 'T : null +#else val toObj: value: 'T option -> 'T? when 'T : not struct and 'T : not null +#endif /// Basic operations on value options. module ValueOption = diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs index da372ab28bc..004ffe2925d 100755 --- a/src/fsharp/NicePrint.fs +++ b/src/fsharp/NicePrint.fs @@ -913,7 +913,7 @@ module private PrintTypes = match nullness.Evaluate() with | NullnessInfo.WithNull -> part2 ^^ rightL (tagText "?") | NullnessInfo.WithoutNull -> part2 - | NullnessInfo.AmbivalentToNull -> part2 ^^ wordL (tagText "%") + | NullnessInfo.AmbivalentToNull -> part2 // TODO NULLNESS: emit this optionally ^^ wordL (tagText "%") /// Layout a type, taking precedence into account to insert brackets where needed and layoutTypeWithInfoAndPrec denv env prec ty = diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs index 0434153fbb6..8b4eda351a5 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs @@ -112,7 +112,7 @@ type BigIntType() = #endif // Null - Assert.IsFalse(a.Equals(null)) + Assert.IsFalse(a.Equals(null:obj)) // TODO NULLNESS - this type annoation was needed to resolve overloading, even with /checknulls off #if CROSS_PLATFORM_COMPILER // see https://bugzilla.xamarin.com/show_bug.cgi?id=22591 #else diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs index 3fb4395cd69..12f0ac5d7c1 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs @@ -131,7 +131,7 @@ type OptionModule() = member this.OfToObj() = Assert.IsTrue( Option.toObj (Some "3") = "3") Assert.IsTrue( Option.toObj (Some "") = "") - Assert.IsTrue( Option.toObj (Some null) = null) + Assert.IsTrue( Option.toObj (Some null) = null) // TODO NULLNESS: this type annotation should not be needed Assert.IsTrue( Option.toObj None = null) Assert.IsTrue( Option.ofObj "3" = Some "3") @@ -360,7 +360,7 @@ type ValueOptionTests() = member this.OfToObj() = Assert.IsTrue(ValueOption.toObj (ValueSome "3") = "3") Assert.IsTrue(ValueOption.toObj (ValueSome "") = "") - Assert.IsTrue(ValueOption.toObj (ValueSome null) = null) + Assert.IsTrue(ValueOption.toObj (ValueSome null) = null) // TODO NULLNESS: this type annotation should not be needed Assert.IsTrue(ValueOption.toObj ValueNone = null) Assert.IsTrue(ValueOption.ofObj "3" = ValueSome "3") From 21d2f72ebfe77ea1e19715c058550eb37b89506a Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 16 Nov 2018 14:38:10 +0000 Subject: [PATCH 030/137] add testing --- .../FSharp.Compiler.Private/FSComp.fs | 4 +- .../FSharp.Compiler.Private/FSComp.resx | 4 +- src/fsharp/FSComp.txt | 4 +- src/fsharp/TastOps.fs | 31 +++- src/fsharp/xlf/FSComp.txt.cs.xlf | 8 +- src/fsharp/xlf/FSComp.txt.de.xlf | 8 +- src/fsharp/xlf/FSComp.txt.en.xlf | 8 +- src/fsharp/xlf/FSComp.txt.es.xlf | 8 +- src/fsharp/xlf/FSComp.txt.fr.xlf | 8 +- src/fsharp/xlf/FSComp.txt.it.xlf | 8 +- src/fsharp/xlf/FSComp.txt.ja.xlf | 8 +- src/fsharp/xlf/FSComp.txt.ko.xlf | 8 +- src/fsharp/xlf/FSComp.txt.pl.xlf | 8 +- src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 8 +- src/fsharp/xlf/FSComp.txt.ru.xlf | 8 +- src/fsharp/xlf/FSComp.txt.tr.xlf | 8 +- src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 8 +- src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 8 +- tests/fsharp/core/nullness/test.fsx | 173 ++++++++++++++---- tests/fsharp/tests.fs | 76 ++++++++ 20 files changed, 294 insertions(+), 110 deletions(-) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index 198930f332c..6fe336ced15 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -4399,10 +4399,10 @@ type internal SR private() = /// This language feature is not enabled, use /langversion:5.0 or greater to enable it /// (Originally from ..\FSComp.txt:1461) static member tcLangFeatureNotEnabled50() = (3265, GetStringFunc("tcLangFeatureNotEnabled50",",,,") ) - /// Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + /// Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. /// (Originally from ..\FSComp.txt:1462) static member tcDefaultStructConstructorCallNulls() = (3266, GetStringFunc("tcDefaultStructConstructorCallNulls",",,,") ) - /// Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + /// Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. /// (Originally from ..\FSComp.txt:1463) static member chkValueWithDefaultValueMustHaveDefaultValueNulls() = (3267, GetStringFunc("chkValueWithDefaultValueMustHaveDefaultValueNulls",",,,") ) /// The constraints 'null' and 'not null' are inconsistent diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index 548079a7f7e..8f130e8f0c9 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -4403,10 +4403,10 @@ This language feature is not enabled, use /langversion:5.0 or greater to enable it - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. The constraints 'null' and 'not null' are inconsistent diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index d6d678dfded..a464fe464e8 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -1459,8 +1459,8 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl #3263 reserved for ConstraintSolverNullnessWarningWithType #3264 reserved for ConstraintSolverNonNullnessWarningWithType 3265,tcLangFeatureNotEnabled50,"This language feature is not enabled, use /langversion:5.0 or greater to enable it" -3266,tcDefaultStructConstructorCallNulls,"Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable." -3267,chkValueWithDefaultValueMustHaveDefaultValueNulls,"Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable." +3266,tcDefaultStructConstructorCallNulls,"Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable." +3267,chkValueWithDefaultValueMustHaveDefaultValueNulls,"Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable." 3268,csNullNotNullConstraintInconsistent,"The constraints 'null' and 'not null' are inconsistent" 3269,csStructNullConstraintInconsistent,"The constraints 'struct' and 'null' are inconsistent" 3270,csDelegateComparisonConstraintInconsistent,"The constraints 'delegate' and 'comparison' are inconsistent" diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index 331150bb3b3..826438c209f 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -7613,17 +7613,33 @@ let TyconRefNullIsExtraValue isNew g m (tcref: TyconRef) = let TyconRefNullIsExtraValueOld g m tcref = TyconRefNullIsExtraValue false g m tcref let TyconRefNullIsExtraValueNew g m tcref = TyconRefNullIsExtraValue true g m tcref -/// Indicates if the type admits the use of 'null' as a value +/// The F# 4.5 logic about whether a type admits the use of 'null' as a value. let TypeNullIsExtraValueOld g m ty = - match tryDestAppTy g ty with - | ValueSome tcref -> TyconRefNullIsExtraValueOld g m tcref - | _ -> false + if isILReferenceTy g ty || isDelegateTy g ty then + match tryDestAppTy g ty with + | ValueSome tcref -> + // In F# 4.x, putting AllowNullLiteralAttribute(false) on an IL or provided + // type means 'null' can't be used with that type, otherwise it can + TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref <> Some false + | _ -> + // In F# 4.5, other IL reference types (e.g. arrays) always support null + true + elif TypeNullNever g ty then + false + else + // In F# 4.x, putting AllowNullLiteralAttribute(true) on an F# type means 'null' can be used with that type + match tryDestAppTy g ty with + | ValueSome tcref -> TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true + | _ -> false -/// Indicates if the type admits the use of 'null' as a value +/// The F# 5.0 logic about whether a type admits the use of 'null' as a value. let TypeNullIsExtraValueNew g m ty = let sty = stripTyparEqns ty (match tryDestAppTy g sty with - | ValueSome tcref -> TyconRefNullIsExtraValueNew g m tcref + | ValueSome tcref -> + not tcref.IsStructOrEnumTycon && + not (isByrefLikeTyconRef g m tcref) && + (TryFindTyconRefBoolAttribute g m g.attrib_AllowNullLiteralAttribute tcref = Some true) | _ -> false) || (match (nullnessOfTy g sty).Evaluate() with @@ -7631,6 +7647,7 @@ let TypeNullIsExtraValueNew g m ty = | NullnessInfo.WithoutNull -> false | NullnessInfo.WithNull -> true) +/// The F# 4.5 and 5.0 logic about whether a type uses 'null' as a true representation value let TypeNullIsTrueValue g ty = (match tryDestAppTy g ty with | ValueSome tcref -> IsUnionTypeWithNullAsTrueValue g tcref.Deref @@ -7639,8 +7656,6 @@ let TypeNullIsTrueValue g ty = /// Indicates if unbox(null) is actively rejected at runtime. See nullability RFC. This applies to types that don't have null /// as a valid runtime representation under old compatiblity rules. -// -// TODO NULLNESS: Consider whether we need to adjust this predicate, and the compatibility issues with doing this let TypeNullNotLiked g m ty = not (TypeNullIsExtraValueOld g m ty) && not (TypeNullIsTrueValue g ty) diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index b6fb46e62c0..755e9b06e75 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index dbe479813ce..2da39c9deb5 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.en.xlf b/src/fsharp/xlf/FSComp.txt.en.xlf index c46e9a5340e..f6a9392473f 100644 --- a/src/fsharp/xlf/FSComp.txt.en.xlf +++ b/src/fsharp/xlf/FSComp.txt.en.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index 2c8acca84b0..d7fc0734aa6 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index 04cc8309b49..6478dec00cc 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 6be1465b9af..9ff08c7a201 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index f514badb2a9..253fe940b71 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index a2136cf36c7..27a159b3973 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index de9b13b22fd..b385e12ab43 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 83e236defac..8d3adc07a7a 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index 366938f9426..cf966d89128 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index 7a36c836eab..d21d7eff2d5 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index 163c84c6d96..5f44d0d0e81 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index 92dfbc265af..3400fad6747 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -7178,13 +7178,13 @@ - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - Nullability warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. diff --git a/tests/fsharp/core/nullness/test.fsx b/tests/fsharp/core/nullness/test.fsx index fb7598f986e..5879eb2d8de 100644 --- a/tests/fsharp/core/nullness/test.fsx +++ b/tests/fsharp/core/nullness/test.fsx @@ -1,4 +1,22 @@ -module M +#if TESTS_AS_APP +module Core_nullness +#endif + +#light + +let failures = ref [] + +let report_failure (s : string) = + stderr.Write" NO: " + stderr.WriteLine s + failures := !failures @ [s] + +let test (s : string) b = + stderr.Write(s) + if b then stderr.WriteLine " OK" + else report_failure (s) + +let check s v1 v2 = test s (v1 = v2) open System open System.Runtime.CompilerServices @@ -6,54 +24,95 @@ open System.Runtime.CompilerServices //let f<'T when 'T : not struct> (x: 'T?) = 1 module Basics = - let x1 : string = null // ** Expected to give a nullability warning - let x2 : string? = null // Should not give a nullability warning - let x3 : string? = "a" // Should not give a nullability warning - let x4 : string = "" // Should not give a nullability warning - - let x5 = nonNull "" // Should not give a nullability warning - let x6 = nonNull< string? > "" // **Expected to give a nullability warning + let x1 : string = null // ** Expected to give a Nullness warning + check "ekjnceoiwe1" x1 null + let x2 : string? = null // Should not give a Nullness warning + check "ekjnceoiwe2" x2 null + let x3 : string? = "a" // Should not give a Nullness warning + check "ekjnceoiwe3" x3 "a" + let x4 : string = "" // Should not give a Nullness warning + check "ekjnceoiwe4" x4 "" + + let x5 = nonNull "" // Should not give a Nullness warning + check "ekjnceoiwe5" x5 "" + let x6 = nonNull< string? > "" // **Expected to give a Nullness warning + check "ekjnceoiwe6" x6 "" let x7 = nonNull "" + check "ekjnceoiwe7" x7 "" let _x7 : string = x7 let x8 = nonNull Array.empty + check "ekjnceoiwe8" x8 [| |] let x9 = nonNull [| "" |] + check "ekjnceoiwe9" x9 [| "" |] let x10 = nonNullV (Nullable(3)) - let x11 = nonNullV (Nullable()) + check "ekjnceoiwe10" x10 3 + let x11 = try nonNullV (Nullable()) with :? System.NullReferenceException -> 10 + check "ekjnceoiwe11" x11 10 let x12 = nullV + check "ekjnceoiwe12" x12 (Nullable()) let x13 = nullV + check "ekjnceoiwe13" x13 (Nullable()) let x14 = withNullV 6L + check "ekjnceoiwe14" x14 (Nullable(6L)) let x15 : string? = withNull x4 + check "ekjnceoiwe15" x15 "" let x15a : string? = withNull "" + check "ekjnceoiwe15a" x15a "" let x15b : string? = withNull x4 - let x15c : string? = withNull< string? > x4 // **Expected to give a nullability warning + check "ekjnceoiwe15b" x15b "" + let x15c : string? = withNull< string? > x4 // **Expected to give a Nullness warning + check "ekjnceoiwe15c" x15c "" let x16 : Nullable = withNullV 3 + check "ekjnceoiwe16" x16 (Nullable(3)) - let y0 = isNull null // Should not give a nullability warning (obj) - let y1 = isNull (null: obj?) // Should not give a nullability warning - let y1b = isNull (null: string?) // Should not give a nullability warning - let y2 = isNull "" // **Expected to give a nullability warning - type instantiation of a nullable type is non-nullable string - let y9 = isNull "" // **Expected to give a nullability warning - type instantiation of a nullable type is non-nullable string - let y10 = isNull< string? > "" // Should not give a nullability warning. + let y0 = isNull null // Should not give a Nullness warning (obj) + check "ekjnceoiwey0" y0 true + let y1 = isNull (null: obj?) // Should not give a Nullness warning + check "ekjnceoiwey1" y1 true + let y1b = isNull (null: string?) // Should not give a Nullness warning + check "ekjnceoiwey1b" y1b true + let y2 = isNull "" // **Expected to give a Nullness warning - type instantiation of a nullable type is non-nullable string + check "ekjnceoiwey2" y2 false + let y9 = isNull "" // **Expected to give a Nullness warning - type instantiation of a nullable type is non-nullable string + check "ekjnceoiwey9" y9 false + let y10 = isNull< string? > "" // Should not give a Nullness warning. + check "ekjnceoiwey10" y10 false module NotNullConstraint = let f3 (x: 'T when 'T : not null) = 1 - f3 1 // Should not give an error - f3 "a" // Should not give an error - f3 (null: obj?) // Expect to give a warning - f3 (null: string?) // Expect to give a warning + let v1 = f3 1 // Should not give an error + check "ekjnceoiwev1" v1 1 + let v2 = f3 "a" // Should not give an error + check "ekjnceoiwev2" v2 1 + let v3 = f3 (null: obj?) // Expect to give a warning + check "ekjnceoiwev3" v3 1 + let v4 = f3 (null: string?) // Expect to give a warning + check "ekjnceoiwev4" v4 1 #if NEGATIVE f3 (Some 1) // Expect to give an error #endif + let w1 = 1 |> f3 // Should not give an error + check "ekjnceoiwew1" w1 1 + let w2 = "a" |> f3 // Should not give an error + check "ekjnceoiwew2" w2 1 + let w3 = (null: obj?) |> f3 // Expect to give a warning + check "ekjnceoiwew3" w3 1 + let w4 = (null: string?) |> f3 // Expect to give a warning + check "ekjnceoiwew4" w4 1 + module MemberBasics = type C() = member x.P = 1 - member x.M() = 1 + member x.M() = 2 let c : C? = C() let v1 = c.P // Expected to give a warning + check "ekjnccwwecv1" v1 1 let v2 = c.M() // Expected to give a warning + check "ekjnccwwecv2" v2 2 let f1 = c.M // Expected to give a warning + check "ekjnccwwecv3" (f1()) 2 module Basics2 = let f1 () = null @@ -76,15 +135,18 @@ module Basics2 = //let f7 () : 'T? when 'T : struct = null let f7b () : Nullable<'T> = nullV // BUG: Incorrectly gives a warning about System.ValueType with /test:AssumeNullOnImport - let f8 () : string = null // Expected to give a nullability warning + let f8 () : string = null // Expected to give a Nullness warning type C(s: string) = member __.Value = s module InteropBasics = - let s0 = String.Concat("","") // Expected to infer string? with /test:AssumeNullOnImport - let s1 : string = String.Concat("","") // Expected to gives a warning with /test:AssumeNullOnImport - let test1() = String.Concat("","") + let s0 = String.Concat("a","b") // Expected to infer string? with /test:AssumeNullOnImport + check "ekjnccberpos0" s0 "ab" + let s1 : string = String.Concat("a","c") // Expected to gives a warning with /test:AssumeNullOnImport + check "ekjnccberpos0" s1 "ac" + let test1() = String.Concat("a","d") + check "ekjnccberpos0" (test1()) "ad" let test2(s1:string, s2: string) = String.Concat(s1,s2) let test3() = String( [| 'a' |] ) let test4() = System.AppDomain.CurrentDomain @@ -129,44 +191,60 @@ module KonsoleNoNullsModule2 = let WriteLineC2(fmt, arg1) = KonsoleNoNullsModule.WriteLineC2(fmt, arg1) System.Console.WriteLine("a") -System.Console.WriteLine("a", (null: obj[])) // Expected to give a nullability warning +System.Console.WriteLine("a", (null: obj[])) // Expected to give a Nullness warning KonsoleWithNulls.WriteLine("Hello world") -KonsoleWithNulls.WriteLine(null) // WRONG: gives an incorrect nullability warning for string? and string? +KonsoleWithNulls.WriteLine(null) // WRONG: gives an incorrect Nullness warning for string? and string? KonsoleWithNulls.WriteLine("Hello","world") -KonsoleWithNulls.WriteLine("Hello","world","there") // // WRONG: gives an incorrect nullability warning for string? and string? +KonsoleWithNulls.WriteLine("Hello","world","there") // // WRONG: gives an incorrect Nullness warning for string? and string? KonsoleNoNulls.WriteLine("Hello world") -KonsoleNoNulls.WriteLine(null) // Expected to give a nullability warning +try + KonsoleNoNulls.WriteLine(null) // Expected to give a Nullness warning +with :? System.ArgumentNullException -> () KonsoleNoNulls.WriteLine("Hello","world") //KonsoleNoNulls.WriteLine("Hello",null) // CHECK ME -KonsoleNoNulls.WriteLine(null, "World") // Expected to give a nullability warning +try + KonsoleNoNulls.WriteLine(null, "World") // Expected to give a Nullness warning +with :? System.ArgumentNullException -> () KonsoleWithNullsModule.WriteLine("Hello world") -KonsoleWithNullsModule.WriteLine(null) +try + KonsoleWithNullsModule.WriteLine(null) +with :? System.ArgumentNullException -> () KonsoleWithNullsModule.WriteLine2("Hello","world") KonsoleWithNullsModule.WriteLine2("Hello",null) -KonsoleWithNullsModule.WriteLine2(null,"world") +try + KonsoleWithNullsModule.WriteLine2(null,"world") +with :? System.ArgumentNullException -> () KonsoleWithNullsModule2.WriteLine("Hello world") -KonsoleWithNullsModule2.WriteLine(null) +try + KonsoleWithNullsModule2.WriteLine(null) +with :? System.ArgumentNullException -> () KonsoleWithNullsModule2.WriteLine2("Hello","world") KonsoleWithNullsModule2.WriteLine2("Hello",null) -KonsoleWithNullsModule2.WriteLine2(null,"world") +try + KonsoleWithNullsModule2.WriteLine2(null,"world") +with :? System.ArgumentNullException -> () KonsoleNoNullsModule.WriteLine("Hello world") -KonsoleNoNullsModule.WriteLine(null) // Expected to give a nullability warning +try + KonsoleNoNullsModule.WriteLine(null) // Expected to give a Nullness warning +with :? System.ArgumentNullException -> () KonsoleNoNullsModule.WriteLine2("Hello","world") -KonsoleNoNullsModule.WriteLine2("Hello",null) // Expected to give a nullability warning -KonsoleNoNullsModule.WriteLine2(null,"world") // Expected to give a nullability warning +KonsoleNoNullsModule.WriteLine2("Hello",null) // Expected to give a Nullness warning +try + KonsoleNoNullsModule.WriteLine2(null,"world") // Expected to give a Nullness warning +with :? System.ArgumentNullException -> () //------------------------------------- // Param array cases KonsoleNoNulls.WriteLine("Hello","world","there") -KonsoleWithNulls.WriteLine("Hello","world",null) // Expected to give a nullability warning -KonsoleNoNulls.WriteLine("Hello","world",null) // Expected to give a nullability warning +KonsoleWithNulls.WriteLine("Hello","world",null) // Expected to give a Nullness warning +KonsoleNoNulls.WriteLine("Hello","world",null) // Expected to give a Nullness warning System.Console.WriteLine("a", (null: obj[]?)) System.Console.WriteLine("a", (null: obj?[]?)) @@ -221,7 +299,7 @@ module NullConstraintTests = // TODO: However it gives no error or warning at all with /checknulls off in F# 5.0... That seems bad. let f2 (y : C) = y - let f3 (y : C) = y // Expect a nullability warning + let f3 (y : C) = y // Expect a Nullness warning let f4 (y : C) = y // No warning expected @@ -309,4 +387,19 @@ module DefaultValueTests = type C7 = [] val mutable Whoops : (int -> int)? // expect no warning + +#if TESTS_AS_APP +let RUN() = !failures +#else +let aa = + match !failures with + | [] -> + stdout.WriteLine "Test Passed" + System.IO.File.WriteAllText("test.ok","ok") + exit 0 + | _ -> + stdout.WriteLine "Test Failed" + exit 1 +#endif + \ No newline at end of file diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs index d487c6cae4a..d09a637f3ce 100644 --- a/tests/fsharp/tests.fs +++ b/tests/fsharp/tests.fs @@ -164,7 +164,58 @@ module CoreTests = [] let ``test int32`` () = singleTestBuildAndRun "core/int32" FSC_BASIC + [] + let nullness () = singleTestBuildAndRun "core/nullness" FSC_BASIC + #if !FSHARP_SUITE_DRIVES_CORECLR_TESTS + [] + let ``subtype-langversion-50-checknulls`` () = + let cfg = testConfig "core/subtype" + + use testOkFile = fileguard cfg "test.ok" + + fsc cfg "%s -o:test-checknulls.exe -g --langversion:5.0 --checknulls" cfg.fsc_flags ["test.fsx"] + + exec cfg ("." ++ "test-checknulls.exe") "" + + testOkFile.CheckExists() + + [] + let ``subtype-langversion-50-checknulls`` () = + let cfg = testConfig "core/subtype" + + use testOkFile = fileguard cfg "test.ok" + + fsc cfg "%s -o:test-no-checknulls.exe -g --langversion:5.0" cfg.fsc_flags ["test.fsx"] + + exec cfg ("." ++ "test-no-checknulls.exe") "" + + testOkFile.CheckExists() + + [] + let ``subtype-langversion-45`` () = + let cfg = testConfig "core/subtype" + + use testOkFile = fileguard cfg "test.ok" + + fsc cfg "%s -o:test-langversion-45.exe -g --langversion:4.5" cfg.fsc_flags ["test.fsx"] + + exec cfg ("." ++ "test-langversion-45.exe") "" + + testOkFile.CheckExists() + + [] + let nullness_checknulls () = + let cfg = testConfig "core/nullness" + + use testOkFile = fileguard cfg "test.ok" + + fsc cfg "%s -o:test-checknulls.exe -g --checknulls" cfg.fsc_flags ["test.fsx"] + + exec cfg ("." ++ "test-checknulls.exe") "" + + testOkFile.CheckExists() + [] let ``quotes-FSC-BASIC`` () = singleTestBuildAndRun "core/quotes" FSC_BASIC @@ -965,6 +1016,31 @@ module CoreTests = let ``libtest-FSI_BASIC`` () = singleTestBuildAndRun "core/libtest" FSI_BASIC [] + let ``libtest-langversion-50-checknulls`` () = + let cfg = testConfig "core/libtest" + + use testOkFile = fileguard cfg "test.ok" + + fsc cfg "%s -o:test-checknulls.exe -g --langversion:5.0 --checknulls" cfg.fsc_flags ["test.fsx"] + + exec cfg ("." ++ "test-checknulls.exe") "" + + testOkFile.CheckExists() + + + [] + let ``libtest-langversion-45`` () = + let cfg = testConfig "core/libtest" + + use testOkFile = fileguard cfg "test.ok" + + fsc cfg "%s -o:test-langversion-45.exe -g --langversion:4.5" cfg.fsc_flags ["test.fsx"] + + exec cfg ("." ++ "test-langversion-45.exe") "" + + testOkFile.CheckExists() + + [] let ``letrec (mutrec variations part two) FSI_BASIC`` () = singleTestBuildAndRun "core/letrec-mutrec2" FSI_BASIC [] From 5b854110062f0d0c4f5c59b89afa7e017cd76fe9 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 16 Nov 2018 14:39:25 +0000 Subject: [PATCH 031/137] add testing --- tests/fsharp/tests.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs index d09a637f3ce..cf661e04c3d 100644 --- a/tests/fsharp/tests.fs +++ b/tests/fsharp/tests.fs @@ -1040,7 +1040,7 @@ module CoreTests = testOkFile.CheckExists() - [] + [] let ``letrec (mutrec variations part two) FSI_BASIC`` () = singleTestBuildAndRun "core/letrec-mutrec2" FSI_BASIC [] From 6ebd4f5fb782769b8998f78a945183b03c858944 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 16 Nov 2018 14:40:39 +0000 Subject: [PATCH 032/137] add testing --- tests/fsharp/tests.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs index cf661e04c3d..2d699bae9bc 100644 --- a/tests/fsharp/tests.fs +++ b/tests/fsharp/tests.fs @@ -181,12 +181,12 @@ module CoreTests = testOkFile.CheckExists() [] - let ``subtype-langversion-50-checknulls`` () = + let ``subtype-langversion-50-no-checknulls`` () = let cfg = testConfig "core/subtype" use testOkFile = fileguard cfg "test.ok" - fsc cfg "%s -o:test-no-checknulls.exe -g --langversion:5.0" cfg.fsc_flags ["test.fsx"] + fsc cfg "%s -o:test-no-checknulls.exe -g --langversion:5.0 --checknulls-" cfg.fsc_flags ["test.fsx"] exec cfg ("." ++ "test-no-checknulls.exe") "" From 087917599b8f825deb317c40e0c01626320eef9e Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 16 Nov 2018 23:17:04 +0000 Subject: [PATCH 033/137] coreclr build from source --- DotnetCLIToolsVersion.txt | 2 +- init-tools.cmd | 3 + src/absil/illib.fs | 22 +-- src/absil/ilread.fs | 14 +- src/absil/ilreflect.fs | 38 +++-- src/absil/ilsign.fs | 13 +- src/absil/ilsupp.fs | 2 +- src/absil/ilwritepdb.fs | 2 +- src/fsharp/AccessibilityLogic.fs | 8 +- src/fsharp/CompileOps.fs | 10 +- src/fsharp/ErrorLogger.fs | 2 +- src/fsharp/ExtensionTyping.fs | 139 +++++++++++++++++- src/fsharp/ExtensionTyping.fsi | 64 +++++++- .../FSharp.Build/FSharpCommandLineBuilder.fs | 4 +- .../FSharp.Build/FSharpEmbedResXSource.fs | 2 +- .../FSharp.Build/FSharpEmbedResourceText.fs | 2 +- src/fsharp/FSharp.Build/Fsc.fs | 45 ++---- src/fsharp/FSharp.Build/WriteCodeFragment.fs | 14 +- src/fsharp/FSharp.Core/array.fs | 6 +- src/fsharp/FSharp.Core/local.fs | 2 +- src/fsharp/FSharp.Core/option.fs | 6 +- src/fsharp/FSharp.Core/option.fsi | 12 +- src/fsharp/FSharp.Core/prim-types.fs | 24 ++- src/fsharp/FSharp.Core/prim-types.fsi | 35 ++++- src/fsharp/LexFilter.fs | 21 +++ src/fsharp/MSBuildReferenceResolver.fs | 4 +- src/fsharp/TastOps.fs | 4 + src/fsharp/TastOps.fsi | 2 +- src/fsharp/fsi/console.fs | 19 ++- src/fsharp/fsi/fsi.fs | 12 +- src/fsharp/import.fs | 6 +- src/fsharp/import.fsi | 6 +- src/fsharp/infos.fs | 9 +- src/fsharp/lib.fs | 13 +- src/fsharp/service/QuickParse.fs | 12 ++ src/fsharp/service/QuickParse.fsi | 12 ++ src/fsharp/tainted.fs | 15 +- src/fsharp/tainted.fsi | 11 +- src/fsharp/tast.fs | 9 +- src/utils/CompilerLocationUtils.fs | 2 +- src/utils/reshapedmsbuild.fs | 7 +- src/utils/reshapedreflection.fs | 68 +++++++-- src/utils/sformat.fs | 45 ++---- tests/fsharp/core/nullness/test.fsx | 17 ++- .../Commands/FsiCommandService.fs | 2 +- .../src/FSharp.Editor/Common/Logging.fs | 2 +- .../Navigation/NavigableSymbolsService.fs | 2 +- .../QuickInfo/QuickInfoProvider.fs | 4 +- 48 files changed, 556 insertions(+), 219 deletions(-) diff --git a/DotnetCLIToolsVersion.txt b/DotnetCLIToolsVersion.txt index c735fa77fd7..c36e5cc7c24 100644 --- a/DotnetCLIToolsVersion.txt +++ b/DotnetCLIToolsVersion.txt @@ -1 +1 @@ - 2.1.403 +2.1.403 diff --git a/init-tools.cmd b/init-tools.cmd index e8aaa61b92f..c78d11c90e4 100644 --- a/init-tools.cmd +++ b/init-tools.cmd @@ -27,12 +27,15 @@ if [%1]==[force] ( ) set /p DOTNET_TOOLS_VERSION=< "%~dp0DotnetCLIToolsVersion.txt" +echo Checking for "%DOTNET_TOOLS_PATH%\sdk\%DOTNET_TOOLS_VERSION%" if not exist "%DOTNET_TOOLS_PATH%\sdk\%DOTNET_TOOLS_VERSION%" ( :: dotnet cli doesn't yet exist, delete the semaphore + echo del "%BUILD_TOOLS_SEMAPHORE%" del "%BUILD_TOOLS_SEMAPHORE%" >NUL 2>&1 ) :: If sempahore exists do nothing +echo Checking for "%BUILD_TOOLS_SEMAPHORE%" if exist "%BUILD_TOOLS_SEMAPHORE%" ( echo Tools are already initialized. goto :DONE diff --git a/src/absil/illib.fs b/src/absil/illib.fs index 1164fffdd02..8c82ac10800 100644 --- a/src/absil/illib.fs +++ b/src/absil/illib.fs @@ -24,6 +24,11 @@ let notlazy v = Lazy<_>.CreateFromValue v let inline isNil l = List.isEmpty l +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE +let inline (|NonNull|) x = match x with null -> raise (NullReferenceException()) | v -> v +let inline nonNull<'T> (x: 'T) = x +#endif + /// Returns true if the list has less than 2 elements. Otherwise false. let inline isNilOrSingleton l = match l with @@ -63,7 +68,7 @@ let reportTime = type InlineDelayInit<'T when 'T : not struct> = new (f: unit -> 'T) = {store = Unchecked.defaultof<'T>; func = Func<_>(f) } val mutable store : 'T -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE val mutable func : Func<'T> #else val mutable func : Func<'T> ? @@ -1243,35 +1248,32 @@ module Shim = member __.IsPathRootedShim (path: string) = Path.IsPathRooted path member __.IsInvalidPathShim(path: string) = -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let isInvalidPath(p:string) = - String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidPathChars()) <> -1 #else let isInvalidPath(p:string?) = +#endif match p with | null | "" -> true | NonNull p -> p.IndexOfAny(Path.GetInvalidPathChars()) <> -1 -#endif -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let isInvalidFilename(p:string) = - String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1 #else let isInvalidFilename(p:string?) = +#endif match p with | null | "" -> true | NonNull p -> p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1 -#endif -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let isInvalidDirectory(d:string) = - d=null || d.IndexOfAny(Path.GetInvalidPathChars()) <> -1 #else let isInvalidDirectory(d:string?) = +#endif match d with | null -> true | NonNull d -> d.IndexOfAny(Path.GetInvalidPathChars()) <> -1 -#endif isInvalidPath (path) || let directory = Path.GetDirectoryName(path) diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index 57548872331..7d9e506951a 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -212,7 +212,7 @@ module MemoryMapping = int _flProtect, int _dwMaximumSizeLow, int _dwMaximumSizeHigh, -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE string _lpName) #else string? _lpName) @@ -895,7 +895,7 @@ type GenericParamsIdx = GenericParamsIdx of int * TypeOrMethodDefTag * int let mkCacheInt32 lowMem _inbase _nm _sz = if lowMem then (fun f x -> f x) else -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let cache = ref null #else let cache : Dictionary<_,_>? ref = ref null // TODO NULLNESS: this explicit annotation should not be needed @@ -911,11 +911,7 @@ let mkCacheInt32 lowMem _inbase _nm _sz = let c = new Dictionary(11) cache := c c -#if BUILDING_WITH_LKG - | c -> c -#else | NonNull c -> c -#endif let mutable res = Unchecked.defaultof<_> let ok = cache.TryGetValue(idx, &res) if ok then @@ -928,7 +924,7 @@ let mkCacheInt32 lowMem _inbase _nm _sz = let mkCacheGeneric lowMem _inbase _nm _sz = if lowMem then (fun f x -> f x) else -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let cache = ref null #else let cache : Dictionary<_,_>? ref = ref null // TODO NULLNESS: this explicit annotation should not be needed @@ -944,11 +940,7 @@ let mkCacheGeneric lowMem _inbase _nm _sz = let c = new Dictionary<_, _>(11) cache := c c -#if BUILDING_WITH_LKG - | c -> c -#else | NonNull c -> c -#endif match cache.TryGetValue(idx) with | true, v -> diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs index 422cba43923..cee2604a931 100644 --- a/src/absil/ilreflect.fs +++ b/src/absil/ilreflect.fs @@ -391,18 +391,14 @@ let emEnv0 = emEntryPts = [] delayedFieldInits = [] } -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let envBindTypeRef emEnv (tref:ILTypeRef) (typT: System.Type, typB, typeDef)= #else let envBindTypeRef emEnv (tref:ILTypeRef) (typT: System.Type?, typB, typeDef)= #endif match typT with | null -> failwithf "binding null type in envBindTypeRef: %s\n" tref.Name; -#if BUILDING_WITH_LKG - | typT -> -#else | NonNull typT -> -#endif {emEnv with emTypMap = Zmap.add tref (typT, typB, typeDef, None) emEnv.emTypMap} let envUpdateCreatedTypeRef emEnv (tref:ILTypeRef) = @@ -528,7 +524,7 @@ let rec convTypeSpec cenv emEnv preferCreated (tspec:ILTypeSpec) = | _ , false -> null match res with | null -> error(Error(FSComp.SR.itemNotFoundDuringDynamicCodeGen ("type", tspec.TypeRef.QualifiedName, tspec.Scope.QualifiedName), range0)) - | _ -> res + | NonNull res -> res and convTypeAux cenv emEnv preferCreated ty = match ty with @@ -670,7 +666,7 @@ let queryableTypeGetField _emEnv (parentT:Type) (fref: ILFieldRef) = let res = parentT.GetField(fref.Name, BindingFlags.Public ||| BindingFlags.NonPublic ||| BindingFlags.Instance ||| BindingFlags.Static ) match res with | null -> error(Error(FSComp.SR.itemNotFoundInTypeDuringDynamicCodeGen ("field", fref.Name, fref.DeclaringTypeRef.FullName, fref.DeclaringTypeRef.Scope.QualifiedName), range0)) - | _ -> res + | NonNull res -> res let nonQueryableTypeGetField (parentTI:Type) (fieldInfo : FieldInfo) : FieldInfo = let res = @@ -678,10 +674,10 @@ let nonQueryableTypeGetField (parentTI:Type) (fieldInfo : FieldInfo) : FieldInfo else fieldInfo match res with | null -> error(Error(FSComp.SR.itemNotFoundInTypeDuringDynamicCodeGen ("field", fieldInfo.Name, parentTI.AssemblyQualifiedName, parentTI.Assembly.FullName), range0)) - | _ -> res + | NonNull res -> res -let convFieldSpec cenv emEnv fspec = +let convFieldSpec cenv emEnv fspec : FieldInfo = let fref = fspec.FieldRef let tref = fref.DeclaringTypeRef let parentTI = convType cenv emEnv fspec.DeclaringType @@ -789,12 +785,20 @@ let queryableTypeGetMethod cenv emEnv parentT (mref:ILMethodRef) : MethodInfo = parentT.GetMethod(mref.Name, cconv ||| BindingFlags.Public ||| BindingFlags.NonPublic, null, argTs, +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE #if FX_RESHAPED_REFLECTION (null:obj[])) #else (null:ParameterModifier[])) #endif - // This can fail if there is an ambiguity w.r.t. return type +#else +#if FX_RESHAPED_REFLECTION + (null:obj[]?)) +#else + (null:ParameterModifier[]?)) +#endif +#endif + // This can fail if there is an ambiguity w.r.t. return type with _ -> null if (isNonNull methInfo && equalTypes resT methInfo.ReturnType) then methInfo @@ -803,7 +807,7 @@ let queryableTypeGetMethod cenv emEnv parentT (mref:ILMethodRef) : MethodInfo = else queryableTypeGetMethodBySearch cenv emEnv parentT mref -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let nonQueryableTypeGetMethod (parentTI:Type) (methInfo : MethodInfo) : MethodInfo = #else let nonQueryableTypeGetMethod (parentTI:Type) (methInfo : MethodInfo) : MethodInfo? = @@ -831,11 +835,7 @@ let convMethodRef cenv emEnv (parentTI:Type) (mref:ILMethodRef) : MethodInfo = queryableTypeGetMethod cenv emEnv parentTI mref match res with | null -> error(Error(FSComp.SR.itemNotFoundInTypeDuringDynamicCodeGen ("method", mref.Name, parentTI.FullName, parentTI.Assembly.FullName), range0)) -#if BUILDING_WITH_LKG - | _ -> res -#else | NonNull res -> res -#endif //---------------------------------------------------------------------------- // convMethodSpec @@ -865,10 +865,10 @@ let queryableTypeGetConstructor cenv emEnv (parentT:Type) (mref:ILMethodRef) : C let res = parentT.GetConstructor(BindingFlags.Public ||| BindingFlags.NonPublic ||| BindingFlags.Instance, null, reqArgTs, null) match res with | null -> error(Error(FSComp.SR.itemNotFoundInTypeDuringDynamicCodeGen ("constructor", mref.Name, parentT.FullName, parentT.Assembly.FullName), range0)) - | _ -> res + | NonNull res -> res -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let nonQueryableTypeGetConstructor (parentTI:Type) (consInfo : ConstructorInfo) : ConstructorInfo = #else let nonQueryableTypeGetConstructor (parentTI:Type) (consInfo : ConstructorInfo) : ConstructorInfo? = @@ -896,11 +896,7 @@ let convConstructorSpec cenv emEnv (mspec:ILMethodSpec) = queryableTypeGetConstructor cenv emEnv parentTI mref match res with | null -> error(Error(FSComp.SR.itemNotFoundInTypeDuringDynamicCodeGen ("constructor", "", parentTI.FullName, parentTI.Assembly.FullName), range0)) -#if BUILDING_WITH_LKG - | _ -> res -#else | NonNull res -> res -#endif //---------------------------------------------------------------------------- // emitLabelMark diff --git a/src/absil/ilsign.fs b/src/absil/ilsign.fs index becf5aee92b..2a7c1050e5c 100644 --- a/src/absil/ilsign.fs +++ b/src/absil/ilsign.fs @@ -10,6 +10,7 @@ open System.Collections.Immutable open System.Reflection.PortableExecutable open System.Security.Cryptography open System.Runtime.InteropServices +open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library type KeyType = | Public @@ -142,9 +143,17 @@ open System.Runtime.InteropServices key let toCLRKeyBlob (rsaParameters:RSAParameters) (algId:int) : byte[] = + +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let validateRSAField (field:byte[]) expected (name:string) = - if field <> null && field.Length <> expected then - raise (CryptographicException(String.Format(getResourceString(FSComp.SR.ilSignInvalidRSAParams()), name))) +#else + let validateRSAField (field:byte[]?) expected (name:string) = +#endif + match field with + | null -> () + | NonNull field -> + if field.Length <> expected then + raise (CryptographicException(String.Format(getResourceString(FSComp.SR.ilSignInvalidRSAParams()), name))) // The original FCall this helper emulates supports other algId's - however, the only algid we need to support is CALG_RSA_KEYX. We will not port the codepaths dealing with other algid's. if algId <> CALG_RSA_KEYX then raise (CryptographicException(getResourceString(FSComp.SR.ilSignInvalidAlgId()))) diff --git a/src/absil/ilsupp.fs b/src/absil/ilsupp.fs index 60114c73f08..ebe02818d20 100644 --- a/src/absil/ilsupp.fs +++ b/src/absil/ilsupp.fs @@ -960,7 +960,7 @@ type ISymUnmanagedWriter2 = abstract GetDebugInfo : iDD : ImageDebugDirectory byref * cData : int * pcData : int byref * -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE []data : byte[] -> unit #else []data : byte[]? -> unit diff --git a/src/absil/ilwritepdb.fs b/src/absil/ilwritepdb.fs index d01f3e8bfab..234de43265a 100644 --- a/src/absil/ilwritepdb.fs +++ b/src/absil/ilwritepdb.fs @@ -442,7 +442,7 @@ let generatePortablePdb (embedAllSource:bool) (embedSourceList:string list) (sou | None -> MetadataTokens.MethodDefinitionHandle(0) | Some x -> MetadataTokens.MethodDefinitionHandle(x) -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let deterministicIdProvider isDeterministic : System.Func, BlobContentId> = #else let deterministicIdProvider isDeterministic : System.Func, BlobContentId> ? = diff --git a/src/fsharp/AccessibilityLogic.fs b/src/fsharp/AccessibilityLogic.fs index 2472642cb66..c66f7ed5e17 100644 --- a/src/fsharp/AccessibilityLogic.fs +++ b/src/fsharp/AccessibilityLogic.fs @@ -10,6 +10,7 @@ open Microsoft.FSharp.Compiler.Infos open Microsoft.FSharp.Compiler.Tast open Microsoft.FSharp.Compiler.Tastops open Microsoft.FSharp.Compiler.TcGlobals +open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library #if !NO_EXTENSIONTYPING open Microsoft.FSharp.Compiler.ExtensionTyping @@ -327,10 +328,15 @@ let IsPropInfoAccessible g amap m ad = function | ProvidedProp (amap, tppi, m) as pp-> let access = let a = tppi.PUntaint((fun ppi -> +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let tryGetILAccessForProvidedMethodBase (mi : ProvidedMethodInfo) = +#else let tryGetILAccessForProvidedMethodBase (mi : ProvidedMethodInfo?) = // TODO NULLNESS: using ProvidedMethodBase? gives a nullness warning +#endif match mi with | null -> None - | NonNull mi -> Some(ComputeILAccess mi.IsPublic mi.IsFamily mi.IsFamilyOrAssembly mi.IsFamilyAndAssembly) + | NonNull mi -> + Some(ComputeILAccess mi.IsPublic mi.IsFamily mi.IsFamilyOrAssembly mi.IsFamilyAndAssembly) match tryGetILAccessForProvidedMethodBase(ppi.GetGetMethod()) with | None -> tryGetILAccessForProvidedMethodBase(ppi.GetSetMethod()) diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 717dee27d05..ee2d58dbef8 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -4150,10 +4150,18 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti #if !NO_EXTENSIONTYPING - member tcImports.GetProvidedAssemblyInfo(ctok, m, assembly: Tainted< ProvidedAssembly? >) = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member tcImports.GetProvidedAssemblyInfo(ctok, m, assembly: Tainted) = +#else + member tcImports.GetProvidedAssemblyInfo(ctok, m, assembly: Tainted) = +#endif match assembly with | Tainted.Null -> false,None +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + | assembly -> +#else | Tainted.NonNull assembly -> +#endif let aname = assembly.PUntaint((fun a -> a.GetName()), m) let ilShortAssemName = aname.Name match tcImports.FindCcu (ctok, m, ilShortAssemName, lookupOnly=true) with diff --git a/src/fsharp/ErrorLogger.fs b/src/fsharp/ErrorLogger.fs index bcbb606e79d..0a7c8b6904c 100755 --- a/src/fsharp/ErrorLogger.fs +++ b/src/fsharp/ErrorLogger.fs @@ -625,7 +625,7 @@ let NewlineifyErrorString (message:string) = message.Replace(stringThatIsAProxyF /// fixes given string by replacing all control chars with spaces. /// NOTE: newlines are recognized and replaced with stringThatIsAProxyForANewlineInFlatErrors (ASCII 29, the 'group separator'), /// which is decoded by the IDE with 'NewlineifyErrorString' back into newlines, so that multi-line errors can be displayed in QuickInfo -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let NormalizeErrorString (text : string) = if isNull text then nullArg "text" #else diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs index 10d93baa336..f42c5bfcbc0 100755 --- a/src/fsharp/ExtensionTyping.fs +++ b/src/fsharp/ExtensionTyping.fs @@ -135,8 +135,11 @@ module internal ExtensionTyping = let filtered = [ for t in exportedTypes do let ca = t.GetCustomAttributes(typeof, true) - if ca <> null && ca.Length > 0 then - yield t ] + match ca with + | null -> () + | NonNull ca -> + if ca.Length > 0 then + yield t ] filtered with e -> raiseError e @@ -275,7 +278,11 @@ module internal ExtensionTyping = resolver.PUntaint((fun tp -> tp.GetType().Name), m) /// Validate a provided namespace name +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let ValidateNamespaceName(name, typeProvider:Tainted, m, nsp:string) = +#else let ValidateNamespaceName(name, typeProvider:Tainted, m, nsp:string?) = +#endif match nsp with | null -> () | NonNull nsp -> @@ -367,6 +374,9 @@ module internal ExtensionTyping = #endif [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif type ProvidedType (x:System.Type, ctxt: ProvidedTypeContext) = #if FX_RESHAPED_REFLECTION inherit ProvidedMemberInfo(x.GetTypeInfo(), ctxt) @@ -398,7 +408,11 @@ module internal ExtensionTyping = member __.IsSuppressRelocate = (x.Attributes &&& enum (int32 TypeProviderTypeAttributes.SuppressRelocate)) <> enum 0 member __.IsErased = (x.Attributes &&& enum (int32 TypeProviderTypeAttributes.IsErased)) <> enum 0 member __.IsGenericType = x.IsGenericType +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member __.Namespace : string = x.Namespace +#else member __.Namespace : string? = x.Namespace +#endif member __.FullName = x.FullName member __.IsArray = x.IsArray member __.Assembly = x.Assembly |> ProvidedAssembly.Create ctxt @@ -445,7 +459,11 @@ module internal ExtensionTyping = x.GetEnumUnderlyingType() |> ProvidedType.CreateWithNullCheck ctxt "EnumUnderlyingType" +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt x : ProvidedType = +#else static member Create ctxt x : ProvidedType? = +#endif match x with | null -> null | NonNull t -> ProvidedType (t, ctxt) @@ -477,10 +495,21 @@ module internal ExtensionTyping = static member TaintedEquals (pt1:Tainted, pt2:Tainted) = Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle)) - and IProvidedCustomAttributeProvider = + and +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif + IProvidedCustomAttributeProvider = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string * int * int) option +#else abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string? * int * int) option +#endif + abstract GetXmlDocAttributes : provider:ITypeProvider -> string[] + abstract GetHasTypeProviderEditorHideMethodsAttribute : provider:ITypeProvider -> bool + abstract GetAttributeConstructorArgs: provider:ITypeProvider * attribName:string -> (obj option list * (string * obj option) list) option and ProvidedCustomAttributeProvider = @@ -528,6 +557,9 @@ module internal ExtensionTyping = |> Seq.toArray } and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedMemberInfo (x: System.Reflection.MemberInfo, ctxt) = #if FX_NO_CUSTOMATTRIBUTEDATA let provide () = ProvidedCustomAttributeProvider.Create (fun provider -> provider.GetMemberCustomAttributesData(x) :> _) @@ -545,6 +577,9 @@ module internal ExtensionTyping = member __.GetAttributeConstructorArgs (provider, attribName) = provide().GetAttributeConstructorArgs (provider, attribName) and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedParameterInfo (x: System.Reflection.ParameterInfo, ctxt) = #if FX_NO_CUSTOMATTRIBUTEDATA let provide () = ProvidedCustomAttributeProvider.Create (fun provider -> provider.GetParameterCustomAttributesData(x) :> _) @@ -564,7 +599,11 @@ module internal ExtensionTyping = /// ParameterInfo.ParameterType cannot be null member __.ParameterType = ProvidedType.CreateWithNullCheck ctxt "ParameterType" x.ParameterType +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt (x: ParameterInfo) : ProvidedParameterInfo = +#else static member Create ctxt (x: ParameterInfo?) : ProvidedParameterInfo? = +#endif match x with | null -> null | NonNull x -> ProvidedParameterInfo (x, ctxt) @@ -587,16 +626,30 @@ module internal ExtensionTyping = override __.GetHashCode() = assert false; x.GetHashCode() and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedAssembly (x: System.Reflection.Assembly, _ctxt) = member __.GetName() = x.GetName() member __.FullName = x.FullName member __.GetManifestModuleContents(provider: ITypeProvider) = provider.GetGeneratedAssemblyContents(x) + +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt x : ProvidedAssembly = match x with null -> null | t -> ProvidedAssembly (t, ctxt) +#else static member Create ctxt x : ProvidedAssembly? = match x with null -> null | t -> ProvidedAssembly (t, ctxt) +#endif + member __.Handle = x + override __.Equals y = assert false; match y with :? ProvidedAssembly as y -> x.Equals y.Handle | _ -> false + override __.GetHashCode() = assert false; x.GetHashCode() and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedMethodBase (x: System.Reflection.MethodBase, ctxt) = inherit ProvidedMemberInfo(x, ctxt) member __.Context = ctxt @@ -668,12 +721,19 @@ module internal ExtensionTyping = and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedFieldInfo (x: System.Reflection.FieldInfo, ctxt) = inherit ProvidedMemberInfo(x, ctxt) static member CreateNonNull ctxt x = ProvidedFieldInfo (x, ctxt) +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt x : ProvidedFieldInfo = +#else static member Create ctxt x : ProvidedFieldInfo? = +#endif match x with | null -> null | NonNull x -> ProvidedFieldInfo (x, ctxt) @@ -704,6 +764,9 @@ module internal ExtensionTyping = and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedMethodInfo (x: System.Reflection.MethodInfo, ctxt) = inherit ProvidedMethodBase(x, ctxt) @@ -712,12 +775,16 @@ module internal ExtensionTyping = static member CreateNonNull ctxt (x: MethodInfo) : ProvidedMethodInfo = ProvidedMethodInfo (x, ctxt) +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt (x: MethodInfo) : ProvidedMethodInfo = +#else static member Create ctxt (x: MethodInfo?) : ProvidedMethodInfo? = +#endif match x with | null -> null | NonNull x -> ProvidedMethodInfo (x, ctxt) - static member CreateArray ctxt (xs: MethodInfo[]?) : ProvidedMethodInfo[] = + static member CreateArray ctxt (xs: MethodInfo[]) : ProvidedMethodInfo[] = match box xs with | null -> [| |] | _ -> xs |> Array.map (ProvidedMethodInfo.CreateNonNull ctxt) @@ -730,6 +797,9 @@ module internal ExtensionTyping = override __.GetHashCode() = assert false; x.GetHashCode() and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedPropertyInfo (x: System.Reflection.PropertyInfo, ctxt) = inherit ProvidedMemberInfo(x, ctxt) member __.GetGetMethod() = x.GetGetMethod() |> ProvidedMethodInfo.Create ctxt @@ -742,7 +812,11 @@ module internal ExtensionTyping = static member CreateNonNull ctxt x = ProvidedPropertyInfo (x, ctxt) +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt x : ProvidedPropertyInfo = +#else static member Create ctxt x : ProvidedPropertyInfo? = +#endif match x with | null -> null | NonNull x -> ProvidedPropertyInfo (x, ctxt) @@ -767,6 +841,9 @@ module internal ExtensionTyping = Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle)) and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedEventInfo (x: System.Reflection.EventInfo, ctxt) = inherit ProvidedMemberInfo(x, ctxt) member __.GetAddMethod() = x.GetAddMethod() |> ProvidedMethodInfo.Create ctxt @@ -776,7 +853,11 @@ module internal ExtensionTyping = static member CreateNonNull ctxt x = ProvidedEventInfo (x, ctxt) +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt x : ProvidedEventInfo = +#else static member Create ctxt x : ProvidedEventInfo? = +#endif match x with | null -> null | NonNull x -> ProvidedEventInfo (x, ctxt) @@ -801,12 +882,19 @@ module internal ExtensionTyping = Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle)) and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedConstructorInfo (x: System.Reflection.ConstructorInfo, ctxt) = inherit ProvidedMethodBase(x, ctxt) static member CreateNonNull ctxt x = ProvidedConstructorInfo (x, ctxt) +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt (x: ConstructorInfo) : ProvidedConstructorInfo = +#else static member Create ctxt (x: ConstructorInfo?) : ProvidedConstructorInfo? = +#endif match x with | null -> null | NonNull x -> ProvidedConstructorInfo (x, ctxt) @@ -821,13 +909,20 @@ module internal ExtensionTyping = override __.GetHashCode() = assert false; x.GetHashCode() [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif type ProvidedExpr (x:Quotations.Expr, ctxt) = member __.Type = x.Type |> ProvidedType.Create ctxt member __.Handle = x member __.Context = ctxt member __.UnderlyingExpressionString = x.ToString() +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + static member Create ctxt t : ProvidedExpr = +#else static member Create ctxt t : ProvidedExpr? = +#endif match box t with | null -> null | _ -> ProvidedExpr (t, ctxt) @@ -1037,7 +1132,11 @@ module internal ExtensionTyping = if name <> expectedName then raise (TypeProviderError(FSComp.SR.etProvidedTypeHasUnexpectedName(expectedName, name), st.TypeProviderDesignation, m)) - let namespaceName = TryTypeMember<_, (string?)>(st, name, "Namespace", m, "", fun st -> st.Namespace) |> unmarshal // TODO NULLNESS: why is this explicit instantiation needed? +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let namespaceName = TryTypeMember(st, name, "Namespace", m, "", fun st -> st.Namespace) |> unmarshal +#else + let namespaceName = TryTypeMember<_, string?>(st, name, "Namespace", m, "", fun st -> st.Namespace) |> unmarshal // TODO NULLNESS: why is this explicit instantiation needed? +#endif let rec declaringTypes (st:Tainted) accu = match TryTypeMember(st, name, "DeclaringType", m, null, fun st -> st.DeclaringType) with @@ -1060,7 +1159,11 @@ module internal ExtensionTyping = // Do all the calling into st up front with recovery let fullName, namespaceName, usedMembers = let name = CheckAndComputeProvidedNameProperty(m, st, (fun st -> st.Name), "Name") - let namespaceName = TryTypeMember<_, (string?)>(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let namespaceName = TryTypeMember(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal +#else + let namespaceName = TryTypeMember<_, string?>(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal +#endif let fullName = TryTypeMemberNonNull(st, name, "FullName", m, FSComp.SR.invalidFullNameForProvidedType(), fun st -> st.FullName) |> unmarshal ValidateExpectedName m expectedPath expectedName st // Must be able to call (GetMethods|GetEvents|GetPropeties|GetNestedTypes|GetConstructors)(bindingFlags). @@ -1162,7 +1265,11 @@ module internal ExtensionTyping = // Validate the Name, Namespace and FullName properties let name = CheckAndComputeProvidedNameProperty(m, st, (fun st -> st.Name), "Name") +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let _namespaceName = TryTypeMember(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal +#else let _namespaceName = TryTypeMember<_, (string?)>(st, name, "Namespace", m, FSComp.SR.invalidNamespaceForProvidedType(), fun st -> st.Namespace) |> unmarshal +#endif let _fullname = TryTypeMemberNonNull(st, name, "FullName", m, FSComp.SR.invalidFullNameForProvidedType(), fun st -> st.FullName) |> unmarshal ValidateExpectedName m expectedPath expectedName st @@ -1181,7 +1288,11 @@ module internal ExtensionTyping = /// Resolve a (non-nested) provided type given a full namespace name and a type name. /// May throw an exception which will be turned into an error message by one of the 'Try' function below. /// If resolution is successful the type is then validated. - let ResolveProvidedType (resolver:Tainted, m, moduleOrNamespace:string[], typeName) : Tainted< ProvidedType? > = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let ResolveProvidedType (resolver:Tainted, m, moduleOrNamespace:string[], typeName) : Tainted = +#else + let ResolveProvidedType (resolver:Tainted, m, moduleOrNamespace:string[], typeName) : Tainted = +#endif let displayName = String.Join(".", moduleOrNamespace) // Try to find the type in the given provided namespace @@ -1364,7 +1475,11 @@ module internal ExtensionTyping = | None -> None /// Get the parts of a .NET namespace. Special rules: null means global, empty is not allowed. +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let GetPartsOfNamespaceRecover(namespaceName:string) = +#else let GetPartsOfNamespaceRecover(namespaceName:string?) = +#endif match namespaceName with | null -> [] | NonNull namespaceName -> @@ -1372,7 +1487,11 @@ module internal ExtensionTyping = else splitNamespace (nonNull namespaceName) /// Get the parts of a .NET namespace. Special rules: null means global, empty is not allowed. +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let GetProvidedNamespaceAsPath (m, resolver:Tainted, namespaceName:string) = +#else let GetProvidedNamespaceAsPath (m, resolver:Tainted, namespaceName:string?) = +#endif match namespaceName with | null -> [] | NonNull namespaceName -> @@ -1385,7 +1504,11 @@ module internal ExtensionTyping = // Can't use st.Fullname because it may be like IEnumerable // We want [System;Collections;Generic] let namespaceParts = GetPartsOfNamespaceRecover(st.PUntaint((fun st -> st.Namespace), m)) - let rec walkUpNestedClasses(st:Tainted< ProvidedType? >, soFar) = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let rec walkUpNestedClasses(st:Tainted, soFar) = +#else + let rec walkUpNestedClasses(st:Tainted, soFar) = +#endif match st with | Tainted.Null -> soFar | Tainted.NonNull st -> walkUpNestedClasses(st.PApply((fun st ->st.DeclaringType), m), soFar) @ [st.PUntaint((fun st -> st.Name), m)] diff --git a/src/fsharp/ExtensionTyping.fsi b/src/fsharp/ExtensionTyping.fsi index 58ccbe4ed93..57e2f9cd4f6 100755 --- a/src/fsharp/ExtensionTyping.fsi +++ b/src/fsharp/ExtensionTyping.fsi @@ -93,17 +93,28 @@ module internal ExtensionTyping = #endif type [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedType = inherit ProvidedMemberInfo member IsSuppressRelocate : bool member IsErased : bool member IsGenericType : bool +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member Namespace : string +#else member Namespace : string? +#endif member FullName : string member IsArray : bool member GetInterfaces : unit -> ProvidedType[] member Assembly : ProvidedAssembly +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member BaseType : ProvidedType +#else member BaseType : ProvidedType? +#endif member GetNestedType : string -> ProvidedType member GetNestedTypes : unit -> ProvidedType[] member GetAllNestedTypes : unit -> ProvidedType[] @@ -143,13 +154,24 @@ module internal ExtensionTyping = interface IProvidedCustomAttributeProvider static member TaintedEquals : Tainted * Tainted -> bool - and IProvidedCustomAttributeProvider = + and +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif + IProvidedCustomAttributeProvider = abstract GetHasTypeProviderEditorHideMethodsAttribute : provider:ITypeProvider -> bool +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string * int * int) option +#else abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string? * int * int) option +#endif abstract GetXmlDocAttributes : provider:ITypeProvider -> string[] abstract GetAttributeConstructorArgs: provider:ITypeProvider * attribName:string -> (obj option list * (string * obj option) list) option and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedAssembly = member GetName : unit -> System.Reflection.AssemblyName member FullName : string @@ -157,12 +179,22 @@ module internal ExtensionTyping = member Handle : System.Reflection.Assembly and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedMemberInfo = member Name :string +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member DeclaringType : ProvidedType +#else member DeclaringType : ProvidedType? +#endif interface IProvidedCustomAttributeProvider and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedMethodBase = inherit ProvidedMemberInfo member IsGenericMethod : bool @@ -183,6 +215,9 @@ module internal ExtensionTyping = static member TaintedEquals : Tainted * Tainted -> bool and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedMethodInfo = inherit ProvidedMethodBase member ReturnType : ProvidedType @@ -191,6 +226,9 @@ module internal ExtensionTyping = #endif and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedParameterInfo = member Name : string member ParameterType : ProvidedType @@ -202,6 +240,9 @@ module internal ExtensionTyping = interface IProvidedCustomAttributeProvider and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedFieldInfo = inherit ProvidedMemberInfo member IsInitOnly : bool @@ -218,12 +259,21 @@ module internal ExtensionTyping = static member TaintedEquals : Tainted * Tainted -> bool and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedPropertyInfo = inherit ProvidedMemberInfo +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member GetGetMethod : unit -> ProvidedMethodInfo + + member GetSetMethod : unit -> ProvidedMethodInfo +#else member GetGetMethod : unit -> ProvidedMethodInfo? member GetSetMethod : unit -> ProvidedMethodInfo? +#endif member GetIndexParameters : unit -> ProvidedParameterInfo[] @@ -238,6 +288,9 @@ module internal ExtensionTyping = static member TaintedEquals : Tainted * Tainted -> bool and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedEventInfo = inherit ProvidedMemberInfo member GetAddMethod : unit -> ProvidedMethodInfo @@ -247,16 +300,25 @@ module internal ExtensionTyping = static member TaintedEquals : Tainted * Tainted -> bool and [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif ProvidedConstructorInfo = inherit ProvidedMethodBase [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif type ProvidedExpr = member Type : ProvidedType /// Convert the expression to a string for diagnostics member UnderlyingExpressionString : string [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif type ProvidedVar = member Type : ProvidedType member Name : string diff --git a/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs b/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs index 2d9a1e9a486..5ad94163735 100644 --- a/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs +++ b/src/fsharp/FSharp.Build/FSharpCommandLineBuilder.fs @@ -50,7 +50,7 @@ type FSharpCommandLineBuilder () = if s <> String.Empty then args <- s :: args -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE member x.AppendSwitchIfNotNull(switch:string, value:string, ?metadataNames:string[]) = #else member x.AppendSwitchIfNotNull(switch:string, value:string?, ?metadataNames:string[]) = @@ -69,7 +69,7 @@ type FSharpCommandLineBuilder () = if s <> String.Empty then args <- s :: args -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE member x.AppendSwitchUnquotedIfNotNull(switch:string, value:string) = #else member x.AppendSwitchUnquotedIfNotNull(switch:string, value:string?) = diff --git a/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs b/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs index f434d78f595..fdd5a17ca9b 100644 --- a/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs +++ b/src/fsharp/FSharp.Build/FSharpEmbedResXSource.fs @@ -13,7 +13,7 @@ open Microsoft.Build.Framework open Microsoft.Build.Utilities type FSharpEmbedResXSource() = -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let mutable _buildEngine : IBuildEngine = null let mutable _hostObject : ITaskHost = null #else diff --git a/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs b/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs index 0881c125369..689fde55b1c 100644 --- a/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs +++ b/src/fsharp/FSharp.Build/FSharpEmbedResourceText.fs @@ -8,7 +8,7 @@ open Microsoft.Build.Framework open Microsoft.Build.Utilities type FSharpEmbedResourceText() = -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let mutable _buildEngine : IBuildEngine = null let mutable _hostObject : ITaskHost = null #else diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs index 27ddab72295..9002e075def 100644 --- a/src/fsharp/FSharp.Build/Fsc.fs +++ b/src/fsharp/FSharp.Build/Fsc.fs @@ -15,6 +15,12 @@ open Internal.Utilities open Microsoft.FSharp.Core.ReflectionAdapters #endif +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE +[] +module Utils = + let inline (|NonNull|) x = match x with null -> raise (NullReferenceException()) | v -> v +#endif + //There are a lot of flags on fsc.exe. //For now, not all of them are represented in the "Fsc class" object model. //The goal is to have the most common/important flags available via the Fsc class, and the @@ -50,7 +56,7 @@ type public Fsc () as this = let mutable vserrors : bool = false let mutable utf8output : bool = false -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let mutable baseAddress : string = null let mutable codePage : string = null let mutable debugType : string = null @@ -127,11 +133,7 @@ type public Fsc () as this = builder.AppendSwitchIfNotNull("--debug:", match debugType with | null -> null -#if BUILDING_WITH_LKG - | debugType -> -#else | NonNull debugType -> -#endif match debugType.ToUpperInvariant() with | "NONE" -> null | "PORTABLE" -> "portable" @@ -171,11 +173,12 @@ type public Fsc () as this = builder.AppendSwitchIfNotNull("--pdb:", pdbFile) // Platform builder.AppendSwitchIfNotNull("--platform:", -#if BUILDING_WITH_LKG - let ToUpperInvariant (s:string) = if s = null then null else s.ToUpperInvariant() +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let ToUpperInvariant (s:string) = #else - let ToUpperInvariant (s:string?) = match s with null -> null | NonNull s -> s.ToUpperInvariant() + let ToUpperInvariant (s:string?) = #endif + match s with null -> null | NonNull s -> s.ToUpperInvariant() match ToUpperInvariant(platform), prefer32bit, ToUpperInvariant(targetType) with | "ANYCPU", true, "EXE" | "ANYCPU", true, "WINEXE" -> "anycpu32bitpreferred" @@ -201,11 +204,7 @@ type public Fsc () as this = let referencePathArray = // create a array of strings match referencePath with | null -> null -#if BUILDING_WITH_LKG - | referencePath -> -#else | NonNull referencePath -> -#endif referencePath.Split([|';'; ','|], StringSplitOptions.RemoveEmptyEntries) builder.AppendSwitchesIfNotNull("--lib:", referencePathArray, ",") @@ -214,11 +213,7 @@ type public Fsc () as this = builder.AppendSwitchIfNotNull("--target:", match targetType with | null -> null -#if BUILDING_WITH_LKG - | targetType -> -#else | NonNull targetType -> -#endif match targetType.ToUpperInvariant() with | "LIBRARY" -> "library" | "EXE" -> "exe" @@ -229,11 +224,7 @@ type public Fsc () as this = // NoWarn match disabledWarnings with | null -> () -#if BUILDING_WITH_LKG - | disabledWarnings -> -#else | NonNull disabledWarnings -> -#endif builder.AppendSwitchesIfNotNull("--nowarn:", disabledWarnings.Split([|' '; ';'; ','; '\r'; '\n'|], StringSplitOptions.RemoveEmptyEntries), ",") // WarningLevel @@ -249,23 +240,14 @@ type public Fsc () as this = let warningsAsErrorsArray = match warningsAsErrors with | null -> [|"76"|] - // TODO NULLNESS: nonNull should not be needed -#if BUILDING_WITH_LKG - | warningsAsErrors -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) -#else | NonNull warningsAsErrors -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) -#endif builder.AppendSwitchesIfNotNull("--warnaserror:", warningsAsErrorsArray, ",") // WarningsNotAsErrors match warningsNotAsErrors with | null -> () -#if BUILDING_WITH_LKG - | warningsNotAsErrors -> -#else | NonNull warningsNotAsErrors -> -#endif builder.AppendSwitchesIfNotNull("--warnaserror-:", warningsNotAsErrors.Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",") // Win32ResourceFile @@ -612,15 +594,10 @@ type public Fsc () as this = override fsc.GenerateCommandLineCommands() = let builder = new FSharpCommandLineBuilder() -#if BUILDING_WITH_LKG - if not (String.IsNullOrEmpty(dotnetFscCompilerPath)) then - builder.AppendSwitch(dotnetFscCompilerPath) -#else match dotnetFscCompilerPath with | null | "" -> () | NonNull dotnetFscCompilerPath -> builder.AppendSwitch(dotnetFscCompilerPath) // TODO NULLNESS: why is this explicit instantiation needed? -#endif builder.ToString() override fsc.GenerateResponseFileCommands() = diff --git a/src/fsharp/FSharp.Build/WriteCodeFragment.fs b/src/fsharp/FSharp.Build/WriteCodeFragment.fs index c945d3aace5..8f06f160c4a 100644 --- a/src/fsharp/FSharp.Build/WriteCodeFragment.fs +++ b/src/fsharp/FSharp.Build/WriteCodeFragment.fs @@ -12,8 +12,14 @@ open System.Text open Microsoft.Build.Framework open Microsoft.Build.Utilities +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE +[] +module UtilsWriteCodeFragment = + let inline (|NonNull|) x = match x with null -> raise (NullReferenceException()) | v -> v +#endif + type WriteCodeFragment() = -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let mutable _buildEngine : IBuildEngine = null let mutable _hostObject : ITaskHost = null let mutable _outputDirectory : ITaskItem = null @@ -116,13 +122,9 @@ type WriteCodeFragment() = member this.Execute() = try -#if BUILDING_WITH_LKG - if isNull _outputFile then failwith "Output location must be specified" -#else match _outputFile with | null -> failwith "Output location must be specified" | NonNull outputFile -> -#endif let boilerplate = match _language.ToLowerInvariant() with @@ -136,7 +138,7 @@ type WriteCodeFragment() = if _language.ToLowerInvariant() = "f#" then code.AppendLine("do()") |> ignore -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let fileName = _outputFile.ItemSpec let outputFileItem = diff --git a/src/fsharp/FSharp.Core/array.fs b/src/fsharp/FSharp.Core/array.fs index a1e93c3cc45..74a104dbd40 100644 --- a/src/fsharp/FSharp.Core/array.fs +++ b/src/fsharp/FSharp.Core/array.fs @@ -572,10 +572,10 @@ namespace Microsoft.FSharp.Collections maskArray.[maskIdx] <- mask count -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let private createMask<'a> (f:'a->bool) (src:array<'a>) (maskArrayOut:byref>) (leftoverMaskOut:byref) = #else - let private createMask<'a> (f:'a->bool) (src:array<'a>) (maskArrayOut:byref< array? >) (leftoverMaskOut:byref) = + let private createMask<'a> (f:'a->bool) (src:array<'a>) (maskArrayOut:byref?>) (leftoverMaskOut:byref) = #endif let maskArrayLength = src.Length / 0x20 @@ -662,7 +662,7 @@ namespace Microsoft.FSharp.Collections dstIdx -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let private filterViaMask (maskArray:array) (leftoverMask:uint32) (count:int) (src:array<_>) = #else let private filterViaMask (maskArray:array?) (leftoverMask:uint32) (count:int) (src:array<_>) = diff --git a/src/fsharp/FSharp.Core/local.fs b/src/fsharp/FSharp.Core/local.fs index c903f56aef8..271262e6bc0 100644 --- a/src/fsharp/FSharp.Core/local.fs +++ b/src/fsharp/FSharp.Core/local.fs @@ -1096,7 +1096,7 @@ module internal Array = if len < 2 then () else Array.Sort<_>(array, fastComparerForArraySort()) -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let stableSortWithKeysAndComparer (cFast:IComparer<'Key>) (c:IComparer<'Key>) (array:array<'T>) (keys:array<'Key>) = #else let stableSortWithKeysAndComparer (cFast:IComparer<'Key>?) (c:IComparer<'Key>) (array:array<'T>) (keys:array<'Key>) = diff --git a/src/fsharp/FSharp.Core/option.fs b/src/fsharp/FSharp.Core/option.fs index 2a1d65f672a..fbd8e764960 100644 --- a/src/fsharp/FSharp.Core/option.fs +++ b/src/fsharp/FSharp.Core/option.fs @@ -85,7 +85,8 @@ module Option = [] let ofNullable (value:System.Nullable<'T>) = if value.HasValue then Some value.Value else None -#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE +// TODO NULLNESS: assess this change - is it a breaking change? [] let ofObj value = match value with null -> None | _ -> Some value @@ -181,7 +182,8 @@ module ValueOption = [] let ofNullable (value:System.Nullable<'T>) = if value.HasValue then ValueSome value.Value else ValueNone -#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + // TODO NULLNESS: assess this change - is it a breaking change? [] let ofObj value = match value with null -> ValueNone | _ -> ValueSome value diff --git a/src/fsharp/FSharp.Core/option.fsi b/src/fsharp/FSharp.Core/option.fsi index 7c4b0eb0320..0ab76897b3c 100644 --- a/src/fsharp/FSharp.Core/option.fsi +++ b/src/fsharp/FSharp.Core/option.fsi @@ -190,7 +190,8 @@ module Option = /// The input value. /// The result option. [] -#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + // TODO NULLNESS: assess this change - is it a breaking change? val ofObj: value: 'T -> 'T option when 'T : null #else val ofObj: value: 'T? -> 'T option when 'T : not struct and 'T : not null @@ -200,7 +201,8 @@ module Option = /// The input value. /// The result value, which is null if the input was None. [] -#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + // TODO NULLNESS: assess this change - is it a breaking change? val toObj: value: 'T option -> 'T when 'T : null #else val toObj: value: 'T option -> 'T? when 'T : not struct and 'T : not null @@ -387,7 +389,8 @@ module ValueOption = /// The input value. /// The result value option. [] -#if BUILDING_WITH_LKG // TODO NULLNESS: assess this - is it a breaking change? +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + // TODO NULLNESS: assess this change - is it a breaking change? val ofObj: value: 'T -> 'T voption when 'T : null #else val ofObj: value: 'T? -> 'T voption when 'T : not struct and 'T : not null @@ -397,7 +400,8 @@ module ValueOption = /// The input value. /// The result value, which is null if the input was ValueNone. [] -#if BUILDING_WITH_LKG // TODO NULLNESS: assess this change - is it a breaking change? +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + // TODO NULLNESS: assess this change - is it a breaking change? val toObj: value: 'T voption -> 'T when 'T : null #else val toObj: value: 'T voption -> 'T? when 'T : not struct and 'T : not null diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index fe186fd6d30..938a3798d51 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3354,7 +3354,7 @@ namespace Microsoft.FSharp.Core | null -> false | _ -> true -#if !BUILDING_WITH_LKG +#if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE [] let inline isNullV (value : Nullable<'T>) = not value.HasValue @@ -3445,7 +3445,7 @@ namespace Microsoft.FSharp.Core let inline nullArg (argumentName:string) = raise (new System.ArgumentNullException(argumentName)) -#if !BUILDING_WITH_LKG +#if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE [] let inline nullArgCheck (argumentName:string) (value: 'T? when 'T : not struct) = match value with @@ -3503,10 +3503,26 @@ namespace Microsoft.FSharp.Core let (^) (s1: string) (s2: string) = System.String.Concat(s1, s2) [] - let defaultArg arg defaultValue = match arg with None -> defaultValue | Some v -> v + let inline defaultArg arg defaultValue = + match arg with None -> defaultValue | Some v -> v [] - let defaultValueArg arg defaultValue = match arg with ValueNone -> defaultValue | ValueSome v -> v + let inline defaultValueArg arg defaultValue = + match arg with ValueNone -> defaultValue | ValueSome v -> v + + [] + let inline defaultIfNone defaultValue arg = + match arg with None -> defaultValue | Some v -> v + +#if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE + [] + let inline defaultIfNull defaultValue (arg: 'T? when 'T : not struct and 'T : not null) = + match arg with null -> defaultValue | _ -> (# "" arg : 'T #) + + [] + let inline defaultIfNullV defaultValue (arg: Nullable<'T>) = + if arg.HasValue then arg.Value else defaultValue +#endif [] let inline (~-) (n: ^T) : ^T = diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index f4796414787..2d8754578e8 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -952,7 +952,7 @@ namespace Microsoft.FSharp.Core val inline FastGenericComparer<'T> : System.Collections.Generic.IComparer<'T> when 'T : comparison /// Make an F# comparer object for the given type, where it can be null if System.Collections.Generic.Comparer<'T>.Default -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE val internal FastGenericComparerCanBeNull<'T> : System.Collections.Generic.IComparer<'T> when 'T : comparison #else val internal FastGenericComparerCanBeNull<'T> : System.Collections.Generic.IComparer<'T>? when 'T : comparison @@ -2149,19 +2149,42 @@ namespace Microsoft.FSharp.Core /// The function result. val inline (<|||): func:('T1 -> 'T2 -> 'T3 -> 'U) -> arg1:'T1 * arg2:'T2 * arg3:'T3 -> 'U + /// Used to specify a default value for an optional argument in the implementation of a function + /// The default value of the argument. + /// An option representing the argument. + /// The argument value. If it is None, the defaultValue is returned. + [] + val inline defaultIfNone : defaultValue:'T -> arg:'T option -> 'T + +#if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE + /// Used to specify a default value for a nullable reference argument in the implementation of a function + /// The default value of the argument. + /// A nullable value representing the argument. + /// The argument value. If it is null, the defaultValue is returned. + [] + val inline defaultIfNull : defaultValue:'T -> arg:'T? -> 'T when 'T : not struct and 'T : not null + + /// Used to specify a default value for an nullable value argument in the implementation of a function + /// The default value of the argument. + /// A nullable value representing the argument. + /// The argument value. If it is null, the defaultValue is returned. + [] + val inline defaultIfNullV : defaultValue:'T -> arg:Nullable<'T> -> 'T +#endif + /// Used to specify a default value for an optional argument in the implementation of a function /// An option representing the argument. /// The default value of the argument. /// The argument value. If it is None, the defaultValue is returned. [] - val defaultArg : arg:'T option -> defaultValue:'T -> 'T + val inline defaultArg : arg:'T option -> defaultValue:'T -> 'T /// Used to specify a default value for an optional argument in the implementation of a function /// A value option representing the argument. /// The default value of the argument. /// The argument value. If it is None, the defaultValue is returned. [] - val defaultValueArg : arg:'T voption -> defaultValue:'T -> 'T + val inline defaultValueArg : arg:'T voption -> defaultValue:'T -> 'T /// Concatenate two strings. The operator '+' may also be used. [] @@ -2259,7 +2282,7 @@ namespace Microsoft.FSharp.Core [] val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null // TODO NULLNESS addition of 'T : not struct is compat? -#if !BUILDING_WITH_LKG +#if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE /// Determines whether the given value is null. /// The value to check. /// A choice indicating whether the value is null or not-null. @@ -2297,7 +2320,7 @@ namespace Microsoft.FSharp.Core [] val inline internal isNonNull : value:'T -> bool when 'T : null -#if !BUILDING_WITH_LKG +#if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE /// Get the null value for a value type. /// The null value for a value type. [] @@ -2348,7 +2371,7 @@ namespace Microsoft.FSharp.Core [] val inline nullArg : argumentName:string -> 'T -#if !BUILDING_WITH_LKG +#if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE /// Throw a System.ArgumentNullException if the given value is null exception /// The argument name. /// The result value. diff --git a/src/fsharp/LexFilter.fs b/src/fsharp/LexFilter.fs index 30b38405ba5..6c61f0c9a3b 100755 --- a/src/fsharp/LexFilter.fs +++ b/src/fsharp/LexFilter.fs @@ -862,6 +862,7 @@ type LexFilterImpl (lightSyntaxStatus:LightSyntaxStatus, compilingFsLib, lexer, if isAdjacent tokenTup lookaheadTokenTup then let stack = ref [] let rec scanAhead nParen = + assert (nParen >= 0) let lookaheadTokenTup = popNextTokenTup() let lookaheadToken = lookaheadTokenTup.Token stack := (lookaheadTokenTup,true) :: !stack @@ -875,6 +876,26 @@ type LexFilterImpl (lightSyntaxStatus:LightSyntaxStatus, compilingFsLib, lexer, scanAhead nParen else false + | INFIX_COMPARE_OP "?>" -> + // just smash the token immediately + stack := (!stack).Tail + delayToken (lookaheadTokenTup.UseShiftedLocation(GREATER false, 1, 0)) + delayToken (lookaheadTokenTup.UseShiftedLocation(QMARK, 0, -1)) + scanAhead nParen + | INFIX_COMPARE_OP ">?>" -> + // just smash the token immediately + stack := (!stack).Tail + delayToken (lookaheadTokenTup.UseShiftedLocation(GREATER false, 2, 0)) + delayToken (lookaheadTokenTup.UseShiftedLocation(QMARK, 1, -1)) + delayToken (lookaheadTokenTup.UseShiftedLocation(GREATER false, 0, -2)) + scanAhead nParen + | INFIX_COMPARE_OP "?>>" -> + // just smash the token immediately + stack := (!stack).Tail + delayToken (lookaheadTokenTup.UseShiftedLocation(GREATER false, 2, 0)) + delayToken (lookaheadTokenTup.UseShiftedLocation(GREATER false, 1, -1)) + delayToken (lookaheadTokenTup.UseShiftedLocation(QMARK, 0, -2)) + scanAhead nParen | GREATER _ | GREATER_RBRACK | GREATER_BAR_RBRACK -> let nParen = nParen - 1 let hasAfterOp = (match lookaheadToken with GREATER _ -> false | _ -> true) diff --git a/src/fsharp/MSBuildReferenceResolver.fs b/src/fsharp/MSBuildReferenceResolver.fs index 804c6b74088..de293b9c05a 100644 --- a/src/fsharp/MSBuildReferenceResolver.fs +++ b/src/fsharp/MSBuildReferenceResolver.fs @@ -83,7 +83,7 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver /// Get the path to the .NET Framework implementation assemblies by using ToolLocationHelper.GetPathToDotNetFramework. /// This is only used to specify the "last resort" path for assembly resolution. - let GetPathToDotNetFrameworkImlpementationAssemblies(v) = + let GetPathToDotNetFrameworkImlpementationAssemblies(v) : string list = let v = match v with | Net11 -> Some TargetDotNetFrameworkVersion.Version11 @@ -103,7 +103,7 @@ module internal Microsoft.FSharp.Compiler.MSBuildReferenceResolver | Some v -> match ToolLocationHelper.GetPathToDotNetFramework v with | null -> [] - | x -> [x] + | NonNull x -> [x] | _ -> [] diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index 826438c209f..c70bbf5860c 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -6765,7 +6765,11 @@ let mkCompilationMappingAttrForQuotationResource (g:TcGlobals) (nm, tys: ILTypeR let isTypeProviderAssemblyAttr (cattr:ILAttribute) = cattr.Method.DeclaringType.BasicQualifiedName = typeof.FullName +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE +let TryDecodeTypeProviderAssemblyAttr ilg (cattr:ILAttribute) : string option = +#else let TryDecodeTypeProviderAssemblyAttr ilg (cattr:ILAttribute) : string? option = +#endif if isTypeProviderAssemblyAttr cattr then let parms, _args = decodeILAttribData ilg cattr match parms with // The first parameter to the attribute is the name of the assembly with the compiler extensions. diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index c7b544028d2..84e73cb67d2 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -1440,7 +1440,7 @@ val TryFindAttributeUsageAttribute : TcGlobals -> range -> TyconRef -> bool opti #if !NO_EXTENSIONTYPING /// returns Some(assemblyName) for success -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE val TryDecodeTypeProviderAssemblyAttr : ILGlobals -> ILAttribute -> string option #else val TryDecodeTypeProviderAssemblyAttr : ILGlobals -> ILAttribute -> string? option diff --git a/src/fsharp/fsi/console.fs b/src/fsharp/fsi/console.fs index 55c5f38dba9..2ff0759224c 100644 --- a/src/fsharp/fsi/console.fs +++ b/src/fsharp/fsi/console.fs @@ -6,6 +6,7 @@ open System open System.Text open System.Collections.Generic open Internal.Utilities +open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library /// System.Console.ReadKey appears to return an ANSI character (not the expected the unicode character). /// When this fix flag is true, this byte is converted to a char using the System.Console.InputEncoding. @@ -22,8 +23,7 @@ module internal ConsoleOptions = let fixNonUnicodeSystemConsoleReadKey = ref fixupRequired let readKeyFixup (c:char) = -#if FX_NO_SERVERCODEPAGES -#else +#if !FX_NO_SERVERCODEPAGES if !fixNonUnicodeSystemConsoleReadKey then // Assumes the c:char is actually a byte in the System.Console.InputEncoding. // Convert it to a Unicode char through the encoding. @@ -54,17 +54,24 @@ type internal History() = member x.Clear() = list.Clear(); current <- -1 +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member x.Add (line: string) = // TODO NULLNESS: explicit type annotation shouldn't be needed +#else member x.Add (line: string?) = // TODO NULLNESS: explicit type annotation shouldn't be needed +#endif match line with | null | "" -> () - | _ -> - list.Add(nonNull line) // TODO NULLNESS: explicit instantiation shouldn't be needed + | NonNull line -> list.Add(line) +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member x.AddLast (line: string) = // TODO NULLNESS: explicit type annotation shouldn't be needed +#else member x.AddLast (line: string?) = // TODO NULLNESS: explicit type annotation shouldn't be needed +#endif match line with | null | "" -> () - | _ -> - list.Add(nonNull line) // TODO NULLNESS: explicit instantiation shouldn't be needed + | NonNull line -> + list.Add(line) // TODO NULLNESS: explicit instantiation shouldn't be needed current <- list.Count member x.Previous() = diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index 222dc475f34..37697bad9d1 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -1734,17 +1734,25 @@ type internal FsiStdinLexerProvider let initialLightSyntaxStatus = tcConfigB.light <> Some false LightSyntaxStatus (initialLightSyntaxStatus, false (* no warnings *)) +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let LexbufFromLineReader (fsiStdinSyphon: FsiStdinSyphon) (readf: unit -> string) = +#else let LexbufFromLineReader (fsiStdinSyphon: FsiStdinSyphon) (readf: unit -> string?) = +#endif UnicodeLexing.FunctionAsLexbuf (fun (buf: char[], start, len) -> //fprintf fsiConsoleOutput.Out "Calling ReadLine\n" let inputOption = try Some(readf()) with :? EndOfStreamException -> None - inputOption |> Option.iter (fun t -> fsiStdinSyphon.Add ((match t with null -> "" | NonNull s -> s) + "\n")) + inputOption |> Option.iter (fun t -> fsiStdinSyphon.Add ((match t with null -> "" | NonNull t -> t) + "\n")) match inputOption with | Some(null) | None -> if !progress then fprintfn fsiConsoleOutput.Out "End of file from TextReader.ReadLine" 0 +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + | Some input -> +#else | Some (NonNull input) -> +#endif let input = input + "\n" let ninput = input.Length if ninput > len then fprintf fsiConsoleOutput.Error "%s" (FSIstrings.SR.fsiLineTooLong()) @@ -1758,7 +1766,7 @@ type internal FsiStdinLexerProvider // Reading stdin as a lex stream //---------------------------------------------------------------------------- -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let removeZeroCharsFromString (str:string) = (* bug://4466 *) #else let removeZeroCharsFromString (str:string?) : string? = (* bug://4466 *) diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs index 8c5ec642321..0d8aa8870bd 100644 --- a/src/fsharp/import.fs +++ b/src/fsharp/import.fs @@ -31,7 +31,11 @@ type AssemblyLoader = /// Get a flag indicating if an assembly is a provided assembly, plus the /// table of information recording remappings from type names in the provided assembly to type /// names in the statically linked, embedded assembly. - abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted< ProvidedAssembly? > -> bool * ProvidedAssemblyStaticLinkingMap option +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted -> bool * ProvidedAssemblyStaticLinkingMap option +#else + abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted -> bool * ProvidedAssemblyStaticLinkingMap option +#endif /// Record a root for a [] type to help guide static linking & type relocation abstract RecordGeneratedTypeRoot : ProviderGeneratedType -> unit diff --git a/src/fsharp/import.fsi b/src/fsharp/import.fsi index 91034afce19..77a25322ee7 100644 --- a/src/fsharp/import.fsi +++ b/src/fsharp/import.fsi @@ -25,7 +25,11 @@ type AssemblyLoader = /// Get a flag indicating if an assembly is a provided assembly, plus the /// table of information recording remappings from type names in the provided assembly to type /// names in the statically linked, embedded assembly. - abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted< ProvidedAssembly? > -> bool * ProvidedAssemblyStaticLinkingMap option +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted -> bool * ProvidedAssemblyStaticLinkingMap option +#else + abstract GetProvidedAssemblyInfo : CompilationThreadToken * range * Tainted -> bool * ProvidedAssemblyStaticLinkingMap option +#endif /// Record a root for a [] type to help guide static linking & type relocation abstract RecordGeneratedTypeRoot : ProviderGeneratedType -> unit diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs index a0a5e0885e9..ff742cec7c8 100755 --- a/src/fsharp/infos.fs +++ b/src/fsharp/infos.fs @@ -663,10 +663,17 @@ let OptionalArgInfoOfProvidedParameter (amap:Import.ImportMap) m (provParam : Ta NotOptional /// Compute the ILFieldInit for the given provided constant value for a provided enum type. +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE +let GetAndSanityCheckProviderMethod m (mi: Tainted<'T :> ProvidedMemberInfo>) (get : 'T -> ProvidedMethodInfo) err = + match mi.PApply((fun mi -> (get mi :> ProvidedMethodBase)),m) with + | Tainted.Null -> error(Error(err(mi.PUntaint((fun mi -> mi.Name),m),mi.PUntaint((fun mi -> mi.DeclaringType.Name),m)),m)) + | Tainted.NonNull meth -> meth +#else let GetAndSanityCheckProviderMethod m (mi: Tainted<'T :> ProvidedMemberInfo>) (get : 'T -> ProvidedMethodInfo?) err = match mi.PApply((fun mi -> (get mi :> ProvidedMethodBase?)),m) with - | Tainted.Null -> error(Error(err(mi.PUntaint((fun mi -> mi.Name),m),mi.PUntaint((fun mi -> (nonNull mi.DeclaringType).Name),m)),m)) + | Tainted.Null -> error(Error(err(mi.PUntaint((fun mi -> mi.Name),m),mi.PUntaint((fun mi -> (nonNull mi.DeclaringType).Name),m)),m)) // TODO NULLNESS: type isntantiation should not be needed | Tainted.NonNull meth -> meth +#endif /// Try to get an arbitrary ProvidedMethodInfo associated with a property. let ArbitraryMethodInfoOfPropertyInfo (pi:Tainted) m = diff --git a/src/fsharp/lib.fs b/src/fsharp/lib.fs index 72339d0f4e2..61a772f639c 100755 --- a/src/fsharp/lib.fs +++ b/src/fsharp/lib.fs @@ -21,11 +21,12 @@ let condition s = let GetEnvInteger e dflt = match System.Environment.GetEnvironmentVariable(e) with null -> dflt | t -> try int t with _ -> dflt -#if BUILDING_WITH_LKG -let dispose (x:System.IDisposable) = match x with null -> () | x -> x.Dispose() +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE +let dispose (x:System.IDisposable) = #else -let dispose (x:System.IDisposable?) = match x with null -> () | NonNull x -> x.Dispose() +let dispose (x:System.IDisposable?) = #endif + match x with null -> () | NonNull x -> x.Dispose() type SaveAndRestoreConsoleEncoding () = let savedOut = System.Console.Out @@ -462,18 +463,14 @@ module internal AsyncUtil = // Continuations that Async.FromContinuations provide do QUWI/SynchContext.Post, // so the order is not overly relevant but still. List.rev savedConts) -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let postOrQueue (sc:SynchronizationContext,cont) = #else let postOrQueue (sc:SynchronizationContext?,cont) = #endif match sc with | null -> ThreadPool.QueueUserWorkItem(fun _ -> cont res) |> ignore -#if BUILDING_WITH_LKG - | sc -> -#else | NonNull sc -> -#endif sc.Post((fun _ -> cont res), state=null) // Run continuations outside the lock diff --git a/src/fsharp/service/QuickParse.fs b/src/fsharp/service/QuickParse.fs index 9bc30b8ce92..ce6dd37abd9 100644 --- a/src/fsharp/service/QuickParse.fs +++ b/src/fsharp/service/QuickParse.fs @@ -68,7 +68,11 @@ module QuickParse = | true, _, true when name.Length > 2 -> isValidStrippedName (name.Substring(1, name.Length - 2)) 0 | _ -> false +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let GetCompleteIdentifierIslandImpl (lineStr: string) (index: int) : (string * int * bool) option = +#else let GetCompleteIdentifierIslandImpl (lineStr: string?) (index: int) : (string * int * bool) option = +#endif match lineStr with | null -> None | NonNull lineStr -> @@ -179,7 +183,11 @@ module QuickParse = let private defaultName = [], "" /// Get the partial long name of the identifier to the left of index. +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let GetPartialLongName(lineStr: string, index: int) = +#else let GetPartialLongName(lineStr: string?, index: int) = +#endif match lineStr with | null -> defaultName | NonNull lineStr -> @@ -220,7 +228,11 @@ module QuickParse = /// Get the partial long name of the identifier to the left of index. /// For example, for `System.DateTime.Now` it returns PartialLongName ([|"System"; "DateTime"|], "Now", Some 32), where "32" pos of the last dot. +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let GetPartialLongNameEx(lineStr: string, index: int) : PartialLongName = +#else let GetPartialLongNameEx(lineStr: string?, index: int) : PartialLongName = +#endif match lineStr with | null -> PartialLongName.Empty(index) | NonNull lineStr -> diff --git a/src/fsharp/service/QuickParse.fsi b/src/fsharp/service/QuickParse.fsi index 9cc321ab48d..5eca5fc94ca 100644 --- a/src/fsharp/service/QuickParse.fsi +++ b/src/fsharp/service/QuickParse.fsi @@ -69,14 +69,26 @@ module public QuickParse = /// a call to `DeclItemsForNamesAtPosition` for intellisense. This will /// allow us to use find the correct qualified items rather than resorting /// to the more expensive and less accurate environment lookup. +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + val GetCompleteIdentifierIsland : tolerateJustAfter: bool -> lineStr: string -> index: int -> (string * int * bool) option +#else val GetCompleteIdentifierIsland : tolerateJustAfter: bool -> lineStr: string? -> index: int -> (string * int * bool) option +#endif /// Get the partial long name of the identifier to the left of index. +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + val GetPartialLongName : lineStr: string * index: int -> (string list * string) +#else val GetPartialLongName : lineStr: string? * index: int -> (string list * string) +#endif /// Get the partial long name of the identifier to the left of index. /// For example, for `System.DateTime.Now` it returns PartialLongName ([|"System"; "DateTime"|], "Now", Some 32), where "32" pos of the last dot. +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + val GetPartialLongNameEx : lineStr: string * index: int -> PartialLongName +#else val GetPartialLongNameEx : lineStr: string? * index: int -> PartialLongName +#endif /// Tests whether the user is typing something like "member x." or "override (*comment*) x." val TestMemberOrOverrideDeclaration : tokens: FSharpTokenInfo[] -> bool \ No newline at end of file diff --git a/src/fsharp/tainted.fs b/src/fsharp/tainted.fs index ec63955c1e3..0a0ebefb57a 100644 --- a/src/fsharp/tainted.fs +++ b/src/fsharp/tainted.fs @@ -127,12 +127,14 @@ type internal Tainted<'T> (context : TaintedContext, value : 'T) = Tainted(context, u) member this.PApplyArray(f, methodName, range:range) = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let a : 'U[] = this.Protect f range +#else let a : 'U[]? = this.Protect f range +#endif match a with | null -> raise <| TypeProviderError(FSComp.SR.etProviderReturnedNull(methodName), this.TypeProviderDesignation, range) - | _ -> - let a = nonNull a - a |> Array.map (fun u -> Tainted(context,u)) // TODO NULLNESS: this use of nonNull should not be needed + | NonNull a -> a |> Array.map (fun u -> Tainted(context,u)) member this.PApplyOption(f,range:range) = let a = this.Protect f range @@ -161,8 +163,13 @@ type internal Tainted<'T> (context : TaintedContext, value : 'T) = module internal Tainted = - let (|Null|NonNull|) (p:Tainted< 'T? >) : Choice> when 'T : not null = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let (|Null|NonNull|) (p:Tainted<'T>) : Choice> when 'T : null = + if p.PUntaintNoFailure isNull then Null else NonNull (p.PApplyNoFailure id) +#else + let (|Null|NonNull|) (p:Tainted<'T?>) : Choice> when 'T : not null = if p.PUntaintNoFailure isNull then Null else NonNull (p.PApplyNoFailure nonNull) +#endif let Eq (p:Tainted<'T>) (v:'T) = p.PUntaintNoFailure((fun pv -> pv = v)) diff --git a/src/fsharp/tainted.fsi b/src/fsharp/tainted.fsi index c8ca1f1f8a8..122ecdbf52e 100644 --- a/src/fsharp/tainted.fsi +++ b/src/fsharp/tainted.fsi @@ -72,7 +72,11 @@ type internal Tainted<'T> = member PApplyWithProvider : ('T * ITypeProvider -> 'U) * range:range -> Tainted<'U> /// Apply an operation that returns an array. Unwrap array. Any exception will be attributed to the type provider with an error located at the given range. String is method name of thing-returning-array, to diagnostically attribute if it is null +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member PApplyArray : ('T -> 'U[]) * string * range:range -> Tainted<'U>[] +#else member PApplyArray : ('T -> 'U[]?) * string * range:range -> Tainted<'U>[] +#endif /// Apply an operation that returns an option. Unwrap option. Any exception will be attributed to the type provider with an error located at the given range member PApplyOption : ('T -> 'U option) * range:range -> Tainted<'U> option @@ -96,7 +100,12 @@ type internal Tainted<'T> = module internal Tainted = /// Test whether the tainted value is null - val (|Null|NonNull|) : Tainted< 'T? > -> Choice> when 'T : not null and 'T : not struct +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + val (|Null|NonNull|) : Tainted<'T> -> Choice> when 'T : null and 'T : not struct +#else + val (|Null|NonNull|) : Tainted<'T?> -> Choice> when 'T : not null and 'T : not struct +#endif + /// Test whether the tainted value equals given value. /// Failure in call to equality operation will be blamed on type provider of first operand diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 6eebe48ddd0..724568d0768 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -509,8 +509,7 @@ let ComputeDefinitionLocationOfProvidedItem (p : Tainted<#IProvidedCustomAttribu let attrs = p.PUntaintNoFailure(fun x -> x.GetDefinitionLocationAttribute(p.TypeProvider.PUntaintNoFailure(id))) match attrs with | None | Some (null, _, _) -> None - | Some (filePath, line, column) -> - let filePath = nonNull filePath // TODO NULLNESS: this use of nonNull should not be needed + | Some (NonNull filePath, line, column) -> // Coordinates from type provider are 1-based for lines and columns // Coordinates internally in the F# compiler are 1-based for lines and 0-based for columns let pos = Range.mkPos line (max 0 (column - 1)) @@ -4216,7 +4215,7 @@ and [] CcuThunk = { -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE mutable target: CcuData #else mutable target: CcuData? @@ -4230,7 +4229,7 @@ and name: CcuReference } -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE member ccu.Deref = if isNull (box ccu.target) || ccu.orphanfixup then raise(UnresolvedReferenceNoRange ccu.name) @@ -5477,7 +5476,7 @@ let addNullnessToTy (nullness: Nullness) (ty:TType) = | TType_app (tcr, tinst, nullnessOrig) -> TType_app (tcr, tinst, combineNullness nullnessOrig nullness) | TType_fun (d, r, nullnessOrig) -> TType_fun (d, r, combineNullness nullnessOrig nullness) //| TType_ucase _ -> None // TODO NULLNESS - //| TType_tuple _ -> None // TODOTODO NULLNESS + //| TType_tuple _ -> None // TODO NULLNESS //| TType_anon _ -> None // TODO NULLNESS | _ -> ty diff --git a/src/utils/CompilerLocationUtils.fs b/src/utils/CompilerLocationUtils.fs index 4c19789b092..bc499d08666 100644 --- a/src/utils/CompilerLocationUtils.fs +++ b/src/utils/CompilerLocationUtils.fs @@ -105,7 +105,7 @@ module internal FSharpEnvironment = let mutable uType = REG_SZ; let mutable cbData = maxDataLength; -#if BUILDING_WITH_LKG +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let res = RegQueryValueExW(hkey, null, 0u, &uType, pathResult, &cbData); #else let res = RegQueryValueExW(hkey, nonNull null, 0u, &uType, pathResult, &cbData); // TODO use of nonNull should not be required diff --git a/src/utils/reshapedmsbuild.fs b/src/utils/reshapedmsbuild.fs index 925b904e3e2..1c350c8f142 100644 --- a/src/utils/reshapedmsbuild.fs +++ b/src/utils/reshapedmsbuild.fs @@ -354,8 +354,11 @@ module internal ToolLocationHelper = // } // Doesn't need to be virtual @@@@@ - abstract member GetPathToDotNetFramework: DotNetFrameworkArchitecture -> string - default this.GetPathToDotNetFramework arch = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member this.GetPathToDotNetFramework (arch: DotNetFrameworkArchitecture) : string = +#else + member this.GetPathToDotNetFramework (arch: DotNetFrameworkArchitecture) : string? = +#endif match this.pathsToDotNetFramework.TryGetValue(arch) with | true, x -> x | _ -> diff --git a/src/utils/reshapedreflection.fs b/src/utils/reshapedreflection.fs index b1f0aeca8d4..22d5955f922 100644 --- a/src/utils/reshapedreflection.fs +++ b/src/utils/reshapedreflection.fs @@ -43,7 +43,13 @@ module internal ReflectionAdapters = let publicFlags = BindingFlags.Public ||| BindingFlags.Instance ||| BindingFlags.Static - let commit (results : _[]) = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let inline (|NonNull|) x = match x with null -> raise (NullReferenceException()) | v -> v + + let commit<'T when 'T : null> (results : 'T[]) : 'T = +#else + let commit<'T when 'T : not null> (results : 'T[]) : 'T? = +#endif match results with | [||] -> null | [| m |] -> m @@ -53,11 +59,22 @@ module internal ReflectionAdapters = (not (isNull (box accessor))) && (accessor.IsPublic || nonPublic) type System.Type with + member this.GetTypeInfo() = IntrospectionExtensions.GetTypeInfo(this) + member this.GetRuntimeProperties() = RuntimeReflectionExtensions.GetRuntimeProperties(this) + member this.GetRuntimeEvents() = RuntimeReflectionExtensions.GetRuntimeEvents(this) + member this.Attributes = this.GetTypeInfo().Attributes - member this.GetCustomAttributes(attrTy, inherits) : obj[] = downcast box(CustomAttributeExtensions.GetCustomAttributes(this.GetTypeInfo(), attrTy, inherits) |> Seq.toArray) + +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member this.GetCustomAttributes(attrTy, inherits) : obj[] = +#else + member this.GetCustomAttributes(attrTy, inherits) : obj[]? = +#endif + unbox(box(CustomAttributeExtensions.GetCustomAttributes(this.GetTypeInfo(), attrTy, inherits) |> Seq.toArray)) + member this.GetNestedType (name, bindingFlags) = // MSDN: http://msdn.microsoft.com/en-us/library/0dcb3ad5.aspx // The following BindingFlags filter flags can be used to define which nested types to include in the search: @@ -76,8 +93,13 @@ module internal ReflectionAdapters = ) |> Option.map (fun ti -> ti.AsType()) defaultArg nestedTyOpt null + // use different sources based on Declared flag - member this.GetMethods(bindingFlags) = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member this.GetMethods(bindingFlags) : MethodInfo[] = +#else + member this.GetMethods(bindingFlags) : MethodInfo[]? = +#endif (if isDeclaredFlag bindingFlags then this.GetTypeInfo().DeclaredMethods else this.GetRuntimeMethods()) |> Seq.filter (fun m -> isAcceptable bindingFlags m.IsStatic m.IsPublic) |> Seq.toArray @@ -113,33 +135,45 @@ module internal ReflectionAdapters = let bindingFlags = defaultArg bindingFlags publicFlags this.GetEvents(bindingFlags) |> Array.filter (fun ei -> ei.Name = name) - |> commit + |> commit member this.GetConstructor(bindingFlags, _binder, argsT:Type[], _parameterModifiers) = this.GetConstructor(bindingFlags,argsT) - member this.GetMethod(name, ?bindingFlags) = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member this.GetMethod(name, ?bindingFlags) : MethodInfo = +#else + member this.GetMethod(name, ?bindingFlags) : MethodInfo? = +#endif let bindingFlags = defaultArg bindingFlags publicFlags this.GetMethods(bindingFlags) |> Array.filter(fun m -> m.Name = name) - |> commit + |> commit member this.GetMethod(name, _bindingFlags, _binder, argsT:Type[], _parameterModifiers) = this.GetMethod(name, argsT) // use different sources based on Declared flag - member this.GetProperty(name, bindingFlags) = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member this.GetProperty(name, bindingFlags) : PropertyInfo = +#else + member this.GetProperty(name, bindingFlags) : PropertyInfo? = +#endif this.GetProperties(bindingFlags) |> Array.filter (fun pi -> pi.Name = name) - |> commit + |> commit - member this.GetMethod(methodName, args:Type[], ?bindingFlags) = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + member this.GetMethod(methodName, args:Type[], ?bindingFlags) : MethodInfo = +#else + member this.GetMethod(methodName, args:Type[], ?bindingFlags) : MethodInfo? = +#endif let bindingFlags = defaultArg bindingFlags publicFlags let compareSequences parms args = Seq.compareWith (fun parm arg -> if parm <> arg then 1 else 0) parms args this.GetMethods(bindingFlags) |> Array.filter(fun m -> m.Name = methodName && (compareSequences (m.GetParameters() |> Seq.map(fun x -> x.ParameterType)) args) = 0) - |> commit + |> commit member this.GetNestedTypes(?bindingFlags) = let bindingFlags = defaultArg bindingFlags publicFlags @@ -193,7 +227,7 @@ module internal ReflectionAdapters = ) ) |> Seq.toArray - |> commit + |> commit member this.GetConstructor(parameterTypes : Type[]) = this.GetConstructor(BindingFlags.Public ||| BindingFlags.NonPublic ||| BindingFlags.Instance, parameterTypes) @@ -219,7 +253,7 @@ module internal ReflectionAdapters = member this.GetField(name, bindingFlags) = this.GetFields(bindingFlags) |> Array.filter (fun fi -> fi.Name = name) - |> commit + |> commit member this.GetField(name) = RuntimeReflectionExtensions.GetRuntimeField(this, name) @@ -234,7 +268,7 @@ module internal ReflectionAdapters = (parameterTypes, parameters) ||> Array.forall2 (fun ty pi -> pi.ParameterType.Equals ty) ) ) - |> commit + |> commit static member GetTypeCode(ty : Type) = if typeof.Equals ty then TypeCode.Int32 @@ -351,10 +385,14 @@ module internal ReflectionAdapters = type System.Object with member this.GetPropertyValue(propName) = - this.GetType().GetProperty(propName, BindingFlags.Public).GetValue(this, null) + match this.GetType().GetProperty(propName, BindingFlags.Public) with + | null -> failwith "GetPropertyValue" + | NonNull p -> p.GetValue(this, null) member this.SetPropertyValue(propName, propValue) = - this.GetType().GetProperty(propName, BindingFlags.Public).SetValue(this, propValue, null) + match this.GetType().GetProperty(propName, BindingFlags.Public) with + | null -> failwith "SetPropertyValue" + | NonNull p -> p.SetValue(this, propValue, null) member this.GetMethod(methodName, argTypes) = this.GetType().GetMethod(methodName, argTypes, BindingFlags.Public) diff --git a/src/utils/sformat.fs b/src/utils/sformat.fs index 8eae50b18d4..a77db6120a1 100644 --- a/src/utils/sformat.fs +++ b/src/utils/sformat.fs @@ -118,6 +118,11 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl abstract MaxRows : int module TaggedTextOps = +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let inline (|NonNull|) x = match x with null -> raise (NullReferenceException()) | v -> v + let inline nonNull<'T> (x: 'T) = x +#endif + let tag tag text = { new TaggedText with member x.Tag = tag @@ -392,7 +397,6 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl [] type ValueInfo = -#if BUILDING_WITH_LKG | TupleValue of (obj * Type) list | FunctionClosureValue of System.Type | RecordValue of (string * obj * Type) list @@ -400,25 +404,12 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl | ExceptionValue of System.Type * (string * (obj * Type)) list | UnitValue | ObjectValue of obj -#else - | TupleValue of (obj? * Type) list - | FunctionClosureValue of System.Type - | RecordValue of (string * obj? * Type) list - | ConstructorValue of string * (string * (obj? * Type)) list - | ExceptionValue of System.Type * (string * (obj? * Type)) list - | UnitValue - | ObjectValue of obj? -#endif module Value = // Analyze an object to see if it the representation // of an F# value. -#if BUILDING_WITH_LKG let GetValueInfoOfObject (bindingFlags:BindingFlags) (obj : obj) = -#else - let GetValueInfoOfObject (bindingFlags:BindingFlags) (obj : obj?) = -#endif #if FX_RESHAPED_REFLECTION let showNonPublic = isNonPublicFlag bindingFlags #endif @@ -756,11 +747,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl | [(_,h);(_,t)] -> (h,t) | _ -> failwith "unpackCons" -#if BUILDING_WITH_LKG let getListValueInfo bindingFlags (x:obj, ty:Type) = -#else - let getListValueInfo bindingFlags (x:obj?, ty:Type) = -#endif match x with | null -> None | _ -> @@ -820,11 +807,12 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl let getProperty (ty: Type) (obj: obj) name = #if FX_RESHAPED_REFLECTION let prop = ty.GetProperty(name, (BindingFlags.Instance ||| BindingFlags.Public ||| BindingFlags.NonPublic)) - if not (isNull prop) then prop.GetValue(obj,[||]) - // Others raise MissingMethodException - else + match prop with + | null -> let msg = System.String.Concat([| "Method '"; ty.FullName; "."; name; "' not found." |]) raise (System.MissingMethodException(msg)) + | NonNull prop -> + prop.GetValue(obj,[||]) #else ty.InvokeMember(name, (BindingFlags.GetProperty ||| BindingFlags.Instance ||| BindingFlags.Public ||| BindingFlags.NonPublic), null, obj, [| |],CultureInfo.InvariantCulture) #endif @@ -905,19 +893,10 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl let stopShort _ = exceededPrintSize() // for unfoldL // Recursive descent -#if BUILDING_WITH_LKG let rec objL depthLim prec (x:obj, ty:Type) = polyL bindingFlags objWithReprL ShowAll depthLim prec (x, ty) // showMode for inner expr and sameObjL depthLim prec (x:obj, ty:Type) = polyL bindingFlags objWithReprL showMode depthLim prec (x, ty) // showMode preserved -#else - let rec objL depthLim prec (x:obj?, ty:Type) = polyL bindingFlags objWithReprL ShowAll depthLim prec (x, ty) // showMode for inner expr - and sameObjL depthLim prec (x:obj?, ty:Type) = polyL bindingFlags objWithReprL showMode depthLim prec (x, ty) // showMode preserved -#endif -#if BUILDING_WITH_LKG and objWithReprL showMode depthLim prec (info:ValueInfo) (x:obj) (* x could be null *) = -#else - and objWithReprL showMode depthLim prec (info:ValueInfo) (x:obj?) (* x could be null *) = -#endif try if depthLim<=0 || exceededPrintSize() then wordL (tagPunctuation "...") else match x with @@ -937,7 +916,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl // Try the StructuredFormatDisplayAttribute extensibility attribute match ty.GetCustomAttributes (typeof, true) with | null | [| |] -> None - | res -> + | NonNull res -> let attr = (res.[0] :?> StructuredFormatDisplayAttribute) let txt = attr.Value if isNull (box txt) || txt.Length <= 1 then @@ -1249,11 +1228,7 @@ namespace Microsoft.FSharp.Text.StructuredPrintfImpl // pprinter: leafFormatter // -------------------------------------------------------------------- -#if BUILDING_WITH_LKG let leafFormatter (opts:FormatOptions) (obj :obj) = -#else - let leafFormatter (opts:FormatOptions) (obj :obj?) = -#endif match obj with | null -> tagKeyword "null" | :? double as d -> diff --git a/tests/fsharp/core/nullness/test.fsx b/tests/fsharp/core/nullness/test.fsx index 5879eb2d8de..c60a9918bb5 100644 --- a/tests/fsharp/core/nullness/test.fsx +++ b/tests/fsharp/core/nullness/test.fsx @@ -35,7 +35,7 @@ module Basics = let x5 = nonNull "" // Should not give a Nullness warning check "ekjnceoiwe5" x5 "" - let x6 = nonNull< string? > "" // **Expected to give a Nullness warning + let x6 = nonNull "" // **Expected to give a Nullness warning check "ekjnceoiwe6" x6 "" let x7 = nonNull "" check "ekjnceoiwe7" x7 "" @@ -60,7 +60,7 @@ module Basics = check "ekjnceoiwe15a" x15a "" let x15b : string? = withNull x4 check "ekjnceoiwe15b" x15b "" - let x15c : string? = withNull< string? > x4 // **Expected to give a Nullness warning + let x15c : string? = withNull x4 // **Expected to give a Nullness warning check "ekjnceoiwe15c" x15c "" let x16 : Nullable = withNullV 3 check "ekjnceoiwe16" x16 (Nullable(3)) @@ -75,7 +75,7 @@ module Basics = check "ekjnceoiwey2" y2 false let y9 = isNull "" // **Expected to give a Nullness warning - type instantiation of a nullable type is non-nullable string check "ekjnceoiwey9" y9 false - let y10 = isNull< string? > "" // Should not give a Nullness warning. + let y10 = isNull "" // Should not give a Nullness warning. check "ekjnceoiwey10" y10 false module NotNullConstraint = @@ -299,11 +299,16 @@ module NullConstraintTests = // TODO: However it gives no error or warning at all with /checknulls off in F# 5.0... That seems bad. let f2 (y : C) = y - let f3 (y : C) = y // Expect a Nullness warning + let f3 (y : C) = y // Expect a Nullness warning - let f4 (y : C) = y // No warning expected + let f4 (y : C) = y // No warning expected + + let f5 (y : C) = y // No warning expected + + let f6 (y : C?>) = y // No warning expected, lexing/parsing should succeed + + let f7 (y : C>?) = y // No warning expected, lexing/parsing should succeed - let f5 (y : C) = y // No warning expected module DefaultValueTests = diff --git a/vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs b/vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs index 372947c1d97..8bd4779ab2c 100644 --- a/vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs +++ b/vsintegration/src/FSharp.Editor/Commands/FsiCommandService.fs @@ -17,7 +17,7 @@ open Microsoft.VisualStudio.FSharp.Interactive type internal FsiCommandFilter(serviceProvider: System.IServiceProvider) = - let loadPackage (guidString: string) : Lazy< Package? > = + let loadPackage (guidString: string) : Lazy = lazy( let shell = serviceProvider.GetService(typeof) :?> IVsShell let packageToBeLoadedGuid = ref (Guid(guidString)) diff --git a/vsintegration/src/FSharp.Editor/Common/Logging.fs b/vsintegration/src/FSharp.Editor/Common/Logging.fs index 674ddbb8ccb..d5cb4d4695e 100644 --- a/vsintegration/src/FSharp.Editor/Common/Logging.fs +++ b/vsintegration/src/FSharp.Editor/Common/Logging.fs @@ -29,7 +29,7 @@ open Config type [] Logger [] ([)>] serviceProvider: IServiceProvider) = - let outputWindow = serviceProvider.GetService() |> Option.ofObj + let outputWindow = serviceProvider.GetService() |> Option.ofObj let createPane () = outputWindow |> Option.iter (fun x -> diff --git a/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs b/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs index 1c00b196137..6624e75a2d7 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs @@ -34,7 +34,7 @@ type internal FSharpNavigableSymbolSource(checkerProvider: FSharpCheckerProvider let statusBar = StatusBar(serviceProvider.GetService()) interface INavigableSymbolSource with - member __.GetNavigableSymbolAsync(triggerSpan: SnapshotSpan, cancellationToken: CancellationToken) : Task< INavigableSymbol? > = + member __.GetNavigableSymbolAsync(triggerSpan: SnapshotSpan, cancellationToken: CancellationToken) : Task = // Yes, this is a code smell. But this is how the editor API accepts what we would treat as None. if disposed then null else diff --git a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs index 3600c4843ac..6d4a155184a 100644 --- a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs +++ b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs @@ -189,10 +189,10 @@ type internal FSharpAsyncQuickInfoSource // This method can be called from the background thread. // Do not call IServiceProvider.GetService here. - override __.GetQuickInfoItemAsync(session:IAsyncQuickInfoSession, cancellationToken:CancellationToken) : Task< QuickInfoItem? > = + override __.GetQuickInfoItemAsync(session:IAsyncQuickInfoSession, cancellationToken:CancellationToken) : Task = let triggerPoint = session.GetTriggerPoint(textBuffer.CurrentSnapshot) match triggerPoint.HasValue with - | false -> Task.FromResult< QuickInfoItem? >(null) + | false -> Task.FromResult(null) | true -> let triggerPoint = triggerPoint.GetValueOrDefault() let documentationBuilder = XmlDocumentation.CreateDocumentationBuilder(xmlMemberIndexService) From ca833bbbb381c2278f299c1dd0541709ba60d666 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 18 Nov 2018 22:34:53 +0000 Subject: [PATCH 034/137] fix two tests --- tests/FSharp.Core.UnitTests/SurfaceArea.coreclr.fs | 14 ++++++++++++++ tests/FSharp.Core.UnitTests/SurfaceArea.net40.fs | 14 ++++++++++++++ tests/fsharp/core/syntax/test.fsx | 6 +++--- tests/fsharpqa/Source/Misc/LongSourceFile01.fs | 14 ++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/tests/FSharp.Core.UnitTests/SurfaceArea.coreclr.fs b/tests/FSharp.Core.UnitTests/SurfaceArea.coreclr.fs index e3873c76b9c..6275b2e86ab 100644 --- a/tests/FSharp.Core.UnitTests/SurfaceArea.coreclr.fs +++ b/tests/FSharp.Core.UnitTests/SurfaceArea.coreclr.fs @@ -2570,6 +2570,20 @@ Microsoft.FSharp.Core.Operators+Unchecked: T Unbox[T](System.Object) Microsoft.FSharp.Core.Operators: Boolean Equals(System.Object) Microsoft.FSharp.Core.Operators: Boolean IsNull[T](T) Microsoft.FSharp.Core.Operators: Boolean Not(Boolean) +Microsoft.FSharp.Core.Operators: Boolean IsNullV[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: Microsoft.FSharp.Core.FSharpChoice`2[Microsoft.FSharp.Core.Unit,T] NullMatchPattern[T](T) +Microsoft.FSharp.Core.Operators: Microsoft.FSharp.Core.FSharpChoice`2[Microsoft.FSharp.Core.Unit,T] NullValueMatchPattern[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: System.Nullable`1[T] NullV[T]() +Microsoft.FSharp.Core.Operators: System.Nullable`1[T] WithNullV[T](T) +Microsoft.FSharp.Core.Operators: T DefaultIfNone[T](T, Microsoft.FSharp.Core.FSharpOption`1[T]) +Microsoft.FSharp.Core.Operators: T DefaultIfNullV[T](T, System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T DefaultIfNull[T](T, T) +Microsoft.FSharp.Core.Operators: T NonNullPattern[T](T) +Microsoft.FSharp.Core.Operators: T NonNullV[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T NonNullValuePattern[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T NonNull[T](T) +Microsoft.FSharp.Core.Operators: T NullArgCheck[T](System.String, T) +Microsoft.FSharp.Core.Operators: T WithNull[T](T) Microsoft.FSharp.Core.Operators: Boolean op_Equality[T](T, T) Microsoft.FSharp.Core.Operators: Boolean op_GreaterThanOrEqual[T](T, T) Microsoft.FSharp.Core.Operators: Boolean op_GreaterThan[T](T, T) diff --git a/tests/FSharp.Core.UnitTests/SurfaceArea.net40.fs b/tests/FSharp.Core.UnitTests/SurfaceArea.net40.fs index 16035e67c02..b60143b8ac5 100644 --- a/tests/FSharp.Core.UnitTests/SurfaceArea.net40.fs +++ b/tests/FSharp.Core.UnitTests/SurfaceArea.net40.fs @@ -2678,6 +2678,20 @@ Microsoft.FSharp.Core.Operators+Unchecked: T Unbox[T](System.Object) Microsoft.FSharp.Core.Operators: Boolean Equals(System.Object) Microsoft.FSharp.Core.Operators: Boolean IsNull[T](T) Microsoft.FSharp.Core.Operators: Boolean Not(Boolean) +Microsoft.FSharp.Core.Operators: Boolean IsNullV[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: Microsoft.FSharp.Core.FSharpChoice`2[Microsoft.FSharp.Core.Unit,T] NullMatchPattern[T](T) +Microsoft.FSharp.Core.Operators: Microsoft.FSharp.Core.FSharpChoice`2[Microsoft.FSharp.Core.Unit,T] NullValueMatchPattern[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: System.Nullable`1[T] NullV[T]() +Microsoft.FSharp.Core.Operators: System.Nullable`1[T] WithNullV[T](T) +Microsoft.FSharp.Core.Operators: T DefaultIfNone[T](T, Microsoft.FSharp.Core.FSharpOption`1[T]) +Microsoft.FSharp.Core.Operators: T DefaultIfNullV[T](T, System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T DefaultIfNull[T](T, T) +Microsoft.FSharp.Core.Operators: T NonNullPattern[T](T) +Microsoft.FSharp.Core.Operators: T NonNullV[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T NonNullValuePattern[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T NonNull[T](T) +Microsoft.FSharp.Core.Operators: T NullArgCheck[T](System.String, T) +Microsoft.FSharp.Core.Operators: T WithNull[T](T) Microsoft.FSharp.Core.Operators: Boolean op_Equality[T](T, T) Microsoft.FSharp.Core.Operators: Boolean op_GreaterThanOrEqual[T](T, T) Microsoft.FSharp.Core.Operators: Boolean op_GreaterThan[T](T, T) diff --git a/tests/fsharp/core/syntax/test.fsx b/tests/fsharp/core/syntax/test.fsx index cc3123be09c..e38cf5725dd 100644 --- a/tests/fsharp/core/syntax/test.fsx +++ b/tests/fsharp/core/syntax/test.fsx @@ -31,8 +31,8 @@ test "line number test" (__LINE__ = "100") test "line number test" (__LINE__ = "102") test "line number test" (__SOURCE_FILE__ = "file.fs") -# 29 "original-test-file.fs" -test "line number test" (__LINE__ = "29") +# 35 "original-test-file.fs" +test "line number test" (__LINE__ = "35") test "line number test" (__SOURCE_FILE__ = "original-test-file.fs") @@ -1441,7 +1441,7 @@ module TypeApplicationDisambiguation = let f8 x = xx let f9 x = xx let f10 x = xx - let f13 x = xx + // let f13 x = xx let f14 x = xx let f16 x = x x>x let f17 x = xx diff --git a/tests/fsharpqa/Source/Misc/LongSourceFile01.fs b/tests/fsharpqa/Source/Misc/LongSourceFile01.fs index 8d4c0cd35f5..da8cd1abe50 100644 --- a/tests/fsharpqa/Source/Misc/LongSourceFile01.fs +++ b/tests/fsharpqa/Source/Misc/LongSourceFile01.fs @@ -2225,6 +2225,20 @@ Microsoft.FSharp.Core.Operators+Unchecked: System.Type GetType() Microsoft.FSharp.Core.Operators+Unchecked: T DefaultOf[T]() Microsoft.FSharp.Core.Operators: Boolean Equals(System.Object) Microsoft.FSharp.Core.Operators: Boolean Not(Boolean) +Microsoft.FSharp.Core.Operators: Boolean IsNullV[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: Microsoft.FSharp.Core.FSharpChoice`2[Microsoft.FSharp.Core.Unit,T] NullMatchPattern[T](T) +Microsoft.FSharp.Core.Operators: Microsoft.FSharp.Core.FSharpChoice`2[Microsoft.FSharp.Core.Unit,T] NullValueMatchPattern[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: System.Nullable`1[T] NullV[T]() +Microsoft.FSharp.Core.Operators: System.Nullable`1[T] WithNullV[T](T) +Microsoft.FSharp.Core.Operators: T DefaultIfNone[T](T, Microsoft.FSharp.Core.FSharpOption`1[T]) +Microsoft.FSharp.Core.Operators: T DefaultIfNullV[T](T, System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T DefaultIfNull[T](T, T) +Microsoft.FSharp.Core.Operators: T NonNullPattern[T](T) +Microsoft.FSharp.Core.Operators: T NonNullV[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T NonNullValuePattern[T](System.Nullable`1[T]) +Microsoft.FSharp.Core.Operators: T NonNull[T](T) +Microsoft.FSharp.Core.Operators: T NullArgCheck[T](System.String, T) +Microsoft.FSharp.Core.Operators: T WithNull[T](T) Microsoft.FSharp.Core.Operators: Boolean op_Equality[T](T, T) Microsoft.FSharp.Core.Operators: Boolean op_GreaterThanOrEqual[T](T, T) Microsoft.FSharp.Core.Operators: Boolean op_GreaterThan[T](T, T) From 0dd5216690c438cb9989c74632c7bf5ed19c318a Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 19 Nov 2018 15:08:09 +0000 Subject: [PATCH 035/137] test updates --- build.cmd | 12 +++++++++++- .../regression/literal-value-bug-1/test.il.bsl | 10 ++++++++++ .../AsyncExpressionSteppingTest1.il.bsl | 8 ++++++++ .../AsyncExpressionSteppingTest2.il.bsl | 8 ++++++++ .../AsyncExpressionSteppingTest3.il.bsl | 8 ++++++++ .../AsyncExpressionSteppingTest4.il.bsl | 8 ++++++++ .../AsyncExpressionSteppingTest5.il.bsl | 8 ++++++++ .../AsyncExpressionSteppingTest6.il.bsl | 8 ++++++++ .../EmittedIL/AttributeTargets/Default.il.bsl | 8 ++++++++ .../CodeGen/EmittedIL/AttributeTargets/Field.il.bsl | 8 ++++++++ .../EmittedIL/AttributeTargets/Property.il.bsl | 8 ++++++++ .../CCtorDUWithMember/CCtorDUWithMember01.il.bsl | 8 ++++++++ .../CCtorDUWithMember/CCtorDUWithMember02.il.bsl | 8 ++++++++ .../CCtorDUWithMember/CCtorDUWithMember03.il.bsl | 8 ++++++++ .../CCtorDUWithMember/CCtorDUWithMember04.il.bsl | 8 ++++++++ .../fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd | 6 ++++++ .../CompiledNameAttribute01.il.bsl | 8 ++++++++ .../CompiledNameAttribute02.il.bsl | 8 ++++++++ .../CompiledNameAttribute03.il.bsl | 8 ++++++++ .../CompiledNameAttribute04.il.bsl | 8 ++++++++ .../ComputationExpressions/ComputationExpr01.il.bsl | 8 ++++++++ .../ComputationExpressions/ComputationExpr02.il.bsl | 8 ++++++++ .../ComputationExpressions/ComputationExpr03.il.bsl | 8 ++++++++ .../ComputationExpressions/ComputationExpr04.il.bsl | 8 ++++++++ .../ComputationExpressions/ComputationExpr05.il.bsl | 8 ++++++++ .../ComputationExpressions/ComputationExpr06.il.bsl | 8 ++++++++ .../ComputationExpressions/ComputationExpr07.il.bsl | 8 ++++++++ .../DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl | 8 ++++++++ .../DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl | 8 ++++++++ ...xStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl | 8 ++++++++ .../DoNotBoxStruct_Array_CSInterface.il.bsl | 8 ++++++++ .../DoNotBoxStruct_Array_FSInterface.il.bsl | 8 ++++++++ ...DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl | 8 ++++++++ .../DoNotBoxStruct_MDArray_CSInterface.il.bsl | 8 ++++++++ .../DoNotBoxStruct_MDArray_FSInterface.il.bsl | 8 ++++++++ ...NotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl | 8 ++++++++ .../DoNotBoxStruct_NoArray_CSInterface.il.bsl | 8 ++++++++ .../DoNotBoxStruct_NoArray_FSInterface.il.bsl | 8 ++++++++ ...NotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl | 8 ++++++++ .../DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl | 8 ++++++++ .../EmittedIL/GeneratedIterators/GenIter01.il.bsl | 8 ++++++++ .../EmittedIL/GeneratedIterators/GenIter02.il.bsl | 8 ++++++++ .../EmittedIL/GeneratedIterators/GenIter03.il.bsl | 8 ++++++++ .../EmittedIL/GeneratedIterators/GenIter04.il.bsl | 8 ++++++++ .../InequalityComparison01.il.bsl | 8 ++++++++ .../InequalityComparison02.il.bsl | 8 ++++++++ .../InequalityComparison03.il.bsl | 8 ++++++++ .../InequalityComparison04.il.bsl | 8 ++++++++ .../InequalityComparison05.il.bsl | 8 ++++++++ .../ListExpressionSteppingTest1.il.bsl | 8 ++++++++ .../ListExpressionSteppingTest2.il.bsl | 8 ++++++++ .../ListExpressionSteppingTest3.il.bsl | 8 ++++++++ .../ListExpressionSteppingTest4.il.bsl | 8 ++++++++ .../ListExpressionSteppingTest5.il.bsl | 8 ++++++++ .../ListExpressionSteppingTest6.il.bsl | 8 ++++++++ .../EmittedIL/LiteralValue/LiteralValue.il.bsl | 10 ++++++++++ .../MethodImplAttribute.AggressiveInlining.il.bsl | 8 ++++++++ .../MethodImplAttribute.ForwardRef.il.bsl | 8 ++++++++ .../MethodImplAttribute.InternalCall.il.bsl | 8 ++++++++ .../MethodImplAttribute.NoInlining.il.bsl | 8 ++++++++ .../MethodImplAttribute.NoOptimization.il.bsl | 8 ++++++++ .../MethodImplAttribute.PreserveSig.il.bsl | 8 ++++++++ tests/fsharpqa/Source/CodeGen/LazyNoInline01.il.bsl | 8 ++++++++ .../Tests.LanguageService.ErrorList.fs | 2 +- 64 files changed, 510 insertions(+), 2 deletions(-) diff --git a/build.cmd b/build.cmd index 3deefc2a836..5491fa6740a 100644 --- a/build.cmd +++ b/build.cmd @@ -22,7 +22,7 @@ echo ^ echo ^ echo ^ echo ^ -echo ^ +echo ^ echo ^ echo ^ echo. @@ -45,6 +45,12 @@ echo. build.cmd all test (build and test everything) echo. build.cmd nobuild test include Conformance (run only tests marked with Conformance category) echo. build.cmd nobuild test include Expensive (run only tests marked with Expensive category) echo. +echo.Test flags (not all are documented): +echo. test Run appropriate tests for selected build +echo. test-net40-ideunit Run vsintegration\tests IDE unit tests (.NET Framework) +echo. test-net40-fsharp Run tests\fsharp tests (.NET Framework) +echo. test-net40-fsharpqa Run tests\fsharpqa tests (.NET Framework) +echo. test-update-bsl Update baselines in fsharpqa tests goto :success :ARGUMENTS_OK @@ -331,6 +337,10 @@ if /i "%ARG%" == "test-sign" ( set SIGN_TYPE=test ) +if /i "%ARG%" == "test-update-bsl" ( + set TEST_UPDATE_BSL=test +) + if /i "%ARG%" == "real-sign" ( set SIGN_TYPE=real ) diff --git a/tests/fsharp/regression/literal-value-bug-1/test.il.bsl b/tests/fsharp/regression/literal-value-bug-1/test.il.bsl index 86655b9a6e7..c2826dff865 100644 --- a/tests/fsharp/regression/literal-value-bug-1/test.il.bsl +++ b/tests/fsharp/regression/literal-value-bug-1/test.il.bsl @@ -31,11 +31,21 @@ // Offset: 0x00000000 Length: 0x00000274 // WARNING: managed resource file FSharpSignatureData.test created } +.mresource public FSharpSignatureDataB.test +{ + // Offset: 0x00000000 Length: 0x00000274 + // WARNING: managed resource file FSharpSignatureDataB.test created +} .mresource public FSharpOptimizationData.test { // Offset: 0x00000278 Length: 0x0000006F // WARNING: managed resource file FSharpOptimizationData.test created } +.mresource public FSharpOptimizationDataB.test +{ + // Offset: 0x00000278 Length: 0x0000006F + // WARNING: managed resource file FSharpOptimizationData.test created +} .module test.exe // MVID: {5AA663EB-D9C1-2E4E-A745-0383EB63A65A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl index 3e69ae4967f..73d3c689a79 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000026C } +.mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest1 +{ + // Offset: 0x00000000 Length: 0x0000026C +} .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest1 { // Offset: 0x00000270 Length: 0x000000B1 } +.mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest1 +{ + // Offset: 0x00000270 Length: 0x000000B1 +} .module AsyncExpressionSteppingTest1.dll // MVID: {5AF5DDAE-6394-B5D4-A745-0383AEDDF55A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl index 7bdb6a074c0..ccbd4c42929 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000026C } +.mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest2 +{ + // Offset: 0x00000000 Length: 0x0000026C +} .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest2 { // Offset: 0x00000270 Length: 0x000000B1 } +.mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest2 +{ + // Offset: 0x00000270 Length: 0x000000B1 +} .module AsyncExpressionSteppingTest2.dll // MVID: {5AF5DDAE-6394-D499-A745-0383AEDDF55A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl index 6dfebd88b1e..df596f72e7e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000277 } +.mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest3 +{ + // Offset: 0x00000000 Length: 0x00000277 +} .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest3 { // Offset: 0x00000280 Length: 0x000000B1 } +.mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest3 +{ + // Offset: 0x00000280 Length: 0x000000B1 +} .module AsyncExpressionSteppingTest3.dll // MVID: {5AF5DDAE-6394-F35E-A745-0383AEDDF55A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl index ce54bd4945d..17496424524 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000277 } +.mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest4 +{ + // Offset: 0x00000000 Length: 0x00000277 +} .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest4 { // Offset: 0x00000280 Length: 0x000000B1 } +.mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest4 +{ + // Offset: 0x00000280 Length: 0x000000B1 +} .module AsyncExpressionSteppingTest4.dll // MVID: {5AF5DDAE-6394-6D4B-A745-0383AEDDF55A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl index da554a3adf4..724f3938feb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl @@ -31,6 +31,14 @@ { // Offset: 0x00000000 Length: 0x000002B8 } +.mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest5 +{ + // Offset: 0x00000000 Length: 0x000002B8 +} +.mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest5 +{ + // Offset: 0x000002C0 Length: 0x000000BE +} .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest5 { // Offset: 0x000002C0 Length: 0x000000BE diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl index 379ad6bbe7c..57eecdc5c29 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x000002A3 } +.mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest6 +{ + // Offset: 0x00000000 Length: 0x000002A3 +} .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest6 { // Offset: 0x000002A8 Length: 0x000000BE } +.mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest6 +{ + // Offset: 0x000002A8 Length: 0x000000BE +} .module AsyncExpressionSteppingTest6.dll // MVID: {5AF5DDAE-6394-4FAD-A745-0383AEDDF55A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl index bbe5b40ba64..8c426bf0b0f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x000003FA } +.mresource public FSharpSignatureDataB.Default +{ + // Offset: 0x00000000 Length: 0x000003FA +} .mresource public FSharpOptimizationData.Default { // Offset: 0x00000400 Length: 0x000000BA } +.mresource public FSharpOptimizationDataB.Default +{ + // Offset: 0x00000400 Length: 0x000000BA +} .module Default.dll // MVID: {59B19208-AAA9-67BB-A745-03830892B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl index 6d4d86af42b..6015f888f20 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x000003F4 } +.mresource public FSharpSignatureDataB.Field +{ + // Offset: 0x00000000 Length: 0x000003F4 +} .mresource public FSharpOptimizationData.Field { // Offset: 0x000003F8 Length: 0x000000B8 } +.mresource public FSharpOptimizationDataB.Field +{ + // Offset: 0x000003F8 Length: 0x000000B8 +} .module Field.dll // MVID: {59B19208-96F8-CD6E-A745-03830892B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl index eb0160f0a01..386739667ae 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x000003FD } +.mresource public FSharpSignatureDataB.Property +{ + // Offset: 0x00000000 Length: 0x000003FD +} .mresource public FSharpOptimizationData.Property { // Offset: 0x00000408 Length: 0x000000BB } +.mresource public FSharpOptimizationDataB.Property +{ + // Offset: 0x00000408 Length: 0x000000BB +} .module Property.dll // MVID: {59B19208-9B5C-7949-A745-03830892B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl index 5875beb14e4..0aa363c3c9c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000790 } +.mresource public FSharpSignatureDataB.CCtorDUWithMember01 +{ + // Offset: 0x00000000 Length: 0x00000790 +} .mresource public FSharpOptimizationData.CCtorDUWithMember01 { // Offset: 0x00000798 Length: 0x00000227 } +.mresource public FSharpOptimizationDataB.CCtorDUWithMember01 +{ + // Offset: 0x00000798 Length: 0x00000227 +} .module CCtorDUWithMember01.exe // MVID: {59B1923F-26F1-14EE-A745-03833F92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl index f8d32ee78a8..3698c4f348c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000030C } +.mresource public FSharpSignatureDataB.CCtorDUWithMember02 +{ + // Offset: 0x00000000 Length: 0x0000030C +} .mresource public FSharpOptimizationData.CCtorDUWithMember02 { // Offset: 0x00000310 Length: 0x000000E4 } +.mresource public FSharpOptimizationDataB.CCtorDUWithMember02 +{ + // Offset: 0x00000310 Length: 0x000000E4 +} .module CCtorDUWithMember02.exe // MVID: {59B1923F-D176-C99D-A745-03833F92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl index 2ded0bcb8b9..97d89f86dcf 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000029D } +.mresource public FSharpSignatureDataB.CCtorDUWithMember03 +{ + // Offset: 0x00000000 Length: 0x0000029D +} .mresource public FSharpOptimizationData.CCtorDUWithMember03 { // Offset: 0x000002A8 Length: 0x000000B2 } +.mresource public FSharpOptimizationDataB.CCtorDUWithMember03 +{ + // Offset: 0x000002A8 Length: 0x000000B2 +} .module CCtorDUWithMember03.exe // MVID: {59B1923F-C97B-D207-A745-03833F92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl index 4063e241fda..7399e7f4b1a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000029D } +.mresource public FSharpSignatureDataB.CCtorDUWithMember04 +{ + // Offset: 0x00000000 Length: 0x0000029D +} .mresource public FSharpOptimizationData.CCtorDUWithMember04 { // Offset: 0x000002A8 Length: 0x000000B2 } +.mresource public FSharpOptimizationDataB.CCtorDUWithMember04 +{ + // Offset: 0x000002A8 Length: 0x000000B2 +} .module CCtorDUWithMember04.exe // MVID: {59B1923F-CF28-717B-A745-03833F92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd index da8260013c7..24b323ec7d5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd @@ -5,5 +5,11 @@ IF NOT ERRORLEVEL 0 exit 1 echo ..\..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il" ..\..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il" + +if /i "%TEST_UPDATE_BSL%" == "1" ( + echo copy /y "%~n1.il.bsl" "%~n1.il" + copy /y "%~n1.il.bsl" "%~n1.il" +) + exit /b %ERRORLEVEL% diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl index 0b9f0b91042..d4aa7ebe09f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000272 } +.mresource public FSharpSignatureDataB.CompiledNameAttribute01 +{ + // Offset: 0x00000000 Length: 0x00000272 +} .mresource public FSharpOptimizationData.CompiledNameAttribute01 { // Offset: 0x00000278 Length: 0x00000086 } +.mresource public FSharpOptimizationDataB.CompiledNameAttribute01 +{ + // Offset: 0x00000278 Length: 0x00000086 +} .module CompiledNameAttribute01.exe // MVID: {59B1923F-EF5A-FC2A-A745-03833F92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl index 6adf54e44d5..1b57218847d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x000002E8 } +.mresource public FSharpSignatureDataB.CompiledNameAttribute02 +{ + // Offset: 0x00000000 Length: 0x000002E8 +} .mresource public FSharpOptimizationData.CompiledNameAttribute02 { // Offset: 0x000002F0 Length: 0x000000CD } +.mresource public FSharpOptimizationDataB.CompiledNameAttribute02 +{ + // Offset: 0x000002F0 Length: 0x000000CD +} .module CompiledNameAttribute02.exe // MVID: {59B1923F-F755-F3C0-A745-03833F92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl index 228aa3dd3bb..9106af33a09 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000027D } +.mresource public FSharpSignatureDataB.CompiledNameAttribute03 +{ + // Offset: 0x00000000 Length: 0x0000027D +} .mresource public FSharpOptimizationData.CompiledNameAttribute03 { // Offset: 0x00000288 Length: 0x00000086 } +.mresource public FSharpOptimizationDataB.CompiledNameAttribute03 +{ + // Offset: 0x00000288 Length: 0x00000086 +} .module CompiledNameAttribute03.exe // MVID: {59B1923F-2CE4-60B9-A745-03833F92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl index 6007efcdfb7..d3a202e6ecf 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000CE9 } +.mresource public FSharpSignatureDataB.CompiledNameAttribute04 +{ + // Offset: 0x00000000 Length: 0x00000CE9 +} .mresource public FSharpOptimizationData.CompiledNameAttribute04 { // Offset: 0x00000CF0 Length: 0x000002CB } +.mresource public FSharpOptimizationDataB.CompiledNameAttribute04 +{ + // Offset: 0x00000CF0 Length: 0x000002CB +} .module CompiledNameAttribute04.exe // MVID: {59B1923F-34DF-584F-A745-03833F92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl index 056640724cf..8f7a3950a8c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl @@ -35,10 +35,18 @@ { // Offset: 0x00000000 Length: 0x000001F8 } +.mresource public FSharpSignatureDataB.ComputationExpr01 +{ + // Offset: 0x00000000 Length: 0x000001F8 +} .mresource public FSharpOptimizationData.ComputationExpr01 { // Offset: 0x00000200 Length: 0x0000007D } +.mresource public FSharpOptimizationDataB.ComputationExpr01 +{ + // Offset: 0x00000200 Length: 0x0000007D +} .module ComputationExpr01.exe // MVID: {5A1F62A7-3703-E566-A745-0383A7621F5A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl index 80dd23ca0b0..e93d942e567 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl @@ -35,10 +35,18 @@ { // Offset: 0x00000000 Length: 0x000001F8 } +.mresource public FSharpSignatureDataB.ComputationExpr02 +{ + // Offset: 0x00000000 Length: 0x000001F8 +} .mresource public FSharpOptimizationData.ComputationExpr02 { // Offset: 0x00000200 Length: 0x0000007D } +.mresource public FSharpOptimizationDataB.ComputationExpr02 +{ + // Offset: 0x00000200 Length: 0x0000007D +} .module ComputationExpr02.exe // MVID: {5A1F62A7-3624-E566-A745-0383A7621F5A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl index 46926f5d00e..4c996ec170c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl @@ -35,10 +35,18 @@ { // Offset: 0x00000000 Length: 0x00000222 } +.mresource public FSharpSignatureDataB.ComputationExpr03 +{ + // Offset: 0x00000000 Length: 0x00000222 +} .mresource public FSharpOptimizationData.ComputationExpr03 { // Offset: 0x00000228 Length: 0x0000008C } +.mresource public FSharpOptimizationDataB.ComputationExpr03 +{ + // Offset: 0x00000228 Length: 0x0000008C +} .module ComputationExpr03.exe // MVID: {5A1F62A7-3649-E566-A745-0383A7621F5A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl index 6f211063ee2..53bc3660153 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl @@ -35,10 +35,18 @@ { // Offset: 0x00000000 Length: 0x000001F8 } +.mresource public FSharpSignatureDataB.ComputationExpr04 +{ + // Offset: 0x00000000 Length: 0x000001F8 +} .mresource public FSharpOptimizationData.ComputationExpr04 { // Offset: 0x00000200 Length: 0x0000007D } +.mresource public FSharpOptimizationDataB.ComputationExpr04 +{ + // Offset: 0x00000200 Length: 0x0000007D +} .module ComputationExpr04.exe // MVID: {5A1F62A7-366A-E566-A745-0383A7621F5A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl index 8f5858d32b2..49e8c688ded 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl @@ -35,10 +35,18 @@ { // Offset: 0x00000000 Length: 0x000001F8 } +.mresource public FSharpSignatureDataB.ComputationExpr05 +{ + // Offset: 0x00000000 Length: 0x000001F8 +} .mresource public FSharpOptimizationData.ComputationExpr05 { // Offset: 0x00000200 Length: 0x0000007D } +.mresource public FSharpOptimizationDataB.ComputationExpr05 +{ + // Offset: 0x00000200 Length: 0x0000007D +} .module ComputationExpr05.exe // MVID: {5A1F62A7-3687-E566-A745-0383A7621F5A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl index 93152a9b90f..903ddd21033 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl @@ -35,10 +35,18 @@ { // Offset: 0x00000000 Length: 0x000001F8 } +.mresource public FSharpSignatureDataB.ComputationExpr06 +{ + // Offset: 0x00000000 Length: 0x000001F8 +} .mresource public FSharpOptimizationData.ComputationExpr06 { // Offset: 0x00000200 Length: 0x0000007D } +.mresource public FSharpOptimizationDataB.ComputationExpr06 +{ + // Offset: 0x00000200 Length: 0x0000007D +} .module ComputationExpr06.exe // MVID: {5A1F62A7-35A8-E566-A745-0383A7621F5A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl index 2e07f1e3d66..8b9ec2a099c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl @@ -35,10 +35,18 @@ { // Offset: 0x00000000 Length: 0x000001F8 } +.mresource public FSharpSignatureDataB.ComputationExpr07 +{ + // Offset: 0x00000000 Length: 0x000001F8 +} .mresource public FSharpOptimizationData.ComputationExpr07 { // Offset: 0x00000200 Length: 0x0000007D } +.mresource public FSharpOptimizationDataB.ComputationExpr07 +{ + // Offset: 0x00000200 Length: 0x0000007D +} .module ComputationExpr07.exe // MVID: {5A1F62A7-35BD-E566-A745-0383A7621F5A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl index 70c28499d91..b43ee6dc66d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000026E } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_CSInterface +{ + // Offset: 0x00000000 Length: 0x0000026E +} .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_CSInterface { // Offset: 0x00000278 Length: 0x000000A6 } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_ArrayOfArray_CSInterface +{ + // Offset: 0x00000278 Length: 0x000000A6 +} .module DoNotBoxStruct_ArrayOfArray_CSInterface.exe // MVID: {59B1920A-FF24-C89E-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl index 4693af05dc0..8c5162ffdbc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000272 } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_FSInterface +{ + // Offset: 0x00000000 Length: 0x00000272 +} .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_FSInterface { // Offset: 0x00000278 Length: 0x000000A6 } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_ArrayOfArray_FSInterface +{ + // Offset: 0x00000278 Length: 0x000000A6 +} .module DoNotBoxStruct_ArrayOfArray_FSInterface.exe // MVID: {59B1920A-8A45-C8A0-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl index 1ef23f5de14..d0f11235d0c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000291 } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth +{ + // Offset: 0x00000000 Length: 0x00000291 +} .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth { // Offset: 0x00000298 Length: 0x000000BA } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth +{ + // Offset: 0x00000298 Length: 0x000000BA +} .module DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.exe // MVID: {59B1920A-1475-D984-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl index ca6aa2077fe..6fe2c3a71f6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000255 } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_CSInterface +{ + // Offset: 0x00000000 Length: 0x00000255 +} .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_CSInterface { // Offset: 0x00000260 Length: 0x00000098 } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_Array_CSInterface +{ + // Offset: 0x00000260 Length: 0x00000098 +} .module DoNotBoxStruct_Array_CSInterface.exe // MVID: {59B1920A-1735-654E-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl index 6b25b5eec24..90baafd2d49 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000259 } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_FSInterface +{ + // Offset: 0x00000000 Length: 0x00000259 +} .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_FSInterface { // Offset: 0x00000260 Length: 0x00000098 } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_Array_FSInterface +{ + // Offset: 0x00000260 Length: 0x00000098 +} .module DoNotBoxStruct_Array_FSInterface.exe // MVID: {59B1920A-1737-9DA5-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl index c4a168a2d73..3b4fff4123a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000278 } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_FSInterface_NoExtMeth +{ + // Offset: 0x00000000 Length: 0x00000278 +} .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_FSInterface_NoExtMeth { // Offset: 0x00000280 Length: 0x000000AC } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_Array_FSInterface_NoExtMeth +{ + // Offset: 0x00000280 Length: 0x000000AC +} .module DoNotBoxStruct_Array_FSInterface_NoExtMeth.exe // MVID: {59B1920A-8127-3EE3-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl index cfeba995ccf..84b5a647acb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000025C } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_CSInterface +{ + // Offset: 0x00000000 Length: 0x0000025C +} .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_CSInterface { // Offset: 0x00000260 Length: 0x0000009C } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_MDArray_CSInterface +{ + // Offset: 0x00000260 Length: 0x0000009C +} .module DoNotBoxStruct_MDArray_CSInterface.exe // MVID: {59B1920A-24A8-8796-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl index c0d5f4ce7db..ca40a1c0b33 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000260 } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_FSInterface +{ + // Offset: 0x00000000 Length: 0x00000260 +} .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_FSInterface { // Offset: 0x00000268 Length: 0x0000009C } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_MDArray_FSInterface +{ + // Offset: 0x00000268 Length: 0x0000009C +} .module DoNotBoxStruct_MDArray_FSInterface.exe // MVID: {59B1920A-8279-DA45-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl index 00d5ffc2e07..8c5d6df7944 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000027F } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth +{ + // Offset: 0x00000000 Length: 0x0000027F +} .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth { // Offset: 0x00000288 Length: 0x000000B0 } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth +{ + // Offset: 0x00000288 Length: 0x000000B0 +} .module DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.exe // MVID: {59B1920A-A67D-867A-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl index 4b9a226ab6a..a0fb128556f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000024C } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_CSInterface +{ + // Offset: 0x00000000 Length: 0x0000024C +} .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_CSInterface { // Offset: 0x00000250 Length: 0x0000009C } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_NoArray_CSInterface +{ + // Offset: 0x00000250 Length: 0x0000009C +} .module DoNotBoxStruct_NoArray_CSInterface.exe // MVID: {59B1920A-5654-8082-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl index 02f0492ad4a..9922ecfe6e6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000250 } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_FSInterface +{ + // Offset: 0x00000000 Length: 0x00000250 +} .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_FSInterface { // Offset: 0x00000258 Length: 0x0000009C } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_NoArray_FSInterface +{ + // Offset: 0x00000258 Length: 0x0000009C +} .module DoNotBoxStruct_NoArray_FSInterface.exe // MVID: {59B1920A-3F8A-B9D0-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl index 92d007fed43..b07adc90bd1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000026F } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth +{ + // Offset: 0x00000000 Length: 0x0000026F +} .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth { // Offset: 0x00000278 Length: 0x000000B0 } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth +{ + // Offset: 0x00000278 Length: 0x000000B0 +} .module DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.exe // MVID: {59B1920A-CD0A-F713-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl index 2faba000cc7..9633b72683f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000208 } +.mresource public FSharpSignatureDataB.DoNotBoxStruct_ToString +{ + // Offset: 0x00000000 Length: 0x00000208 +} .mresource public FSharpOptimizationData.DoNotBoxStruct_ToString { // Offset: 0x00000210 Length: 0x00000086 } +.mresource public FSharpOptimizationDataB.DoNotBoxStruct_ToString +{ + // Offset: 0x00000210 Length: 0x00000086 +} .module DoNotBoxStruct_ToString.exe // MVID: {59B1920A-8D34-C606-A745-03830A92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl index 601e4ffc1e7..e5c0acfe08e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x000001FF } +.mresource public FSharpSignatureDataB.GenIter01 +{ + // Offset: 0x00000000 Length: 0x000001FF +} .mresource public FSharpOptimizationData.GenIter01 { // Offset: 0x00000208 Length: 0x0000007A } +.mresource public FSharpOptimizationDataB.GenIter01 +{ + // Offset: 0x00000208 Length: 0x0000007A +} .module GenIter01.exe // MVID: {5B9A6329-F836-DC98-A745-038329639A5B} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl index aa203793fe4..f80a7cb58b8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000200 } +.mresource public FSharpSignatureDataB.GenIter02 +{ + // Offset: 0x00000000 Length: 0x00000200 +} .mresource public FSharpOptimizationData.GenIter02 { // Offset: 0x00000208 Length: 0x0000007B } +.mresource public FSharpOptimizationDataB.GenIter02 +{ + // Offset: 0x00000208 Length: 0x0000007B +} .module GenIter02.exe // MVID: {5B9A6329-F857-DC98-A745-038329639A5B} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl index 88bd760bc85..0735d6611c8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000200 } +.mresource public FSharpSignatureDataB.GenIter03 +{ + // Offset: 0x00000000 Length: 0x00000200 +} .mresource public FSharpOptimizationData.GenIter03 { // Offset: 0x00000208 Length: 0x0000007B } +.mresource public FSharpOptimizationDataB.GenIter03 +{ + // Offset: 0x00000208 Length: 0x0000007B +} .module GenIter03.exe // MVID: {5B9A6329-F77C-DC98-A745-038329639A5B} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl index 25a08dfd652..e2b558138db 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x000001F0 } +.mresource public FSharpSignatureDataB.GenIter04 +{ + // Offset: 0x00000000 Length: 0x000001F0 +} .mresource public FSharpOptimizationData.GenIter04 { // Offset: 0x000001F8 Length: 0x0000007B } +.mresource public FSharpOptimizationDataB.GenIter04 +{ + // Offset: 0x000001F8 Length: 0x0000007B +} .module GenIter04.exe // MVID: {5B9A6329-F79D-DC98-A745-038329639A5B} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl index 37c0b51c0e3..0948a1b6ddd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000020E } +.mresource public FSharpSignatureDataB.InequalityComparison01 +{ + // Offset: 0x00000000 Length: 0x0000020E +} .mresource public FSharpOptimizationData.InequalityComparison01 { // Offset: 0x00000218 Length: 0x00000085 } +.mresource public FSharpOptimizationDataB.InequalityComparison01 +{ + // Offset: 0x00000218 Length: 0x00000085 +} .module InequalityComparison01.exe // MVID: {59B19213-263A-E6D5-A745-03831392B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl index 6ce221af23c..68a146f5353 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000020E } +.mresource public FSharpSignatureDataB.InequalityComparison02 +{ + // Offset: 0x00000000 Length: 0x0000020E +} .mresource public FSharpOptimizationData.InequalityComparison02 { // Offset: 0x00000218 Length: 0x00000085 } +.mresource public FSharpOptimizationDataB.InequalityComparison02 +{ + // Offset: 0x00000218 Length: 0x00000085 +} .module InequalityComparison02.exe // MVID: {59B19213-263A-E72C-A745-03831392B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl index 96a9c5591cc..f7adda8a1e7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000020E } +.mresource public FSharpSignatureDataB.InequalityComparison03 +{ + // Offset: 0x00000000 Length: 0x0000020E +} .mresource public FSharpOptimizationData.InequalityComparison03 { // Offset: 0x00000218 Length: 0x00000085 } +.mresource public FSharpOptimizationDataB.InequalityComparison03 +{ + // Offset: 0x00000218 Length: 0x00000085 +} .module InequalityComparison03.exe // MVID: {59B19213-263A-E70B-A745-03831392B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl index 5209536406c..0cbfa17b14a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000020E } +.mresource public FSharpSignatureDataB.InequalityComparison04 +{ + // Offset: 0x00000000 Length: 0x0000020E +} .mresource public FSharpOptimizationData.InequalityComparison04 { // Offset: 0x00000218 Length: 0x00000085 } +.mresource public FSharpOptimizationDataB.InequalityComparison04 +{ + // Offset: 0x00000218 Length: 0x00000085 +} .module InequalityComparison04.exe // MVID: {59B19213-263A-E772-A745-03831392B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl index 173552b2fa4..cbc81a9e541 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000236 } +.mresource public FSharpSignatureDataB.InequalityComparison05 +{ + // Offset: 0x00000000 Length: 0x00000236 +} .mresource public FSharpOptimizationData.InequalityComparison05 { // Offset: 0x00000240 Length: 0x00000085 } +.mresource public FSharpOptimizationDataB.InequalityComparison05 +{ + // Offset: 0x00000240 Length: 0x00000085 +} .module InequalityComparison05.exe // MVID: {59B19213-263A-E751-A745-03831392B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl index 831514e5f3c..ada744db27d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000026D } +.mresource public FSharpSignatureDataB.ListExpressionSteppingTest1 +{ + // Offset: 0x00000000 Length: 0x0000026D +} .mresource public FSharpOptimizationData.ListExpressionSteppingTest1 { // Offset: 0x00000278 Length: 0x000000AF } +.mresource public FSharpOptimizationDataB.ListExpressionSteppingTest1 +{ + // Offset: 0x00000278 Length: 0x000000AF +} .module ListExpressionSteppingTest1.exe // MVID: {59B1920C-50CF-F6CE-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl index 2b86c1c4ba1..7f6b2b12d28 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000026D } +.mresource public FSharpSignatureDataB.ListExpressionSteppingTest2 +{ + // Offset: 0x00000000 Length: 0x0000026D +} .mresource public FSharpOptimizationData.ListExpressionSteppingTest2 { // Offset: 0x00000278 Length: 0x000000AF } +.mresource public FSharpOptimizationDataB.ListExpressionSteppingTest2 +{ + // Offset: 0x00000278 Length: 0x000000AF +} .module ListExpressionSteppingTest2.exe // MVID: {59B1920C-D3DE-B780-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl index 864056dbe8c..940297b40a6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000027D } +.mresource public FSharpSignatureDataB.ListExpressionSteppingTest3 +{ + // Offset: 0x00000000 Length: 0x0000027D +} .mresource public FSharpOptimizationData.ListExpressionSteppingTest3 { // Offset: 0x00000288 Length: 0x000000AF } +.mresource public FSharpOptimizationDataB.ListExpressionSteppingTest3 +{ + // Offset: 0x00000288 Length: 0x000000AF +} .module ListExpressionSteppingTest3.exe // MVID: {59B1920C-AE45-39B4-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl index 2d0ccb9e33d..faddbda478d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000275 } +.mresource public FSharpSignatureDataB.ListExpressionSteppingTest4 +{ + // Offset: 0x00000000 Length: 0x00000275 +} .mresource public FSharpOptimizationData.ListExpressionSteppingTest4 { // Offset: 0x00000280 Length: 0x000000AF } +.mresource public FSharpOptimizationDataB.ListExpressionSteppingTest4 +{ + // Offset: 0x00000280 Length: 0x000000AF +} .module ListExpressionSteppingTest4.exe // MVID: {5B9A68C1-3154-FA67-A745-0383C1689A5B} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl index 39def210b7f..1f60ff94fb3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000275 } +.mresource public FSharpSignatureDataB.ListExpressionSteppingTest5 +{ + // Offset: 0x00000000 Length: 0x00000275 +} .mresource public FSharpOptimizationData.ListExpressionSteppingTest5 { // Offset: 0x00000280 Length: 0x000000AF } +.mresource public FSharpOptimizationDataB.ListExpressionSteppingTest5 +{ + // Offset: 0x00000280 Length: 0x000000AF +} .module ListExpressionSteppingTest5.exe // MVID: {5B9A6329-CBE3-BFEA-A745-038329639A5B} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl index 2d43c04e954..b04d8739fc4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000029D } +.mresource public FSharpSignatureDataB.ListExpressionSteppingTest6 +{ + // Offset: 0x00000000 Length: 0x0000029D +} .mresource public FSharpOptimizationData.ListExpressionSteppingTest6 { // Offset: 0x000002A8 Length: 0x000000BC } +.mresource public FSharpOptimizationDataB.ListExpressionSteppingTest6 +{ + // Offset: 0x000002A8 Length: 0x000000BC +} .module ListExpressionSteppingTest6.exe // MVID: {5B9A6329-98A2-AB14-A745-038329639A5B} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl index 32a104642ee..67b7da406d1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl @@ -31,11 +31,21 @@ // Offset: 0x00000000 Length: 0x00000274 // WARNING: managed resource file FSharpSignatureData.test created } +.mresource public FSharpSignatureDataB.LiteralValue +{ + // Offset: 0x00000000 Length: 0x00000274 + // WARNING: managed resource file FSharpSignatureData.test created +} .mresource public FSharpOptimizationData.LiteralValue { // Offset: 0x00000278 Length: 0x0000006F // WARNING: managed resource file FSharpOptimizationData.test created } +.mresource public FSharpOptimizationDataB.LiteralValue +{ + // Offset: 0x00000278 Length: 0x0000006F + // WARNING: managed resource file FSharpOptimizationData.test created +} .module LiteralValue.exe // MVID: {5AA663EB-D9C1-2E4E-A745-0383EB63A65A} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl index af04f94f49e..45024abf01c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000034C } +.mresource public FSharpSignatureDataB.MethodImplAttribute.AggressiveInlining +{ + // Offset: 0x00000000 Length: 0x0000034C +} .mresource public FSharpOptimizationData.MethodImplAttribute.AggressiveInlining { // Offset: 0x00000350 Length: 0x00000085 } +.mresource public FSharpOptimizationDataB.MethodImplAttribute.AggressiveInlining +{ + // Offset: 0x00000350 Length: 0x00000085 +} .module MethodImplAttribute.AggressiveInlining.dll // MVID: {59B1920C-66DC-14D3-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl index b37321a6b45..f3cf851e8c8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000331 } +.mresource public FSharpSignatureDataB.MethodImplAttribute.ForwardRef +{ + // Offset: 0x00000000 Length: 0x00000331 +} .mresource public FSharpOptimizationData.MethodImplAttribute.ForwardRef { // Offset: 0x00000338 Length: 0x0000007D } +.mresource public FSharpOptimizationDataB.MethodImplAttribute.ForwardRef +{ + // Offset: 0x00000338 Length: 0x0000007D +} .module MethodImplAttribute.ForwardRef.dll // MVID: {59B1920C-C517-03FF-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl index 5695375e4e0..f8536869181 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000339 } +.mresource public FSharpSignatureDataB.MethodImplAttribute.InternalCall +{ + // Offset: 0x00000000 Length: 0x00000339 +} .mresource public FSharpOptimizationData.MethodImplAttribute.InternalCall { // Offset: 0x00000340 Length: 0x0000007F } +.mresource public FSharpOptimizationDataB.MethodImplAttribute.InternalCall +{ + // Offset: 0x00000340 Length: 0x0000007F +} .module MethodImplAttribute.InternalCall.dll // MVID: {59B1920C-FBF7-6A35-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl index 6801bbb4405..234cc48cf54 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000331 } +.mresource public FSharpSignatureDataB.MethodImplAttribute.NoInlining +{ + // Offset: 0x00000000 Length: 0x00000331 +} .mresource public FSharpOptimizationData.MethodImplAttribute.NoInlining { // Offset: 0x00000338 Length: 0x0000007D } +.mresource public FSharpOptimizationDataB.MethodImplAttribute.NoInlining +{ + // Offset: 0x00000338 Length: 0x0000007D +} .module MethodImplAttribute.NoInlining.dll // MVID: {59B1920C-F47B-58B3-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl index 37557234689..321058fbefa 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x0000033D } +.mresource public FSharpSignatureDataB.MethodImplAttribute.NoOptimization +{ + // Offset: 0x00000000 Length: 0x0000033D +} .mresource public FSharpOptimizationData.MethodImplAttribute.NoOptimization { // Offset: 0x00000348 Length: 0x00000081 } +.mresource public FSharpOptimizationDataB.MethodImplAttribute.NoOptimization +{ + // Offset: 0x00000348 Length: 0x00000081 +} .module MethodImplAttribute.NoOptimization.dll // MVID: {59B1920C-D394-5177-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl index 6ded00a8d83..3b0eac55f15 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x00000336 } +.mresource public FSharpSignatureDataB.MethodImplAttribute.PreserveSig +{ + // Offset: 0x00000000 Length: 0x00000336 +} .mresource public FSharpOptimizationData.MethodImplAttribute.PreserveSig { // Offset: 0x00000340 Length: 0x0000007E } +.mresource public FSharpOptimizationDataB.MethodImplAttribute.PreserveSig +{ + // Offset: 0x00000340 Length: 0x0000007E +} .module MethodImplAttribute.PreserveSig.dll // MVID: {59B1920C-0C64-31CC-A745-03830C92B159} .imagebase 0x00400000 diff --git a/tests/fsharpqa/Source/CodeGen/LazyNoInline01.il.bsl b/tests/fsharpqa/Source/CodeGen/LazyNoInline01.il.bsl index 54cc47dfc7d..d45a480f910 100644 --- a/tests/fsharpqa/Source/CodeGen/LazyNoInline01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/LazyNoInline01.il.bsl @@ -31,10 +31,18 @@ { // Offset: 0x00000000 Length: 0x000001A8 } +.mresource public FSharpSignatureDataB.LazyNoInline01 +{ + // Offset: 0x00000000 Length: 0x000001A8 +} .mresource public FSharpOptimizationData.LazyNoInline01 { // Offset: 0x000001B0 Length: 0x00000074 } +.mresource public FSharpOptimizationDataB.LazyNoInline01 +{ + // Offset: 0x000001B0 Length: 0x00000074 +} .module LazyNoInline01.exe // MVID: {4CDA515D-3328-E592-A745-03835D51DA4C} .imagebase 0x00400000 diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs index d72c2c4032f..f8b70f438e2 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs @@ -267,7 +267,7 @@ let x = CheckErrorList content <| fun errors -> Assert.AreEqual(1, List.length errors) - assertContains errors "A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point. A type annotation may be needed. Candidates: System.Console.WriteLine(buffer: char []) : unit, System.Console.WriteLine(format: string, [] arg: obj []) : unit, System.Console.WriteLine(value: obj) : unit, System.Console.WriteLine(value: string) : unit" + assertContains errors "A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point." [] member public this.``InvalidMethodOverload2``() = From 2da0d0e2d55d115a0069281a4cbe7e3ac49f823e Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 19 Nov 2018 15:31:26 +0000 Subject: [PATCH 036/137] update baselines --- build.cmd | 2 +- .../AsyncExpressionSteppingTest1.il.bsl | 12 ++++----- .../AsyncExpressionSteppingTest2.il.bsl | 12 ++++----- .../AsyncExpressionSteppingTest3.il.bsl | 12 ++++----- .../AsyncExpressionSteppingTest4.il.bsl | 12 ++++----- .../AsyncExpressionSteppingTest5.il.bsl | 16 ++++++------ .../AsyncExpressionSteppingTest6.il.bsl | 12 ++++----- .../EmittedIL/AttributeTargets/Default.il.bsl | 14 +++++----- .../EmittedIL/AttributeTargets/Field.il.bsl | 14 +++++----- .../AttributeTargets/Property.il.bsl | 14 +++++----- .../CCtorDUWithMember01.il.bsl | 14 +++++----- .../CCtorDUWithMember02.il.bsl | 14 +++++----- .../CCtorDUWithMember03.il.bsl | 14 +++++----- .../CCtorDUWithMember04.il.bsl | 14 +++++----- .../Source/CodeGen/EmittedIL/CompareIL.cmd | 4 +-- .../CompiledNameAttribute01.il.bsl | 12 ++++----- .../CompiledNameAttribute02.il.bsl | 14 +++++----- .../CompiledNameAttribute03.il.bsl | 12 ++++----- .../CompiledNameAttribute04.il.bsl | 14 +++++----- .../ComputationExpr01.il.bsl | 16 ++++++------ .../ComputationExpr02.il.bsl | 16 ++++++------ .../ComputationExpr03.il.bsl | 16 ++++++------ .../ComputationExpr04.il.bsl | 16 ++++++------ .../ComputationExpr05.il.bsl | 16 ++++++------ .../ComputationExpr06.il.bsl | 16 ++++++------ .../ComputationExpr07.il.bsl | 16 ++++++------ ...tBoxStruct_ArrayOfArray_CSInterface.il.bsl | 14 +++++----- ...tBoxStruct_ArrayOfArray_FSInterface.il.bsl | 14 +++++----- ..._ArrayOfArray_FSInterface_NoExtMeth.il.bsl | 14 +++++----- .../DoNotBoxStruct_Array_CSInterface.il.bsl | 14 +++++----- .../DoNotBoxStruct_Array_FSInterface.il.bsl | 14 +++++----- ...xStruct_Array_FSInterface_NoExtMeth.il.bsl | 14 +++++----- .../DoNotBoxStruct_MDArray_CSInterface.il.bsl | 14 +++++----- .../DoNotBoxStruct_MDArray_FSInterface.il.bsl | 14 +++++----- ...truct_MDArray_FSInterface_NoExtMeth.il.bsl | 14 +++++----- .../DoNotBoxStruct_NoArray_CSInterface.il.bsl | 14 +++++----- .../DoNotBoxStruct_NoArray_FSInterface.il.bsl | 14 +++++----- ...truct_NoArray_FSInterface_NoExtMeth.il.bsl | 14 +++++----- .../DoNotBoxStruct_ToString.il.bsl | 14 +++++----- .../GeneratedIterators/GenIter01.il.bsl | 10 +++---- .../GeneratedIterators/GenIter02.il.bsl | 10 +++---- .../GeneratedIterators/GenIter03.il.bsl | 10 +++---- .../GeneratedIterators/GenIter04.il.bsl | 10 +++---- .../InequalityComparison01.il.bsl | 14 +++++----- .../InequalityComparison02.il.bsl | 14 +++++----- .../InequalityComparison03.il.bsl | 14 +++++----- .../InequalityComparison04.il.bsl | 14 +++++----- .../InequalityComparison05.il.bsl | 14 +++++----- .../ListExpressionSteppingTest1.il.bsl | 14 +++++----- .../ListExpressionSteppingTest2.il.bsl | 14 +++++----- .../ListExpressionSteppingTest3.il.bsl | 14 +++++----- .../ListExpressionSteppingTest4.il.bsl | 10 +++---- .../ListExpressionSteppingTest5.il.bsl | 10 +++---- .../ListExpressionSteppingTest6.il.bsl | 10 +++---- .../LiteralValue/LiteralValue.il.bsl | 26 ++++++++----------- ...hodImplAttribute.AggressiveInlining.il.bsl | 14 +++++----- .../MethodImplAttribute.ForwardRef.il.bsl | 14 +++++----- .../MethodImplAttribute.InternalCall.il.bsl | 14 +++++----- .../MethodImplAttribute.NoInlining.il.bsl | 14 +++++----- .../MethodImplAttribute.NoOptimization.il.bsl | 14 +++++----- .../MethodImplAttribute.PreserveSig.il.bsl | 14 +++++----- .../MethodImplAttribute.Synchronized.il.bsl | 18 +++++++++---- .../MethodImplAttribute.Unmanaged.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/AbstractClass.il.bsl | 18 +++++++++---- .../Misc/ArgumentNamesInClosures01.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/CodeGenRenamings01.il.bsl | 18 +++++++++---- .../CustomAttributeGenericParameter01.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Misc/Decimal01.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/EntryPoint01.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/EqualsOnUnions01.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Misc/ForLoop01.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Misc/ForLoop02.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Misc/ForLoop03.il.bsl | 18 +++++++++---- .../Misc/GeneralizationOnUnions01.il.bsl | 18 +++++++++---- .../Misc/GenericTypeStaticField01.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/IfThenElse01.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/LetIfThenElse01.il.bsl | 16 +++++++++--- .../CodeGen/EmittedIL/Misc/Lock01.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Misc/Marshal.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/MethodImplNoInline.il.bsl | 18 +++++++++---- .../Misc/MethodImplNoInline02.il.bsl | 18 +++++++++---- .../Misc/ModuleWithExpression01.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/NoBoxingOnDispose01.il.bsl | 18 +++++++++---- .../Misc/NonEscapingArguments02.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Misc/PreserveSig.il.bsl | 18 +++++++++---- .../EmittedIL/Misc/Seq_for_all01.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Misc/Structs01.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Misc/Structs02.il.bsl | 18 +++++++++---- .../Misc/StructsAsArrayElements01.il.bsl | 16 +++++++++--- .../Misc/TryWith_NoFilterBlocks01.il.bsl | 18 +++++++++---- .../Source/CodeGen/EmittedIL/Misc/cas.il.bsl | 18 +++++++++---- .../EmittedIL/Mutation/Mutation01.il.bsl | 18 +++++++++---- .../EmittedIL/Mutation/Mutation02.il.bsl | 14 +++++++--- .../EmittedIL/Mutation/Mutation03.il.bsl | 14 +++++++--- .../EmittedIL/Mutation/Mutation04.il.bsl | 14 +++++++--- .../EmittedIL/Mutation/Mutation05.il.bsl | 14 +++++++--- .../Operators/comparison_decimal01.il.bsl | 18 +++++++++---- .../Linq101Aggregates01.il.bsl | 14 +++++++--- .../Linq101ElementOperators01.il.bsl | 14 +++++++--- .../Linq101Grouping01.il.bsl | 14 +++++++--- .../Linq101Joins01.il.bsl | 14 +++++++--- .../Linq101Ordering01.il.bsl | 14 +++++++--- .../Linq101Partitioning01.il.bsl | 14 +++++++--- .../Linq101Quantifiers01.il.bsl | 14 +++++++--- .../Linq101Select01.il.bsl | 14 +++++++--- .../Linq101SetOperators01.il.bsl | 14 +++++++--- .../Linq101Where01.il.bsl | 14 +++++++--- .../SeqExpressionSteppingTest1.il.bsl | 18 +++++++++---- .../SeqExpressionSteppingTest2.il.bsl | 18 +++++++++---- .../SeqExpressionSteppingTest3.il.bsl | 18 +++++++++---- .../SeqExpressionSteppingTest4.il.bsl | 14 +++++++--- .../SeqExpressionSteppingTest5.il.bsl | 14 +++++++--- .../SeqExpressionSteppingTest6.il.bsl | 14 +++++++--- .../SeqExpressionSteppingTest7.il.bsl | 14 +++++++--- .../SeqExpressionTailCalls01.il.bsl | 18 +++++++++---- .../SeqExpressionTailCalls02.il.bsl | 18 +++++++++---- .../EmittedIL/StaticInit/LetBinding01.il.bsl | 18 +++++++++---- .../StaticInit/StaticInit_Class01.il.bsl | 18 +++++++++---- .../StaticInit/StaticInit_Module01.il.bsl | 24 +++++++++++------ .../StaticInit/StaticInit_Struct01.il.bsl | 18 +++++++++---- .../SteppingMatch/SteppingMatch01.il.bsl | 16 +++++++++--- .../SteppingMatch/SteppingMatch02.il.bsl | 16 +++++++++--- .../SteppingMatch/SteppingMatch03.il.bsl | 16 +++++++++--- .../SteppingMatch/SteppingMatch04.il.bsl | 16 +++++++++--- .../SteppingMatch/SteppingMatch05.il.bsl | 16 +++++++++--- .../SteppingMatch/SteppingMatch06.il.bsl | 18 +++++++++---- .../SteppingMatch/SteppingMatch07.il.bsl | 18 +++++++++---- .../SteppingMatch/SteppingMatch08.il.bsl | 18 +++++++++---- .../SteppingMatch/SteppingMatch09.il.bsl | 16 +++++++++--- .../EmittedIL/TailCalls/TailCall01.il.bsl | 16 +++++++++--- .../EmittedIL/TailCalls/TailCall02.il.bsl | 18 +++++++++---- .../EmittedIL/TailCalls/TailCall03.il.bsl | 16 +++++++++--- .../EmittedIL/TailCalls/TailCall04.il.bsl | 16 +++++++++--- .../EmittedIL/TailCalls/TailCall05.il.bsl | 16 +++++++++--- .../TestFunctions/TestFunction1.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction10.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction13.il.bsl | 16 +++++++++--- .../TestFunctions/TestFunction14.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction16.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction17.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction19.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction20.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction21.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction23.il.bsl | 16 +++++++++--- .../TestFunctions/TestFunction24.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction3b.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction3c.il.bsl | 18 +++++++++---- .../TestFunctions/TestFunction9b4.il.bsl | 16 +++++++++--- .../TestFunctions/Testfunction11.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction12.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction15.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction18.il.bsl | 16 +++++++++--- .../TestFunctions/Testfunction2.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction22.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction22b.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction22c.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction22d.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction22e.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction22f.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction22g.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction22h.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction3.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction4.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction5.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction6.il.bsl | 16 +++++++++--- .../TestFunctions/Testfunction7.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction8.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction9.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction9b.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction9b1.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction9b2.il.bsl | 18 +++++++++---- .../TestFunctions/Testfunction9b3.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Tuples/Tuple01.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Tuples/Tuple02.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Tuples/Tuple03.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Tuples/Tuple04.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Tuples/Tuple05.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Tuples/Tuple06.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Tuples/Tuple07.il.bsl | 18 +++++++++---- .../CodeGen/EmittedIL/Tuples/Tuple08.il.bsl | 18 +++++++++---- .../EmittedIL/Tuples/TupleElimination.il.bsl | 16 +++++++++--- .../EmittedIL/Tuples/TupleMonster.il.bsl | 18 +++++++++---- .../Tuples/ValueTupleAliasConstructor.il.bsl | 18 +++++++++---- 183 files changed, 1942 insertions(+), 970 deletions(-) diff --git a/build.cmd b/build.cmd index 5491fa6740a..1f6d13d816a 100644 --- a/build.cmd +++ b/build.cmd @@ -338,7 +338,7 @@ if /i "%ARG%" == "test-sign" ( ) if /i "%ARG%" == "test-update-bsl" ( - set TEST_UPDATE_BSL=test + set TEST_UPDATE_BSL=1 ) if /i "%ARG%" == "real-sign" ( diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl index 73d3c689a79..c859ad798a0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly AsyncExpressionSteppingTest1 { @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest1 { - // Offset: 0x00000000 Length: 0x0000026C + // Offset: 0x00000270 Length: 0x00000004 } .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest1 { - // Offset: 0x00000270 Length: 0x000000B1 + // Offset: 0x00000278 Length: 0x000000B1 } .mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest1 { - // Offset: 0x00000270 Length: 0x000000B1 + // Offset: 0x00000330 Length: 0x00000000 } .module AsyncExpressionSteppingTest1.dll -// MVID: {5AF5DDAE-6394-B5D4-A745-0383AEDDF55A} +// MVID: {5BF2D3CD-6394-B5D4-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02880000 +// Image base: 0x01170000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl index ccbd4c42929..fc590de3ea1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly AsyncExpressionSteppingTest2 { @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest2 { - // Offset: 0x00000000 Length: 0x0000026C + // Offset: 0x00000270 Length: 0x00000004 } .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest2 { - // Offset: 0x00000270 Length: 0x000000B1 + // Offset: 0x00000278 Length: 0x000000B1 } .mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest2 { - // Offset: 0x00000270 Length: 0x000000B1 + // Offset: 0x00000330 Length: 0x00000000 } .module AsyncExpressionSteppingTest2.dll -// MVID: {5AF5DDAE-6394-D499-A745-0383AEDDF55A} +// MVID: {5BF2D3CD-6394-D499-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x04520000 +// Image base: 0x02A10000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl index df596f72e7e..a94020fe60c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly AsyncExpressionSteppingTest3 { @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest3 { - // Offset: 0x00000000 Length: 0x00000277 + // Offset: 0x00000280 Length: 0x00000004 } .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest3 { - // Offset: 0x00000280 Length: 0x000000B1 + // Offset: 0x00000288 Length: 0x000000B1 } .mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest3 { - // Offset: 0x00000280 Length: 0x000000B1 + // Offset: 0x00000340 Length: 0x00000000 } .module AsyncExpressionSteppingTest3.dll -// MVID: {5AF5DDAE-6394-F35E-A745-0383AEDDF55A} +// MVID: {5BF2D3CD-6394-F35E-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x04650000 +// Image base: 0x00FC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl index 17496424524..9ece3bf8c4a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly AsyncExpressionSteppingTest4 { @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest4 { - // Offset: 0x00000000 Length: 0x00000277 + // Offset: 0x00000280 Length: 0x00000004 } .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest4 { - // Offset: 0x00000280 Length: 0x000000B1 + // Offset: 0x00000288 Length: 0x000000B1 } .mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest4 { - // Offset: 0x00000280 Length: 0x000000B1 + // Offset: 0x00000340 Length: 0x00000000 } .module AsyncExpressionSteppingTest4.dll -// MVID: {5AF5DDAE-6394-6D4B-A745-0383AEDDF55A} +// MVID: {5BF2D3CD-6394-6D4B-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x028F0000 +// Image base: 0x018B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl index 724f3938feb..08899741e7c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly AsyncExpressionSteppingTest5 { @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest5 { - // Offset: 0x00000000 Length: 0x000002B8 + // Offset: 0x000002C0 Length: 0x00000006 } -.mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest5 +.mresource public FSharpOptimizationData.AsyncExpressionSteppingTest5 { - // Offset: 0x000002C0 Length: 0x000000BE + // Offset: 0x000002D0 Length: 0x000000BE } -.mresource public FSharpOptimizationData.AsyncExpressionSteppingTest5 +.mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest5 { - // Offset: 0x000002C0 Length: 0x000000BE + // Offset: 0x00000398 Length: 0x00000000 } .module AsyncExpressionSteppingTest5.dll -// MVID: {5AF5DDAE-6394-30E8-A745-0383AEDDF55A} +// MVID: {5BF2D3CD-6394-30E8-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x04430000 +// Image base: 0x03090000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl index 57eecdc5c29..f3d714ff15d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly AsyncExpressionSteppingTest6 { @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.AsyncExpressionSteppingTest6 { - // Offset: 0x00000000 Length: 0x000002A3 + // Offset: 0x000002A8 Length: 0x00000008 } .mresource public FSharpOptimizationData.AsyncExpressionSteppingTest6 { - // Offset: 0x000002A8 Length: 0x000000BE + // Offset: 0x000002B8 Length: 0x000000BE } .mresource public FSharpOptimizationDataB.AsyncExpressionSteppingTest6 { - // Offset: 0x000002A8 Length: 0x000000BE + // Offset: 0x00000380 Length: 0x00000000 } .module AsyncExpressionSteppingTest6.dll -// MVID: {5AF5DDAE-6394-4FAD-A745-0383AEDDF55A} +// MVID: {5BF2D3CD-6394-4FAD-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x04C40000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl index 8c426bf0b0f..504d1db21cc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Default { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.Default { - // Offset: 0x00000000 Length: 0x000003FA + // Offset: 0x00000000 Length: 0x00000402 } .mresource public FSharpSignatureDataB.Default { - // Offset: 0x00000000 Length: 0x000003FA + // Offset: 0x00000408 Length: 0x00000019 } .mresource public FSharpOptimizationData.Default { - // Offset: 0x00000400 Length: 0x000000BA + // Offset: 0x00000428 Length: 0x000000BA } .mresource public FSharpOptimizationDataB.Default { - // Offset: 0x00000400 Length: 0x000000BA + // Offset: 0x000004E8 Length: 0x00000003 } .module Default.dll -// MVID: {59B19208-AAA9-67BB-A745-03830892B159} +// MVID: {5BF2D3CD-AAA9-67BB-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00E30000 +// Image base: 0x01750000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl index 6015f888f20..e3f0e3ce615 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Field { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.Field { - // Offset: 0x00000000 Length: 0x000003F4 + // Offset: 0x00000000 Length: 0x000003FC } .mresource public FSharpSignatureDataB.Field { - // Offset: 0x00000000 Length: 0x000003F4 + // Offset: 0x00000400 Length: 0x00000019 } .mresource public FSharpOptimizationData.Field { - // Offset: 0x000003F8 Length: 0x000000B8 + // Offset: 0x00000420 Length: 0x000000B8 } .mresource public FSharpOptimizationDataB.Field { - // Offset: 0x000003F8 Length: 0x000000B8 + // Offset: 0x000004E0 Length: 0x00000003 } .module Field.dll -// MVID: {59B19208-96F8-CD6E-A745-03830892B159} +// MVID: {5BF2D3CD-96F8-CD6E-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F60000 +// Image base: 0x030E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl index 386739667ae..ad59fec2f27 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Property { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.Property { - // Offset: 0x00000000 Length: 0x000003FD + // Offset: 0x00000000 Length: 0x00000405 } .mresource public FSharpSignatureDataB.Property { - // Offset: 0x00000000 Length: 0x000003FD + // Offset: 0x00000410 Length: 0x00000019 } .mresource public FSharpOptimizationData.Property { - // Offset: 0x00000408 Length: 0x000000BB + // Offset: 0x00000430 Length: 0x000000BB } .mresource public FSharpOptimizationDataB.Property { - // Offset: 0x00000408 Length: 0x000000BB + // Offset: 0x000004F0 Length: 0x00000003 } .module Property.dll -// MVID: {59B19208-9B5C-7949-A745-03830892B159} +// MVID: {5BF2D3CD-9B5C-7949-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02E80000 +// Image base: 0x01570000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl index 0aa363c3c9c..bc31f32303d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CCtorDUWithMember01 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.CCtorDUWithMember01 { - // Offset: 0x00000000 Length: 0x00000790 + // Offset: 0x00000000 Length: 0x00000784 } .mresource public FSharpSignatureDataB.CCtorDUWithMember01 { - // Offset: 0x00000000 Length: 0x00000790 + // Offset: 0x00000788 Length: 0x00000083 } .mresource public FSharpOptimizationData.CCtorDUWithMember01 { - // Offset: 0x00000798 Length: 0x00000227 + // Offset: 0x00000810 Length: 0x00000227 } .mresource public FSharpOptimizationDataB.CCtorDUWithMember01 { - // Offset: 0x00000798 Length: 0x00000227 + // Offset: 0x00000A40 Length: 0x0000002F } .module CCtorDUWithMember01.exe -// MVID: {59B1923F-26F1-14EE-A745-03833F92B159} +// MVID: {5BF2D41B-26F1-14EE-A745-03831BD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A70000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl index 3698c4f348c..da0a3ee6bd3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CCtorDUWithMember02 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.CCtorDUWithMember02 { - // Offset: 0x00000000 Length: 0x0000030C + // Offset: 0x00000000 Length: 0x00000314 } .mresource public FSharpSignatureDataB.CCtorDUWithMember02 { - // Offset: 0x00000000 Length: 0x0000030C + // Offset: 0x00000318 Length: 0x00000002 } .mresource public FSharpOptimizationData.CCtorDUWithMember02 { - // Offset: 0x00000310 Length: 0x000000E4 + // Offset: 0x00000320 Length: 0x000000E4 } .mresource public FSharpOptimizationDataB.CCtorDUWithMember02 { - // Offset: 0x00000310 Length: 0x000000E4 + // Offset: 0x00000408 Length: 0x00000000 } .module CCtorDUWithMember02.exe -// MVID: {59B1923F-D176-C99D-A745-03833F92B159} +// MVID: {5BF2D41B-D176-C99D-A745-03831BD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01380000 +// Image base: 0x019A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl index 97d89f86dcf..0791ebcb6e2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CCtorDUWithMember03 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.CCtorDUWithMember03 { - // Offset: 0x00000000 Length: 0x0000029D + // Offset: 0x00000000 Length: 0x000002A5 } .mresource public FSharpSignatureDataB.CCtorDUWithMember03 { - // Offset: 0x00000000 Length: 0x0000029D + // Offset: 0x000002B0 Length: 0x00000001 } .mresource public FSharpOptimizationData.CCtorDUWithMember03 { - // Offset: 0x000002A8 Length: 0x000000B2 + // Offset: 0x000002B8 Length: 0x000000B2 } .mresource public FSharpOptimizationDataB.CCtorDUWithMember03 { - // Offset: 0x000002A8 Length: 0x000000B2 + // Offset: 0x00000370 Length: 0x00000000 } .module CCtorDUWithMember03.exe -// MVID: {59B1923F-C97B-D207-A745-03833F92B159} +// MVID: {5BF2D41B-C97B-D207-A745-03831BD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x030C0000 +// Image base: 0x012D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl index 7399e7f4b1a..0479ca6cdd4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CCtorDUWithMember04 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.CCtorDUWithMember04 { - // Offset: 0x00000000 Length: 0x0000029D + // Offset: 0x00000000 Length: 0x000002A5 } .mresource public FSharpSignatureDataB.CCtorDUWithMember04 { - // Offset: 0x00000000 Length: 0x0000029D + // Offset: 0x000002B0 Length: 0x00000001 } .mresource public FSharpOptimizationData.CCtorDUWithMember04 { - // Offset: 0x000002A8 Length: 0x000000B2 + // Offset: 0x000002B8 Length: 0x000000B2 } .mresource public FSharpOptimizationDataB.CCtorDUWithMember04 { - // Offset: 0x000002A8 Length: 0x000000B2 + // Offset: 0x00000370 Length: 0x00000000 } .module CCtorDUWithMember04.exe -// MVID: {59B1923F-CF28-717B-A745-03833F92B159} +// MVID: {5BF2D41B-CF28-717B-A745-03831BD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00AA0000 +// Image base: 0x02360000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd index 24b323ec7d5..c60bef9ec1d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd @@ -7,8 +7,8 @@ echo ..\..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il" ..\..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il" if /i "%TEST_UPDATE_BSL%" == "1" ( - echo copy /y "%~n1.il.bsl" "%~n1.il" - copy /y "%~n1.il.bsl" "%~n1.il" + echo copy /y "%~n1.il" "%~n1.il.bsl" + copy /y "%~n1.il" "%~n1.il.bsl" ) exit /b %ERRORLEVEL% diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl index d4aa7ebe09f..a895fab909b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CompiledNameAttribute01 { @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.CompiledNameAttribute01 { - // Offset: 0x00000000 Length: 0x00000272 + // Offset: 0x00000278 Length: 0x00000008 } .mresource public FSharpOptimizationData.CompiledNameAttribute01 { - // Offset: 0x00000278 Length: 0x00000086 + // Offset: 0x00000288 Length: 0x00000086 } .mresource public FSharpOptimizationDataB.CompiledNameAttribute01 { - // Offset: 0x00000278 Length: 0x00000086 + // Offset: 0x00000318 Length: 0x00000000 } .module CompiledNameAttribute01.exe -// MVID: {59B1923F-EF5A-FC2A-A745-03833F92B159} +// MVID: {5BF2D41B-EF5A-FC2A-A745-03831BD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00ED0000 +// Image base: 0x00360000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl index 1b57218847d..469669c48d7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CompiledNameAttribute02 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.CompiledNameAttribute02 { - // Offset: 0x00000000 Length: 0x000002E8 + // Offset: 0x00000000 Length: 0x000002F0 } .mresource public FSharpSignatureDataB.CompiledNameAttribute02 { - // Offset: 0x00000000 Length: 0x000002E8 + // Offset: 0x000002F8 Length: 0x00000011 } .mresource public FSharpOptimizationData.CompiledNameAttribute02 { - // Offset: 0x000002F0 Length: 0x000000CD + // Offset: 0x00000310 Length: 0x000000CD } .mresource public FSharpOptimizationDataB.CompiledNameAttribute02 { - // Offset: 0x000002F0 Length: 0x000000CD + // Offset: 0x000003E8 Length: 0x00000006 } .module CompiledNameAttribute02.exe -// MVID: {59B1923F-F755-F3C0-A745-03833F92B159} +// MVID: {5BF2D41B-F755-F3C0-A745-03831BD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018A0000 +// Image base: 0x013E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl index 9106af33a09..3a08617c25e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CompiledNameAttribute03 { @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.CompiledNameAttribute03 { - // Offset: 0x00000000 Length: 0x0000027D + // Offset: 0x00000288 Length: 0x00000008 } .mresource public FSharpOptimizationData.CompiledNameAttribute03 { - // Offset: 0x00000288 Length: 0x00000086 + // Offset: 0x00000298 Length: 0x00000086 } .mresource public FSharpOptimizationDataB.CompiledNameAttribute03 { - // Offset: 0x00000288 Length: 0x00000086 + // Offset: 0x00000328 Length: 0x00000000 } .module CompiledNameAttribute03.exe -// MVID: {59B1923F-2CE4-60B9-A745-03833F92B159} +// MVID: {5BF2D41B-2CE4-60B9-A745-03831BD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03120000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl index d3a202e6ecf..8351df5f9a4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CompiledNameAttribute04 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.CompiledNameAttribute04 { - // Offset: 0x00000000 Length: 0x00000CE9 + // Offset: 0x00000000 Length: 0x00000CDD } .mresource public FSharpSignatureDataB.CompiledNameAttribute04 { - // Offset: 0x00000000 Length: 0x00000CE9 + // Offset: 0x00000CE8 Length: 0x00000109 } .mresource public FSharpOptimizationData.CompiledNameAttribute04 { - // Offset: 0x00000CF0 Length: 0x000002CB + // Offset: 0x00000DF8 Length: 0x000002CB } .mresource public FSharpOptimizationDataB.CompiledNameAttribute04 { - // Offset: 0x00000CF0 Length: 0x000002CB + // Offset: 0x000010C8 Length: 0x0000004C } .module CompiledNameAttribute04.exe -// MVID: {59B1923F-34DF-584F-A745-03833F92B159} +// MVID: {5BF2D41B-34DF-584F-A745-03831BD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01680000 +// Image base: 0x00690000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl index 8f7a3950a8c..09fe9b130a1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly extern ComputationExprLibrary { @@ -33,28 +33,28 @@ } .mresource public FSharpSignatureData.ComputationExpr01 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000000 Length: 0x0000021A } .mresource public FSharpSignatureDataB.ComputationExpr01 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000220 Length: 0x00000002 } .mresource public FSharpOptimizationData.ComputationExpr01 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x00000228 Length: 0x0000007D } .mresource public FSharpOptimizationDataB.ComputationExpr01 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr01.exe -// MVID: {5A1F62A7-3703-E566-A745-0383A7621F5A} +// MVID: {5BF2D3C6-3703-E566-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007B0000 +// Image base: 0x001E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -91,7 +91,7 @@ // Code size 15 (0xf) .maxstack 8 .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 8,8 : 9,17 'C:\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr01.fs' + .line 8,8 : 9,17 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr01.fs' IL_0000: ldarg.0 IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/res1@8::builder@ IL_0006: ldc.i4.1 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl index e93d942e567..9117d6d0521 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly extern ComputationExprLibrary { @@ -33,28 +33,28 @@ } .mresource public FSharpSignatureData.ComputationExpr02 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000000 Length: 0x0000021A } .mresource public FSharpSignatureDataB.ComputationExpr02 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000220 Length: 0x00000002 } .mresource public FSharpOptimizationData.ComputationExpr02 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x00000228 Length: 0x0000007D } .mresource public FSharpOptimizationDataB.ComputationExpr02 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr02.exe -// MVID: {5A1F62A7-3624-E566-A745-0383A7621F5A} +// MVID: {5BF2D3C6-3624-E566-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01010000 +// Image base: 0x00C80000 // =============== CLASS MEMBERS DECLARATION =================== @@ -92,7 +92,7 @@ .maxstack 7 .locals init ([0] int32 x) .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 8,8 : 18,33 'C:\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr02.fs' + .line 8,8 : 18,33 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr02.fs' IL_0000: ldstr "hello" IL_0005: newobj instance void class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`5::.ctor(string) IL_000a: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl index 4c996ec170c..cb24e6563c6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly extern ComputationExprLibrary { @@ -33,28 +33,28 @@ } .mresource public FSharpSignatureData.ComputationExpr03 { - // Offset: 0x00000000 Length: 0x00000222 + // Offset: 0x00000000 Length: 0x00000244 } .mresource public FSharpSignatureDataB.ComputationExpr03 { - // Offset: 0x00000000 Length: 0x00000222 + // Offset: 0x00000248 Length: 0x00000004 } .mresource public FSharpOptimizationData.ComputationExpr03 { - // Offset: 0x00000228 Length: 0x0000008C + // Offset: 0x00000250 Length: 0x0000008C } .mresource public FSharpOptimizationDataB.ComputationExpr03 { - // Offset: 0x00000228 Length: 0x0000008C + // Offset: 0x000002E0 Length: 0x00000000 } .module ComputationExpr03.exe -// MVID: {5A1F62A7-3649-E566-A745-0383A7621F5A} +// MVID: {5BF2D3C6-3649-E566-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BF0000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -92,7 +92,7 @@ .maxstack 7 .locals init ([0] int32 x) .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 8,8 : 18,33 'C:\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr03.fs' + .line 8,8 : 18,33 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr03.fs' IL_0000: ldstr "hello" IL_0005: newobj instance void class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`5::.ctor(string) IL_000a: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl index 53bc3660153..cb7eb4731fb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly extern ComputationExprLibrary { @@ -33,28 +33,28 @@ } .mresource public FSharpSignatureData.ComputationExpr04 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000000 Length: 0x0000021A } .mresource public FSharpSignatureDataB.ComputationExpr04 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000220 Length: 0x00000002 } .mresource public FSharpOptimizationData.ComputationExpr04 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x00000228 Length: 0x0000007D } .mresource public FSharpOptimizationDataB.ComputationExpr04 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr04.exe -// MVID: {5A1F62A7-366A-E566-A745-0383A7621F5A} +// MVID: {5BF2D3C6-366A-E566-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x04DD0000 +// Image base: 0x032C0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -93,7 +93,7 @@ .locals init ([0] int32 x, [1] string V_1) .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 7,7 : 22,37 'C:\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr04.fs' + .line 7,7 : 22,37 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr04.fs' IL_0000: ldstr "hello" IL_0005: newobj instance void class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`5::.ctor(string) IL_000a: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl index 49e8c688ded..0e25abf7e10 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly extern ComputationExprLibrary { @@ -33,28 +33,28 @@ } .mresource public FSharpSignatureData.ComputationExpr05 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000000 Length: 0x0000021A } .mresource public FSharpSignatureDataB.ComputationExpr05 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000220 Length: 0x00000002 } .mresource public FSharpOptimizationData.ComputationExpr05 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x00000228 Length: 0x0000007D } .mresource public FSharpOptimizationDataB.ComputationExpr05 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr05.exe -// MVID: {5A1F62A7-3687-E566-A745-0383A7621F5A} +// MVID: {5BF2D3C6-3687-E566-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x039D0000 +// Image base: 0x00C90000 // =============== CLASS MEMBERS DECLARATION =================== @@ -87,7 +87,7 @@ // Code size 1 (0x1) .maxstack 8 .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 9,9 : 68,70 'C:\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr05.fs' + .line 9,9 : 68,70 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr05.fs' IL_0000: ret } // end of method 'res5@9-1'::'System-IDisposable-Dispose' diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl index 903ddd21033..bcfe1f6e811 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly extern ComputationExprLibrary { @@ -33,28 +33,28 @@ } .mresource public FSharpSignatureData.ComputationExpr06 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000000 Length: 0x0000021A } .mresource public FSharpSignatureDataB.ComputationExpr06 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000220 Length: 0x00000002 } .mresource public FSharpOptimizationData.ComputationExpr06 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x00000228 Length: 0x0000007D } .mresource public FSharpOptimizationDataB.ComputationExpr06 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr06.exe -// MVID: {5A1F62A7-35A8-E566-A745-0383A7621F5A} +// MVID: {5BF2D3C6-35A8-E566-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00DD0000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -88,7 +88,7 @@ // Code size 15 (0xf) .maxstack 8 .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 9,9 : 15,21 'C:\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr06.fs' + .line 9,9 : 15,21 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr06.fs' IL_0000: ldarg.0 IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-1'::x IL_0006: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl index 8b9ec2a099c..25db98d4691 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly extern ComputationExprLibrary { @@ -33,28 +33,28 @@ } .mresource public FSharpSignatureData.ComputationExpr07 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000000 Length: 0x0000021A } .mresource public FSharpSignatureDataB.ComputationExpr07 { - // Offset: 0x00000000 Length: 0x000001F8 + // Offset: 0x00000220 Length: 0x00000002 } .mresource public FSharpOptimizationData.ComputationExpr07 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x00000228 Length: 0x0000007D } .mresource public FSharpOptimizationDataB.ComputationExpr07 { - // Offset: 0x00000200 Length: 0x0000007D + // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr07.exe -// MVID: {5A1F62A7-35BD-E566-A745-0383A7621F5A} +// MVID: {5BF2D3C6-35BD-E566-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03800000 +// Image base: 0x00AC0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -97,7 +97,7 @@ .maxstack 7 .locals init ([0] int32 v) .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 9,9 : 9,29 'C:\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr07.fs' + .line 9,9 : 9,29 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr07.fs' IL_0000: ldarg.1 IL_0001: stloc.0 .line 10,10 : 13,24 '' diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl index b43ee6dc66d..6316ec52153 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_ArrayOfArray_CSInterface { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_ArrayOfArray_CSInterface { - // Offset: 0x00000000 Length: 0x0000026E + // Offset: 0x00000000 Length: 0x00000276 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_CSInterface { - // Offset: 0x00000000 Length: 0x0000026E + // Offset: 0x00000280 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_CSInterface { - // Offset: 0x00000278 Length: 0x000000A6 + // Offset: 0x00000290 Length: 0x000000A6 } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_ArrayOfArray_CSInterface { - // Offset: 0x00000278 Length: 0x000000A6 + // Offset: 0x00000340 Length: 0x00000000 } .module DoNotBoxStruct_ArrayOfArray_CSInterface.exe -// MVID: {59B1920A-FF24-C89E-A745-03830A92B159} +// MVID: {5BF2D3C6-FF24-C89E-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x015B0000 +// Image base: 0x00730000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl index 8c5162ffdbc..7afa0c80702 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_ArrayOfArray_FSInterface { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_ArrayOfArray_FSInterface { - // Offset: 0x00000000 Length: 0x00000272 + // Offset: 0x00000000 Length: 0x0000027A } .mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_FSInterface { - // Offset: 0x00000000 Length: 0x00000272 + // Offset: 0x00000280 Length: 0x00000007 } .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_FSInterface { - // Offset: 0x00000278 Length: 0x000000A6 + // Offset: 0x00000290 Length: 0x000000A6 } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_ArrayOfArray_FSInterface { - // Offset: 0x00000278 Length: 0x000000A6 + // Offset: 0x00000340 Length: 0x00000000 } .module DoNotBoxStruct_ArrayOfArray_FSInterface.exe -// MVID: {59B1920A-8A45-C8A0-A745-03830A92B159} +// MVID: {5BF2D3C6-8A45-C8A0-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl index d0f11235d0c..7d97378763a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth { - // Offset: 0x00000000 Length: 0x00000291 + // Offset: 0x00000000 Length: 0x00000299 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth { - // Offset: 0x00000000 Length: 0x00000291 + // Offset: 0x000002A0 Length: 0x00000007 } .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth { - // Offset: 0x00000298 Length: 0x000000BA + // Offset: 0x000002B0 Length: 0x000000BA } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth { - // Offset: 0x00000298 Length: 0x000000BA + // Offset: 0x00000370 Length: 0x00000000 } .module DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.exe -// MVID: {59B1920A-1475-D984-A745-03830A92B159} +// MVID: {5BF2D3C6-1475-D984-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x015B0000 +// Image base: 0x00C50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl index 6fe2c3a71f6..4edad8cbffc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_Array_CSInterface { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_Array_CSInterface { - // Offset: 0x00000000 Length: 0x00000255 + // Offset: 0x00000000 Length: 0x0000025D } .mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_CSInterface { - // Offset: 0x00000000 Length: 0x00000255 + // Offset: 0x00000268 Length: 0x00000005 } .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_CSInterface { - // Offset: 0x00000260 Length: 0x00000098 + // Offset: 0x00000278 Length: 0x00000098 } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_Array_CSInterface { - // Offset: 0x00000260 Length: 0x00000098 + // Offset: 0x00000318 Length: 0x00000000 } .module DoNotBoxStruct_Array_CSInterface.exe -// MVID: {59B1920A-1735-654E-A745-03830A92B159} +// MVID: {5BF2D3C6-1735-654E-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x031D0000 +// Image base: 0x03160000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl index 90baafd2d49..8de966720e0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_Array_FSInterface { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_Array_FSInterface { - // Offset: 0x00000000 Length: 0x00000259 + // Offset: 0x00000000 Length: 0x00000261 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_FSInterface { - // Offset: 0x00000000 Length: 0x00000259 + // Offset: 0x00000268 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_FSInterface { - // Offset: 0x00000260 Length: 0x00000098 + // Offset: 0x00000278 Length: 0x00000098 } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_Array_FSInterface { - // Offset: 0x00000260 Length: 0x00000098 + // Offset: 0x00000318 Length: 0x00000000 } .module DoNotBoxStruct_Array_FSInterface.exe -// MVID: {59B1920A-1737-9DA5-A745-03830A92B159} +// MVID: {5BF2D3C6-1737-9DA5-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00300000 +// Image base: 0x00C50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl index 3b4fff4123a..f350407b675 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_Array_FSInterface_NoExtMeth { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_Array_FSInterface_NoExtMeth { - // Offset: 0x00000000 Length: 0x00000278 + // Offset: 0x00000000 Length: 0x00000280 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_FSInterface_NoExtMeth { - // Offset: 0x00000000 Length: 0x00000278 + // Offset: 0x00000288 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_FSInterface_NoExtMeth { - // Offset: 0x00000280 Length: 0x000000AC + // Offset: 0x00000298 Length: 0x000000AC } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_Array_FSInterface_NoExtMeth { - // Offset: 0x00000280 Length: 0x000000AC + // Offset: 0x00000348 Length: 0x00000000 } .module DoNotBoxStruct_Array_FSInterface_NoExtMeth.exe -// MVID: {59B1920A-8127-3EE3-A745-03830A92B159} +// MVID: {5BF2D3C6-8127-3EE3-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00740000 +// Image base: 0x012C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl index 84b5a647acb..bd321304efe 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_MDArray_CSInterface { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_MDArray_CSInterface { - // Offset: 0x00000000 Length: 0x0000025C + // Offset: 0x00000000 Length: 0x00000264 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_CSInterface { - // Offset: 0x00000000 Length: 0x0000025C + // Offset: 0x00000268 Length: 0x00000005 } .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_CSInterface { - // Offset: 0x00000260 Length: 0x0000009C + // Offset: 0x00000278 Length: 0x0000009C } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_MDArray_CSInterface { - // Offset: 0x00000260 Length: 0x0000009C + // Offset: 0x00000318 Length: 0x00000000 } .module DoNotBoxStruct_MDArray_CSInterface.exe -// MVID: {59B1920A-24A8-8796-A745-03830A92B159} +// MVID: {5BF2D3C6-24A8-8796-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00DD0000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl index ca40a1c0b33..5dcd9ff2d28 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_MDArray_FSInterface { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_MDArray_FSInterface { - // Offset: 0x00000000 Length: 0x00000260 + // Offset: 0x00000000 Length: 0x00000268 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_FSInterface { - // Offset: 0x00000000 Length: 0x00000260 + // Offset: 0x00000270 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_FSInterface { - // Offset: 0x00000268 Length: 0x0000009C + // Offset: 0x00000280 Length: 0x0000009C } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_MDArray_FSInterface { - // Offset: 0x00000268 Length: 0x0000009C + // Offset: 0x00000320 Length: 0x00000000 } .module DoNotBoxStruct_MDArray_FSInterface.exe -// MVID: {59B1920A-8279-DA45-A745-03830A92B159} +// MVID: {5BF2D3C6-8279-DA45-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F20000 +// Image base: 0x00CB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl index 8c5d6df7944..48715a6f6a4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_MDArray_FSInterface_NoExtMeth { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth { - // Offset: 0x00000000 Length: 0x0000027F + // Offset: 0x00000000 Length: 0x00000287 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth { - // Offset: 0x00000000 Length: 0x0000027F + // Offset: 0x00000290 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth { - // Offset: 0x00000288 Length: 0x000000B0 + // Offset: 0x000002A0 Length: 0x000000B0 } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth { - // Offset: 0x00000288 Length: 0x000000B0 + // Offset: 0x00000358 Length: 0x00000000 } .module DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.exe -// MVID: {59B1920A-A67D-867A-A745-03830A92B159} +// MVID: {5BF2D3C6-A67D-867A-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010C0000 +// Image base: 0x01190000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl index a0fb128556f..03e382c3731 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_NoArray_CSInterface { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_NoArray_CSInterface { - // Offset: 0x00000000 Length: 0x0000024C + // Offset: 0x00000000 Length: 0x00000254 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_CSInterface { - // Offset: 0x00000000 Length: 0x0000024C + // Offset: 0x00000258 Length: 0x00000004 } .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_CSInterface { - // Offset: 0x00000250 Length: 0x0000009C + // Offset: 0x00000260 Length: 0x0000009C } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_NoArray_CSInterface { - // Offset: 0x00000250 Length: 0x0000009C + // Offset: 0x00000300 Length: 0x00000000 } .module DoNotBoxStruct_NoArray_CSInterface.exe -// MVID: {59B1920A-5654-8082-A745-03830A92B159} +// MVID: {5BF2D3C6-5654-8082-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00B50000 +// Image base: 0x00FF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl index 9922ecfe6e6..80340df53ed 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_NoArray_FSInterface { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_NoArray_FSInterface { - // Offset: 0x00000000 Length: 0x00000250 + // Offset: 0x00000000 Length: 0x00000258 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_FSInterface { - // Offset: 0x00000000 Length: 0x00000250 + // Offset: 0x00000260 Length: 0x00000005 } .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_FSInterface { - // Offset: 0x00000258 Length: 0x0000009C + // Offset: 0x00000270 Length: 0x0000009C } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_NoArray_FSInterface { - // Offset: 0x00000258 Length: 0x0000009C + // Offset: 0x00000310 Length: 0x00000000 } .module DoNotBoxStruct_NoArray_FSInterface.exe -// MVID: {59B1920A-3F8A-B9D0-A745-03830A92B159} +// MVID: {5BF2D3C6-3F8A-B9D0-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x007B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl index b07adc90bd1..3e56ad8ce0c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_NoArray_FSInterface_NoExtMeth { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth { - // Offset: 0x00000000 Length: 0x0000026F + // Offset: 0x00000000 Length: 0x00000277 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth { - // Offset: 0x00000000 Length: 0x0000026F + // Offset: 0x00000280 Length: 0x00000005 } .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth { - // Offset: 0x00000278 Length: 0x000000B0 + // Offset: 0x00000290 Length: 0x000000B0 } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth { - // Offset: 0x00000278 Length: 0x000000B0 + // Offset: 0x00000348 Length: 0x00000000 } .module DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.exe -// MVID: {59B1920A-CD0A-F713-A745-03830A92B159} +// MVID: {5BF2D3C6-CD0A-F713-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00720000 +// Image base: 0x01350000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl index 9633b72683f..e00a55f8a86 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly DoNotBoxStruct_ToString { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.DoNotBoxStruct_ToString { - // Offset: 0x00000000 Length: 0x00000208 + // Offset: 0x00000000 Length: 0x00000210 } .mresource public FSharpSignatureDataB.DoNotBoxStruct_ToString { - // Offset: 0x00000000 Length: 0x00000208 + // Offset: 0x00000218 Length: 0x00000003 } .mresource public FSharpOptimizationData.DoNotBoxStruct_ToString { - // Offset: 0x00000210 Length: 0x00000086 + // Offset: 0x00000220 Length: 0x00000086 } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_ToString { - // Offset: 0x00000210 Length: 0x00000086 + // Offset: 0x000002B0 Length: 0x00000000 } .module DoNotBoxStruct_ToString.exe -// MVID: {59B1920A-8D34-C606-A745-03830A92B159} +// MVID: {5BF2D3C6-8D34-C606-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02CC0000 +// Image base: 0x00A80000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl index e5c0acfe08e..dc452a6def3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.GenIter01 { - // Offset: 0x00000000 Length: 0x000001FF + // Offset: 0x00000208 Length: 0x00000004 } .mresource public FSharpOptimizationData.GenIter01 { - // Offset: 0x00000208 Length: 0x0000007A + // Offset: 0x00000210 Length: 0x0000007A } .mresource public FSharpOptimizationDataB.GenIter01 { - // Offset: 0x00000208 Length: 0x0000007A + // Offset: 0x00000290 Length: 0x00000000 } .module GenIter01.exe -// MVID: {5B9A6329-F836-DC98-A745-038329639A5B} +// MVID: {5BF2D394-F836-DC98-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01080000 +// Image base: 0x011A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl index f80a7cb58b8..ad5a1a7266e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.GenIter02 { - // Offset: 0x00000000 Length: 0x00000200 + // Offset: 0x00000208 Length: 0x00000004 } .mresource public FSharpOptimizationData.GenIter02 { - // Offset: 0x00000208 Length: 0x0000007B + // Offset: 0x00000210 Length: 0x0000007B } .mresource public FSharpOptimizationDataB.GenIter02 { - // Offset: 0x00000208 Length: 0x0000007B + // Offset: 0x00000290 Length: 0x00000000 } .module GenIter02.exe -// MVID: {5B9A6329-F857-DC98-A745-038329639A5B} +// MVID: {5BF2D394-F857-DC98-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02900000 +// Image base: 0x00A50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl index 0735d6611c8..68e409afba7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.GenIter03 { - // Offset: 0x00000000 Length: 0x00000200 + // Offset: 0x00000208 Length: 0x00000004 } .mresource public FSharpOptimizationData.GenIter03 { - // Offset: 0x00000208 Length: 0x0000007B + // Offset: 0x00000210 Length: 0x0000007B } .mresource public FSharpOptimizationDataB.GenIter03 { - // Offset: 0x00000208 Length: 0x0000007B + // Offset: 0x00000290 Length: 0x00000000 } .module GenIter03.exe -// MVID: {5B9A6329-F77C-DC98-A745-038329639A5B} +// MVID: {5BF2D394-F77C-DC98-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026B0000 +// Image base: 0x00360000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl index e2b558138db..4630db812d0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.GenIter04 { - // Offset: 0x00000000 Length: 0x000001F0 + // Offset: 0x000001F8 Length: 0x00000002 } .mresource public FSharpOptimizationData.GenIter04 { - // Offset: 0x000001F8 Length: 0x0000007B + // Offset: 0x00000200 Length: 0x0000007B } .mresource public FSharpOptimizationDataB.GenIter04 { - // Offset: 0x000001F8 Length: 0x0000007B + // Offset: 0x00000280 Length: 0x00000000 } .module GenIter04.exe -// MVID: {5B9A6329-F79D-DC98-A745-038329639A5B} +// MVID: {5BF2D394-F79D-DC98-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00790000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl index 0948a1b6ddd..a04f6a6977a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly InequalityComparison01 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.InequalityComparison01 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000000 Length: 0x00000216 } .mresource public FSharpSignatureDataB.InequalityComparison01 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000220 Length: 0x00000005 } .mresource public FSharpOptimizationData.InequalityComparison01 { - // Offset: 0x00000218 Length: 0x00000085 + // Offset: 0x00000230 Length: 0x00000085 } .mresource public FSharpOptimizationDataB.InequalityComparison01 { - // Offset: 0x00000218 Length: 0x00000085 + // Offset: 0x000002C0 Length: 0x00000000 } .module InequalityComparison01.exe -// MVID: {59B19213-263A-E6D5-A745-03831392B159} +// MVID: {5BF2D394-263A-E6D5-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00A10000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl index 68a146f5353..d86598429b9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly InequalityComparison02 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.InequalityComparison02 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000000 Length: 0x00000216 } .mresource public FSharpSignatureDataB.InequalityComparison02 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000220 Length: 0x00000005 } .mresource public FSharpOptimizationData.InequalityComparison02 { - // Offset: 0x00000218 Length: 0x00000085 + // Offset: 0x00000230 Length: 0x00000085 } .mresource public FSharpOptimizationDataB.InequalityComparison02 { - // Offset: 0x00000218 Length: 0x00000085 + // Offset: 0x000002C0 Length: 0x00000000 } .module InequalityComparison02.exe -// MVID: {59B19213-263A-E72C-A745-03831392B159} +// MVID: {5BF2D394-263A-E72C-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02D40000 +// Image base: 0x00400000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl index f7adda8a1e7..789caa75905 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly InequalityComparison03 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.InequalityComparison03 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000000 Length: 0x00000216 } .mresource public FSharpSignatureDataB.InequalityComparison03 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000220 Length: 0x00000005 } .mresource public FSharpOptimizationData.InequalityComparison03 { - // Offset: 0x00000218 Length: 0x00000085 + // Offset: 0x00000230 Length: 0x00000085 } .mresource public FSharpOptimizationDataB.InequalityComparison03 { - // Offset: 0x00000218 Length: 0x00000085 + // Offset: 0x000002C0 Length: 0x00000000 } .module InequalityComparison03.exe -// MVID: {59B19213-263A-E70B-A745-03831392B159} +// MVID: {5BF2D394-263A-E70B-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x008E0000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl index 0cbfa17b14a..9bbaf7c3f5a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly InequalityComparison04 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.InequalityComparison04 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000000 Length: 0x00000216 } .mresource public FSharpSignatureDataB.InequalityComparison04 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000220 Length: 0x00000005 } .mresource public FSharpOptimizationData.InequalityComparison04 { - // Offset: 0x00000218 Length: 0x00000085 + // Offset: 0x00000230 Length: 0x00000085 } .mresource public FSharpOptimizationDataB.InequalityComparison04 { - // Offset: 0x00000218 Length: 0x00000085 + // Offset: 0x000002C0 Length: 0x00000000 } .module InequalityComparison04.exe -// MVID: {59B19213-263A-E772-A745-03831392B159} +// MVID: {5BF2D394-263A-E772-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F20000 +// Image base: 0x004F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl index cbc81a9e541..f81b86f4b1c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly InequalityComparison05 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.InequalityComparison05 { - // Offset: 0x00000000 Length: 0x00000236 + // Offset: 0x00000000 Length: 0x0000023E } .mresource public FSharpSignatureDataB.InequalityComparison05 { - // Offset: 0x00000000 Length: 0x00000236 + // Offset: 0x00000248 Length: 0x00000009 } .mresource public FSharpOptimizationData.InequalityComparison05 { - // Offset: 0x00000240 Length: 0x00000085 + // Offset: 0x00000258 Length: 0x00000085 } .mresource public FSharpOptimizationDataB.InequalityComparison05 { - // Offset: 0x00000240 Length: 0x00000085 + // Offset: 0x000002E8 Length: 0x00000000 } .module InequalityComparison05.exe -// MVID: {59B19213-263A-E751-A745-03831392B159} +// MVID: {5BF2D394-263A-E751-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x001D0000 +// Image base: 0x00C60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl index ada744db27d..332b58beb5a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ListExpressionSteppingTest1 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.ListExpressionSteppingTest1 { - // Offset: 0x00000000 Length: 0x0000026D + // Offset: 0x00000000 Length: 0x00000275 } .mresource public FSharpSignatureDataB.ListExpressionSteppingTest1 { - // Offset: 0x00000000 Length: 0x0000026D + // Offset: 0x00000280 Length: 0x00000004 } .mresource public FSharpOptimizationData.ListExpressionSteppingTest1 { - // Offset: 0x00000278 Length: 0x000000AF + // Offset: 0x00000288 Length: 0x000000AF } .mresource public FSharpOptimizationDataB.ListExpressionSteppingTest1 { - // Offset: 0x00000278 Length: 0x000000AF + // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest1.exe -// MVID: {59B1920C-50CF-F6CE-A745-03830C92B159} +// MVID: {5BF2D41C-50CF-F6CE-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x030B0000 +// Image base: 0x02BD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl index 7f6b2b12d28..23e2bb4bf3f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ListExpressionSteppingTest2 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.ListExpressionSteppingTest2 { - // Offset: 0x00000000 Length: 0x0000026D + // Offset: 0x00000000 Length: 0x00000275 } .mresource public FSharpSignatureDataB.ListExpressionSteppingTest2 { - // Offset: 0x00000000 Length: 0x0000026D + // Offset: 0x00000280 Length: 0x00000004 } .mresource public FSharpOptimizationData.ListExpressionSteppingTest2 { - // Offset: 0x00000278 Length: 0x000000AF + // Offset: 0x00000288 Length: 0x000000AF } .mresource public FSharpOptimizationDataB.ListExpressionSteppingTest2 { - // Offset: 0x00000278 Length: 0x000000AF + // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest2.exe -// MVID: {59B1920C-D3DE-B780-A745-03830C92B159} +// MVID: {5BF2D41C-D3DE-B780-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00690000 +// Image base: 0x00350000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl index 940297b40a6..a852f25beeb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ListExpressionSteppingTest3 { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.ListExpressionSteppingTest3 { - // Offset: 0x00000000 Length: 0x0000027D + // Offset: 0x00000000 Length: 0x00000285 } .mresource public FSharpSignatureDataB.ListExpressionSteppingTest3 { - // Offset: 0x00000000 Length: 0x0000027D + // Offset: 0x00000290 Length: 0x00000005 } .mresource public FSharpOptimizationData.ListExpressionSteppingTest3 { - // Offset: 0x00000288 Length: 0x000000AF + // Offset: 0x000002A0 Length: 0x000000AF } .mresource public FSharpOptimizationDataB.ListExpressionSteppingTest3 { - // Offset: 0x00000288 Length: 0x000000AF + // Offset: 0x00000358 Length: 0x00000000 } .module ListExpressionSteppingTest3.exe -// MVID: {59B1920C-AE45-39B4-A745-03830C92B159} +// MVID: {5BF2D41C-AE45-39B4-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FF0000 +// Image base: 0x01920000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl index faddbda478d..cb3c9ba45f0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.ListExpressionSteppingTest4 { - // Offset: 0x00000000 Length: 0x00000275 + // Offset: 0x00000280 Length: 0x00000004 } .mresource public FSharpOptimizationData.ListExpressionSteppingTest4 { - // Offset: 0x00000280 Length: 0x000000AF + // Offset: 0x00000288 Length: 0x000000AF } .mresource public FSharpOptimizationDataB.ListExpressionSteppingTest4 { - // Offset: 0x00000280 Length: 0x000000AF + // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest4.exe -// MVID: {5B9A68C1-3154-FA67-A745-0383C1689A5B} +// MVID: {5BF2D41C-3154-FA67-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018D0000 +// Image base: 0x01780000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl index 1f60ff94fb3..8119583b909 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.ListExpressionSteppingTest5 { - // Offset: 0x00000000 Length: 0x00000275 + // Offset: 0x00000280 Length: 0x00000004 } .mresource public FSharpOptimizationData.ListExpressionSteppingTest5 { - // Offset: 0x00000280 Length: 0x000000AF + // Offset: 0x00000288 Length: 0x000000AF } .mresource public FSharpOptimizationDataB.ListExpressionSteppingTest5 { - // Offset: 0x00000280 Length: 0x000000AF + // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest5.exe -// MVID: {5B9A6329-CBE3-BFEA-A745-038329639A5B} +// MVID: {5BF2D41C-CBE3-BFEA-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x027C0000 +// Image base: 0x013B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl index b04d8739fc4..ec33ea70a4d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.ListExpressionSteppingTest6 { - // Offset: 0x00000000 Length: 0x0000029D + // Offset: 0x000002A8 Length: 0x00000006 } .mresource public FSharpOptimizationData.ListExpressionSteppingTest6 { - // Offset: 0x000002A8 Length: 0x000000BC + // Offset: 0x000002B8 Length: 0x000000BC } .mresource public FSharpOptimizationDataB.ListExpressionSteppingTest6 { - // Offset: 0x000002A8 Length: 0x000000BC + // Offset: 0x00000378 Length: 0x00000000 } .module ListExpressionSteppingTest6.exe -// MVID: {5B9A6329-98A2-AB14-A745-038329639A5B} +// MVID: {5BF2D41C-98A2-AB14-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007B0000 +// Image base: 0x01170000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl index 67b7da406d1..42bbef35de3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl @@ -1,5 +1,6 @@ -// Microsoft (R) .NET Framework IL Disassembler. Version 4.5.22220.0 +// Microsoft (R) .NET Framework IL Disassembler. Version 4.6.1055.0 +// Copyright (c) Microsoft Corporation. All rights reserved. @@ -12,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly LiteralValue { @@ -28,32 +29,28 @@ } .mresource public FSharpSignatureData.LiteralValue { - // Offset: 0x00000000 Length: 0x00000274 - // WARNING: managed resource file FSharpSignatureData.test created + // Offset: 0x00000000 Length: 0x00000287 } .mresource public FSharpSignatureDataB.LiteralValue { - // Offset: 0x00000000 Length: 0x00000274 - // WARNING: managed resource file FSharpSignatureData.test created + // Offset: 0x00000290 Length: 0x0000000B } .mresource public FSharpOptimizationData.LiteralValue { - // Offset: 0x00000278 Length: 0x0000006F - // WARNING: managed resource file FSharpOptimizationData.test created + // Offset: 0x000002A0 Length: 0x0000007F } .mresource public FSharpOptimizationDataB.LiteralValue { - // Offset: 0x00000278 Length: 0x0000006F - // WARNING: managed resource file FSharpOptimizationData.test created + // Offset: 0x00000328 Length: 0x00000000 } .module LiteralValue.exe - // MVID: {5AA663EB-D9C1-2E4E-A745-0383EB63A65A} +// MVID: {5BF2D41C-196E-5E7E-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02BF0000 +// Image base: 0x01320000 // =============== CLASS MEMBERS DECLARATION =================== @@ -72,7 +69,7 @@ // Code size 2 (0x2) .maxstack 8 .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 6,6 : 5,6 'D:\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\LiteralValue\\LiteralValue.fs' + .line 6,6 : 5,6 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\LiteralValue\\LiteralValue.fs' IL_0000: ldc.i4.0 IL_0001: ret } // end of method LiteralValue::main @@ -82,10 +79,9 @@ .class private abstract auto ansi sealed ''.$LiteralValue extends [mscorlib]System.Object { -} // end of class ''.$LiteralValue +} // end of class ''.$LiteralValue // ============================================================= // *********** DISASSEMBLY COMPLETE *********************** -// WARNING: Created Win32 resource file test.res diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl index 45024abf01c..fa4dd93d325 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplAttribute.AggressiveInlining { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.MethodImplAttribute.AggressiveInlining { - // Offset: 0x00000000 Length: 0x0000034C + // Offset: 0x00000000 Length: 0x00000354 } .mresource public FSharpSignatureDataB.MethodImplAttribute.AggressiveInlining { - // Offset: 0x00000000 Length: 0x0000034C + // Offset: 0x00000358 Length: 0x00000007 } .mresource public FSharpOptimizationData.MethodImplAttribute.AggressiveInlining { - // Offset: 0x00000350 Length: 0x00000085 + // Offset: 0x00000368 Length: 0x00000085 } .mresource public FSharpOptimizationDataB.MethodImplAttribute.AggressiveInlining { - // Offset: 0x00000350 Length: 0x00000085 + // Offset: 0x000003F8 Length: 0x00000000 } .module MethodImplAttribute.AggressiveInlining.dll -// MVID: {59B1920C-66DC-14D3-A745-03830C92B159} +// MVID: {5BF2D41C-66DC-14D3-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02B20000 +// Image base: 0x03090000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl index f3cf851e8c8..da2d4716dba 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplAttribute.ForwardRef { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.MethodImplAttribute.ForwardRef { - // Offset: 0x00000000 Length: 0x00000331 + // Offset: 0x00000000 Length: 0x00000339 } .mresource public FSharpSignatureDataB.MethodImplAttribute.ForwardRef { - // Offset: 0x00000000 Length: 0x00000331 + // Offset: 0x00000340 Length: 0x00000007 } .mresource public FSharpOptimizationData.MethodImplAttribute.ForwardRef { - // Offset: 0x00000338 Length: 0x0000007D + // Offset: 0x00000350 Length: 0x0000007D } .mresource public FSharpOptimizationDataB.MethodImplAttribute.ForwardRef { - // Offset: 0x00000338 Length: 0x0000007D + // Offset: 0x000003D8 Length: 0x00000000 } .module MethodImplAttribute.ForwardRef.dll -// MVID: {59B1920C-C517-03FF-A745-03830C92B159} +// MVID: {5BF2D41C-C517-03FF-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x009C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl index f8536869181..7626aef4abe 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplAttribute.InternalCall { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.MethodImplAttribute.InternalCall { - // Offset: 0x00000000 Length: 0x00000339 + // Offset: 0x00000000 Length: 0x00000341 } .mresource public FSharpSignatureDataB.MethodImplAttribute.InternalCall { - // Offset: 0x00000000 Length: 0x00000339 + // Offset: 0x00000348 Length: 0x00000007 } .mresource public FSharpOptimizationData.MethodImplAttribute.InternalCall { - // Offset: 0x00000340 Length: 0x0000007F + // Offset: 0x00000358 Length: 0x0000007F } .mresource public FSharpOptimizationDataB.MethodImplAttribute.InternalCall { - // Offset: 0x00000340 Length: 0x0000007F + // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.InternalCall.dll -// MVID: {59B1920C-FBF7-6A35-A745-03830C92B159} +// MVID: {5BF2D41C-FBF7-6A35-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x015B0000 +// Image base: 0x00A70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl index 234cc48cf54..822aebf1c39 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplAttribute.NoInlining { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.MethodImplAttribute.NoInlining { - // Offset: 0x00000000 Length: 0x00000331 + // Offset: 0x00000000 Length: 0x00000339 } .mresource public FSharpSignatureDataB.MethodImplAttribute.NoInlining { - // Offset: 0x00000000 Length: 0x00000331 + // Offset: 0x00000340 Length: 0x00000007 } .mresource public FSharpOptimizationData.MethodImplAttribute.NoInlining { - // Offset: 0x00000338 Length: 0x0000007D + // Offset: 0x00000350 Length: 0x0000007D } .mresource public FSharpOptimizationDataB.MethodImplAttribute.NoInlining { - // Offset: 0x00000338 Length: 0x0000007D + // Offset: 0x000003D8 Length: 0x00000000 } .module MethodImplAttribute.NoInlining.dll -// MVID: {59B1920C-F47B-58B3-A745-03830C92B159} +// MVID: {5BF2D41C-F47B-58B3-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012B0000 +// Image base: 0x011C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl index 321058fbefa..41a0adfc724 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplAttribute.NoOptimization { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.MethodImplAttribute.NoOptimization { - // Offset: 0x00000000 Length: 0x0000033D + // Offset: 0x00000000 Length: 0x00000345 } .mresource public FSharpSignatureDataB.MethodImplAttribute.NoOptimization { - // Offset: 0x00000000 Length: 0x0000033D + // Offset: 0x00000350 Length: 0x00000007 } .mresource public FSharpOptimizationData.MethodImplAttribute.NoOptimization { - // Offset: 0x00000348 Length: 0x00000081 + // Offset: 0x00000360 Length: 0x00000081 } .mresource public FSharpOptimizationDataB.MethodImplAttribute.NoOptimization { - // Offset: 0x00000348 Length: 0x00000081 + // Offset: 0x000003E8 Length: 0x00000000 } .module MethodImplAttribute.NoOptimization.dll -// MVID: {59B1920C-D394-5177-A745-03830C92B159} +// MVID: {5BF2D41C-D394-5177-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x006A0000 +// Image base: 0x00C20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl index 3b0eac55f15..1c58b648d11 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplAttribute.PreserveSig { @@ -29,28 +29,28 @@ } .mresource public FSharpSignatureData.MethodImplAttribute.PreserveSig { - // Offset: 0x00000000 Length: 0x00000336 + // Offset: 0x00000000 Length: 0x0000033E } .mresource public FSharpSignatureDataB.MethodImplAttribute.PreserveSig { - // Offset: 0x00000000 Length: 0x00000336 + // Offset: 0x00000348 Length: 0x00000007 } .mresource public FSharpOptimizationData.MethodImplAttribute.PreserveSig { - // Offset: 0x00000340 Length: 0x0000007E + // Offset: 0x00000358 Length: 0x0000007E } .mresource public FSharpOptimizationDataB.MethodImplAttribute.PreserveSig { - // Offset: 0x00000340 Length: 0x0000007E + // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.PreserveSig.dll -// MVID: {59B1920C-0C64-31CC-A745-03830C92B159} +// MVID: {5BF2D41C-0C64-31CC-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D30000 +// Image base: 0x02680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl index 4fbf40b8d9e..1de884d19c2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplAttribute.Synchronized { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.MethodImplAttribute.Synchronized { - // Offset: 0x00000000 Length: 0x00000337 + // Offset: 0x00000000 Length: 0x0000033F +} +.mresource public FSharpSignatureDataB.MethodImplAttribute.Synchronized +{ + // Offset: 0x00000348 Length: 0x00000007 } .mresource public FSharpOptimizationData.MethodImplAttribute.Synchronized { - // Offset: 0x00000340 Length: 0x0000007F + // Offset: 0x00000358 Length: 0x0000007F +} +.mresource public FSharpOptimizationDataB.MethodImplAttribute.Synchronized +{ + // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.Synchronized.dll -// MVID: {59B1920C-D8F1-2CC7-A745-03830C92B159} +// MVID: {5BF2D41C-D8F1-2CC7-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x01230000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl index 15db6ae085e..94242cd3740 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplAttribute.Unmanaged { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.MethodImplAttribute.Unmanaged { - // Offset: 0x00000000 Length: 0x0000032E + // Offset: 0x00000000 Length: 0x00000336 +} +.mresource public FSharpSignatureDataB.MethodImplAttribute.Unmanaged +{ + // Offset: 0x00000340 Length: 0x00000007 } .mresource public FSharpOptimizationData.MethodImplAttribute.Unmanaged { - // Offset: 0x00000338 Length: 0x0000007C + // Offset: 0x00000350 Length: 0x0000007C +} +.mresource public FSharpOptimizationDataB.MethodImplAttribute.Unmanaged +{ + // Offset: 0x000003D0 Length: 0x00000000 } .module MethodImplAttribute.Unmanaged.dll -// MVID: {59B1920C-FF34-309C-A745-03830C92B159} +// MVID: {5BF2D41C-FF34-309C-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013D0000 +// Image base: 0x017F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl index 0bae910d0f1..798af0b18cd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly AbstractClass { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.AbstractClass { - // Offset: 0x00000000 Length: 0x00000306 + // Offset: 0x00000000 Length: 0x0000030E +} +.mresource public FSharpSignatureDataB.AbstractClass +{ + // Offset: 0x00000318 Length: 0x00000015 } .mresource public FSharpOptimizationData.AbstractClass { - // Offset: 0x00000310 Length: 0x000000B1 + // Offset: 0x00000338 Length: 0x000000B1 +} +.mresource public FSharpOptimizationDataB.AbstractClass +{ + // Offset: 0x000003F0 Length: 0x00000003 } .module AbstractClass.exe -// MVID: {59B19213-333C-8BAF-A745-03831392B159} +// MVID: {5BF2D41C-333C-8BAF-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010A0000 +// Image base: 0x00F90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl index dcaa46948ee..50fa87b24da 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ArgumentNamesInClosures01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ArgumentNamesInClosures01 { - // Offset: 0x00000000 Length: 0x0000039F + // Offset: 0x00000000 Length: 0x000003A7 +} +.mresource public FSharpSignatureDataB.ArgumentNamesInClosures01 +{ + // Offset: 0x000003B0 Length: 0x00000021 } .mresource public FSharpOptimizationData.ArgumentNamesInClosures01 { - // Offset: 0x000003A8 Length: 0x0000010D + // Offset: 0x000003D8 Length: 0x0000010D +} +.mresource public FSharpOptimizationDataB.ArgumentNamesInClosures01 +{ + // Offset: 0x000004F0 Length: 0x0000000F } .module ArgumentNamesInClosures01.dll -// MVID: {59B19213-39CA-41B5-A745-03831392B159} +// MVID: {5BF2D41C-39CA-41B5-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02A00000 +// Image base: 0x007B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl index 6fab8d600ef..f6a7d5be66c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CodeGenRenamings01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.CodeGenRenamings01 { - // Offset: 0x00000000 Length: 0x000003CC + // Offset: 0x00000000 Length: 0x000003D4 +} +.mresource public FSharpSignatureDataB.CodeGenRenamings01 +{ + // Offset: 0x000003D8 Length: 0x00000019 } .mresource public FSharpOptimizationData.CodeGenRenamings01 { - // Offset: 0x000003D0 Length: 0x0000011B + // Offset: 0x000003F8 Length: 0x0000011B +} +.mresource public FSharpOptimizationDataB.CodeGenRenamings01 +{ + // Offset: 0x00000518 Length: 0x00000000 } .module CodeGenRenamings01.exe -// MVID: {59B19213-8173-986B-A745-03831392B159} +// MVID: {5BF2D41C-8173-986B-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010A0000 +// Image base: 0x028F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl index 63d76598150..67962e2a16e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly CustomAttributeGenericParameter01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.CustomAttributeGenericParameter01 { - // Offset: 0x00000000 Length: 0x000002C2 + // Offset: 0x00000000 Length: 0x000002CA +} +.mresource public FSharpSignatureDataB.CustomAttributeGenericParameter01 +{ + // Offset: 0x000002D0 Length: 0x00000005 } .mresource public FSharpOptimizationData.CustomAttributeGenericParameter01 { - // Offset: 0x000002C8 Length: 0x0000007A + // Offset: 0x000002E0 Length: 0x0000007A +} +.mresource public FSharpOptimizationDataB.CustomAttributeGenericParameter01 +{ + // Offset: 0x00000360 Length: 0x00000000 } .module CustomAttributeGenericParameter01.exe -// MVID: {59B19213-F08A-F524-A745-03831392B159} +// MVID: {5BF2D41C-F08A-F524-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x001D0000 +// Image base: 0x00AF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl index d4e75ea07e1..b2540491e79 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Decimal01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Decimal01 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Decimal01 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Decimal01 { - // Offset: 0x00000148 Length: 0x00000050 + // Offset: 0x00000158 Length: 0x00000050 +} +.mresource public FSharpOptimizationDataB.Decimal01 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Decimal01.exe -// MVID: {59B19213-F150-FA46-A745-03831392B159} +// MVID: {5BF2D41C-F150-FA46-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00A80000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl index 4768f783d4c..e5b917f8bc6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly EntryPoint01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.EntryPoint01 { - // Offset: 0x00000000 Length: 0x00000253 + // Offset: 0x00000000 Length: 0x0000025B +} +.mresource public FSharpSignatureDataB.EntryPoint01 +{ + // Offset: 0x00000260 Length: 0x00000008 } .mresource public FSharpOptimizationData.EntryPoint01 { - // Offset: 0x00000258 Length: 0x00000090 + // Offset: 0x00000270 Length: 0x00000090 +} +.mresource public FSharpOptimizationDataB.EntryPoint01 +{ + // Offset: 0x00000308 Length: 0x00000000 } .module EntryPoint01.exe -// MVID: {59B19213-9846-72C1-A745-03831392B159} +// MVID: {5BF2D41C-9846-72C1-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x03180000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl index 5d270545498..2033f001e51 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly EqualsOnUnions01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.EqualsOnUnions01 { - // Offset: 0x00000000 Length: 0x0000064B + // Offset: 0x00000000 Length: 0x0000063F +} +.mresource public FSharpSignatureDataB.EqualsOnUnions01 +{ + // Offset: 0x00000648 Length: 0x00000079 } .mresource public FSharpOptimizationData.EqualsOnUnions01 { - // Offset: 0x00000650 Length: 0x000001C7 + // Offset: 0x000006C8 Length: 0x000001C7 +} +.mresource public FSharpOptimizationDataB.EqualsOnUnions01 +{ + // Offset: 0x00000898 Length: 0x0000002A } .module EqualsOnUnions01.exe -// MVID: {59B19213-BBFB-14A0-A745-03831392B159} +// MVID: {5BF2D41C-BBFB-14A0-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01350000 +// Image base: 0x00480000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl index 0f5a2183244..7a351fdec57 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ForLoop01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ForLoop01 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.ForLoop01 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.ForLoop01 { - // Offset: 0x00000148 Length: 0x00000050 + // Offset: 0x00000158 Length: 0x00000050 +} +.mresource public FSharpOptimizationDataB.ForLoop01 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module ForLoop01.exe -// MVID: {59B19213-1795-791C-A745-03831392B159} +// MVID: {5BF2D41C-1795-791C-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00FE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl index f54c8480177..252b445706a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ForLoop02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ForLoop02 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.ForLoop02 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.ForLoop02 { - // Offset: 0x00000148 Length: 0x00000050 + // Offset: 0x00000158 Length: 0x00000050 +} +.mresource public FSharpOptimizationDataB.ForLoop02 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module ForLoop02.exe -// MVID: {59B19213-1736-791C-A745-03831392B159} +// MVID: {5BF2D41C-1736-791C-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03030000 +// Image base: 0x013C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl index e6fda0879b7..e93a5bcdf92 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ForLoop03 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ForLoop03 { - // Offset: 0x00000000 Length: 0x000001FA + // Offset: 0x00000000 Length: 0x00000202 +} +.mresource public FSharpSignatureDataB.ForLoop03 +{ + // Offset: 0x00000208 Length: 0x00000005 } .mresource public FSharpOptimizationData.ForLoop03 { - // Offset: 0x00000200 Length: 0x0000007B + // Offset: 0x00000218 Length: 0x0000007B +} +.mresource public FSharpOptimizationDataB.ForLoop03 +{ + // Offset: 0x00000298 Length: 0x00000000 } .module ForLoop03.exe -// MVID: {59B19213-1757-791C-A745-03831392B159} +// MVID: {5BF2D41C-1757-791C-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x017F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl index eca246c526b..1177eb51d7f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly GeneralizationOnUnions01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.GeneralizationOnUnions01 { - // Offset: 0x00000000 Length: 0x00000699 + // Offset: 0x00000000 Length: 0x0000068D +} +.mresource public FSharpSignatureDataB.GeneralizationOnUnions01 +{ + // Offset: 0x00000698 Length: 0x0000007D } .mresource public FSharpOptimizationData.GeneralizationOnUnions01 { - // Offset: 0x000006A0 Length: 0x000001F4 + // Offset: 0x00000720 Length: 0x000001F4 +} +.mresource public FSharpOptimizationDataB.GeneralizationOnUnions01 +{ + // Offset: 0x00000918 Length: 0x0000002A } .module GeneralizationOnUnions01.exe -// MVID: {59B19213-4CA2-8CD1-A745-03831392B159} +// MVID: {5BF2D41C-4CA2-8CD1-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x014C0000 +// Image base: 0x015C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl index 0715db93d79..c7f4c2bd652 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly GenericTypeStaticField01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.GenericTypeStaticField01 { - // Offset: 0x00000000 Length: 0x00000608 + // Offset: 0x00000000 Length: 0x00000610 +} +.mresource public FSharpSignatureDataB.GenericTypeStaticField01 +{ + // Offset: 0x00000618 Length: 0x00000037 } .mresource public FSharpOptimizationData.GenericTypeStaticField01 { - // Offset: 0x00000610 Length: 0x000001E7 + // Offset: 0x00000658 Length: 0x000001E7 +} +.mresource public FSharpOptimizationDataB.GenericTypeStaticField01 +{ + // Offset: 0x00000848 Length: 0x00000012 } .module GenericTypeStaticField01.exe -// MVID: {59B19213-1E75-7E6B-A745-03831392B159} +// MVID: {5BF2D41C-1E75-7E6B-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00730000 +// Image base: 0x018F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl index 3505d4f8e23..f77f16851b5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly IfThenElse01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.IfThenElse01 { - // Offset: 0x00000000 Length: 0x00000201 + // Offset: 0x00000000 Length: 0x00000209 +} +.mresource public FSharpSignatureDataB.IfThenElse01 +{ + // Offset: 0x00000210 Length: 0x00000003 } .mresource public FSharpOptimizationData.IfThenElse01 { - // Offset: 0x00000208 Length: 0x00000092 + // Offset: 0x00000218 Length: 0x00000092 +} +.mresource public FSharpOptimizationDataB.IfThenElse01 +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module IfThenElse01.dll -// MVID: {59B19213-2D6C-0B5D-A745-03831392B159} +// MVID: {5BF2D41C-2D6C-0B5D-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BD0000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl index 8c6ee74160d..acbf6b974fd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly LetIfThenElse01 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x000001E5 } +.mresource public FSharpSignatureDataB.LetIfThenElse01 +{ + // Offset: 0x000001F0 Length: 0x00000006 +} .mresource public FSharpOptimizationData.LetIfThenElse01 { - // Offset: 0x000001F0 Length: 0x00000076 + // Offset: 0x00000200 Length: 0x00000076 +} +.mresource public FSharpOptimizationDataB.LetIfThenElse01 +{ + // Offset: 0x00000280 Length: 0x00000000 } .module LetIfThenElse01.exe -// MVID: {59B19213-BE5A-D8FD-A745-03831392B159} +// MVID: {5BF2D41C-BE5A-D8FD-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02940000 +// Image base: 0x02F00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl index 641008a218f..7e869e28b4f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Lock01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Lock01 { - // Offset: 0x00000000 Length: 0x00000184 + // Offset: 0x00000000 Length: 0x0000018C +} +.mresource public FSharpSignatureDataB.Lock01 +{ + // Offset: 0x00000190 Length: 0x00000001 } .mresource public FSharpOptimizationData.Lock01 { - // Offset: 0x00000188 Length: 0x00000064 + // Offset: 0x00000198 Length: 0x00000064 +} +.mresource public FSharpOptimizationDataB.Lock01 +{ + // Offset: 0x00000200 Length: 0x00000000 } .module Lock01.exe -// MVID: {59B19213-2BCA-B308-A745-03831392B159} +// MVID: {5BF2D41C-2BCA-B308-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02FB0000 +// Image base: 0x03090000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl index a4ee5c51231..a4aa325797b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Marshal { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Marshal { - // Offset: 0x00000000 Length: 0x0000050B + // Offset: 0x00000000 Length: 0x00000513 +} +.mresource public FSharpSignatureDataB.Marshal +{ + // Offset: 0x00000518 Length: 0x00000025 } .mresource public FSharpOptimizationData.Marshal { - // Offset: 0x00000510 Length: 0x0000004E + // Offset: 0x00000548 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Marshal +{ + // Offset: 0x000005A0 Length: 0x00000000 } .module Marshal.exe -// MVID: {59B19213-7500-369C-A745-03831392B159} +// MVID: {5BF2D41C-7500-369C-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01080000 +// Image base: 0x00750000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl index 9a2538f734d..b4ddb94b435 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplNoInline { @@ -25,20 +25,28 @@ } .mresource public FSharpSignatureData.MethodImplNoInline { - // Offset: 0x00000000 Length: 0x000002FF + // Offset: 0x00000000 Length: 0x00000307 +} +.mresource public FSharpSignatureDataB.MethodImplNoInline +{ + // Offset: 0x00000310 Length: 0x00000008 } .mresource public FSharpOptimizationData.MethodImplNoInline { - // Offset: 0x00000308 Length: 0x000000F5 + // Offset: 0x00000320 Length: 0x000000F5 +} +.mresource public FSharpOptimizationDataB.MethodImplNoInline +{ + // Offset: 0x00000420 Length: 0x00000009 } .module MethodImplNoInline.exe -// MVID: {59B19213-4480-09E2-A745-03831392B159} +// MVID: {5BF2D41C-4480-09E2-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D80000 +// Image base: 0x02980000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl index 784e3d51a37..ead351cf35b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly MethodImplNoInline02 { @@ -25,20 +25,28 @@ } .mresource public FSharpSignatureData.MethodImplNoInline02 { - // Offset: 0x00000000 Length: 0x00000305 + // Offset: 0x00000000 Length: 0x0000030D +} +.mresource public FSharpSignatureDataB.MethodImplNoInline02 +{ + // Offset: 0x00000318 Length: 0x00000008 } .mresource public FSharpOptimizationData.MethodImplNoInline02 { - // Offset: 0x00000310 Length: 0x000000F9 + // Offset: 0x00000328 Length: 0x000000F9 +} +.mresource public FSharpOptimizationDataB.MethodImplNoInline02 +{ + // Offset: 0x00000428 Length: 0x00000009 } .module MethodImplNoInline02.exe -// MVID: {59B19213-084F-1A8E-A745-03831392B159} +// MVID: {5BF2D41C-084F-1A8E-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012C0000 +// Image base: 0x014C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl index 479fa38706d..44c856dae9c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ModuleWithExpression01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ModuleWithExpression01 { - // Offset: 0x00000000 Length: 0x0000020E + // Offset: 0x00000000 Length: 0x00000216 +} +.mresource public FSharpSignatureDataB.ModuleWithExpression01 +{ + // Offset: 0x00000220 Length: 0x00000001 } .mresource public FSharpOptimizationData.ModuleWithExpression01 { - // Offset: 0x00000218 Length: 0x000000A6 + // Offset: 0x00000228 Length: 0x000000A6 +} +.mresource public FSharpOptimizationDataB.ModuleWithExpression01 +{ + // Offset: 0x000002D8 Length: 0x00000000 } .module ModuleWithExpression01.exe -// MVID: {59B19213-CD1E-A8B4-A745-03831392B159} +// MVID: {5BF2D41C-CD1E-A8B4-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x030A0000 +// Image base: 0x02D70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl index 2e111b971f8..53808635c17 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly NoBoxingOnDispose01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.NoBoxingOnDispose01 { - // Offset: 0x00000000 Length: 0x0000021A + // Offset: 0x00000000 Length: 0x00000222 +} +.mresource public FSharpSignatureDataB.NoBoxingOnDispose01 +{ + // Offset: 0x00000228 Length: 0x00000004 } .mresource public FSharpOptimizationData.NoBoxingOnDispose01 { - // Offset: 0x00000220 Length: 0x0000007F + // Offset: 0x00000230 Length: 0x0000007F +} +.mresource public FSharpOptimizationDataB.NoBoxingOnDispose01 +{ + // Offset: 0x000002B8 Length: 0x00000000 } .module NoBoxingOnDispose01.exe -// MVID: {59B19213-4EA9-C934-A745-03831392B159} +// MVID: {5BF2D41C-4EA9-C934-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00590000 +// Image base: 0x01530000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl index 5209960dc5f..408a0ad0123 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly NonEscapingArguments02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.NonEscapingArguments02 { - // Offset: 0x00000000 Length: 0x00000359 + // Offset: 0x00000000 Length: 0x00000361 +} +.mresource public FSharpSignatureDataB.NonEscapingArguments02 +{ + // Offset: 0x00000368 Length: 0x00000017 } .mresource public FSharpOptimizationData.NonEscapingArguments02 { - // Offset: 0x00000360 Length: 0x000001A4 + // Offset: 0x00000388 Length: 0x000001A4 +} +.mresource public FSharpOptimizationDataB.NonEscapingArguments02 +{ + // Offset: 0x00000530 Length: 0x0000000B } .module NonEscapingArguments02.dll -// MVID: {59B19213-BB56-6582-A745-03831392B159} +// MVID: {5BF2D41C-BB56-6582-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01730000 +// Image base: 0x018F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl index 5a8b4ef3b76..dfb8f4cb56a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly PreserveSig { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.PreserveSig { - // Offset: 0x00000000 Length: 0x000002F5 + // Offset: 0x00000000 Length: 0x000002FD +} +.mresource public FSharpSignatureDataB.PreserveSig +{ + // Offset: 0x00000308 Length: 0x0000000F } .mresource public FSharpOptimizationData.PreserveSig { - // Offset: 0x00000300 Length: 0x0000004A + // Offset: 0x00000320 Length: 0x0000004A +} +.mresource public FSharpOptimizationDataB.PreserveSig +{ + // Offset: 0x00000370 Length: 0x00000000 } .module PreserveSig.dll -// MVID: {59B19213-E8CC-64FE-A745-03831392B159} +// MVID: {5BF2D41C-E8CC-64FE-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01660000 +// Image base: 0x00700000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl index 5ccceb26460..1e861263a2e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Seq_for_all01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Seq_for_all01 { - // Offset: 0x00000000 Length: 0x000001AB + // Offset: 0x00000000 Length: 0x000001B3 +} +.mresource public FSharpSignatureDataB.Seq_for_all01 +{ + // Offset: 0x000001B8 Length: 0x00000001 } .mresource public FSharpOptimizationData.Seq_for_all01 { - // Offset: 0x000001B0 Length: 0x00000072 + // Offset: 0x000001C0 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.Seq_for_all01 +{ + // Offset: 0x00000238 Length: 0x00000000 } .module Seq_for_all01.exe -// MVID: {59B19213-D30D-BA80-A745-03831392B159} +// MVID: {5BF2D41C-D30D-BA80-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02A60000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl index b3476b282f7..cc2c154d820 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Structs01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Structs01 { - // Offset: 0x00000000 Length: 0x0000074D + // Offset: 0x00000000 Length: 0x00000741 +} +.mresource public FSharpSignatureDataB.Structs01 +{ + // Offset: 0x00000748 Length: 0x00000091 } .mresource public FSharpOptimizationData.Structs01 { - // Offset: 0x00000758 Length: 0x00000231 + // Offset: 0x000007E0 Length: 0x00000231 +} +.mresource public FSharpOptimizationDataB.Structs01 +{ + // Offset: 0x00000A18 Length: 0x00000035 } .module Structs01.exe -// MVID: {59B19213-701F-5E27-A745-03831392B159} +// MVID: {5BF2D41C-701F-5E27-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01470000 +// Image base: 0x02D30000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl index dc002382e1d..029876acee3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Structs02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Structs02 { - // Offset: 0x00000000 Length: 0x00000787 + // Offset: 0x00000000 Length: 0x0000077B +} +.mresource public FSharpSignatureDataB.Structs02 +{ + // Offset: 0x00000780 Length: 0x00000094 } .mresource public FSharpOptimizationData.Structs02 { - // Offset: 0x00000790 Length: 0x00000237 + // Offset: 0x00000818 Length: 0x00000237 +} +.mresource public FSharpOptimizationDataB.Structs02 +{ + // Offset: 0x00000A58 Length: 0x00000035 } .module Structs02.exe -// MVID: {59B19213-7040-5E27-A745-03831392B159} +// MVID: {5BF2D41C-7040-5E27-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x00960000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl index e3e7795ebd4..55f35d4bafb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly StructsAsArrayElements01 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000758 } +.mresource public FSharpSignatureDataB.StructsAsArrayElements01 +{ + // Offset: 0x00000760 Length: 0x00000099 +} .mresource public FSharpOptimizationData.StructsAsArrayElements01 { - // Offset: 0x00000760 Length: 0x0000022C + // Offset: 0x00000800 Length: 0x0000022C +} +.mresource public FSharpOptimizationDataB.StructsAsArrayElements01 +{ + // Offset: 0x00000A30 Length: 0x00000038 } .module StructsAsArrayElements01.dll -// MVID: {5B17FC4F-29F3-6E68-A745-03834FFC175B} +// MVID: {5BF2D41C-29F3-6E68-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00E30000 +// Image base: 0x00810000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl index 63da7e6e404..f47dc3101b8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TryWith_NoFilterBlocks01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TryWith_NoFilterBlocks01 { - // Offset: 0x00000000 Length: 0x0000015D + // Offset: 0x00000000 Length: 0x00000165 +} +.mresource public FSharpSignatureDataB.TryWith_NoFilterBlocks01 +{ + // Offset: 0x00000170 Length: 0x00000000 } .mresource public FSharpOptimizationData.TryWith_NoFilterBlocks01 { - // Offset: 0x00000168 Length: 0x0000005F + // Offset: 0x00000178 Length: 0x0000005F +} +.mresource public FSharpOptimizationDataB.TryWith_NoFilterBlocks01 +{ + // Offset: 0x000001E0 Length: 0x00000000 } .module TryWith_NoFilterBlocks01.exe -// MVID: {59B19213-3DEF-9A40-A745-03831392B159} +// MVID: {5BF2D41C-3DEF-9A40-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017A0000 +// Image base: 0x00690000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl index 5f937b00b51..a88cd1bafdc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly extern cas { @@ -36,20 +36,28 @@ } .mresource public FSharpSignatureData.cas { - // Offset: 0x00000000 Length: 0x000005DF + // Offset: 0x00000000 Length: 0x00000625 +} +.mresource public FSharpSignatureDataB.cas +{ + // Offset: 0x00000630 Length: 0x00000026 } .mresource public FSharpOptimizationData.cas { - // Offset: 0x000005E8 Length: 0x000000F3 + // Offset: 0x00000660 Length: 0x000000F3 +} +.mresource public FSharpOptimizationDataB.cas +{ + // Offset: 0x00000758 Length: 0x00000008 } .module cas.exe -// MVID: {59B19213-35EA-18E3-A745-03831392B159} +// MVID: {5BF2D41C-35EA-18E3-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x006A0000 +// Image base: 0x018C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl index 479e3804fe3..2a87131406e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Mutation01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Mutation01 { - // Offset: 0x00000000 Length: 0x00000705 + // Offset: 0x00000000 Length: 0x000006F9 +} +.mresource public FSharpSignatureDataB.Mutation01 +{ + // Offset: 0x00000700 Length: 0x00000094 } .mresource public FSharpOptimizationData.Mutation01 { - // Offset: 0x00000710 Length: 0x00000220 + // Offset: 0x00000798 Length: 0x00000220 +} +.mresource public FSharpOptimizationDataB.Mutation01 +{ + // Offset: 0x000009C0 Length: 0x00000038 } .module Mutation01.exe -// MVID: {59B19213-8C6A-2EAE-A745-03831392B159} +// MVID: {5BF2D41C-8C6A-2EAE-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00390000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl index b26df9510b4..2ea8322e4ca 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x000001A2 } +.mresource public FSharpSignatureDataB.Mutation02 +{ + // Offset: 0x000001A8 Length: 0x00000001 +} .mresource public FSharpOptimizationData.Mutation02 { - // Offset: 0x000001A8 Length: 0x0000006C + // Offset: 0x000001B0 Length: 0x0000006C +} +.mresource public FSharpOptimizationDataB.Mutation02 +{ + // Offset: 0x00000220 Length: 0x00000000 } .module Mutation02.exe -// MVID: {5B9A632A-8C6A-2F0D-A745-03832A639A5B} +// MVID: {5BF2D41C-8C6A-2F0D-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02750000 +// Image base: 0x02FA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl index e43810c10bf..00adfa21501 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x000001A2 } +.mresource public FSharpSignatureDataB.Mutation03 +{ + // Offset: 0x000001A8 Length: 0x00000001 +} .mresource public FSharpOptimizationData.Mutation03 { - // Offset: 0x000001A8 Length: 0x0000006C + // Offset: 0x000001B0 Length: 0x0000006C +} +.mresource public FSharpOptimizationDataB.Mutation03 +{ + // Offset: 0x00000220 Length: 0x00000000 } .module Mutation03.exe -// MVID: {5B9A632A-8C6A-2EEC-A745-03832A639A5B} +// MVID: {5BF2D41C-8C6A-2EEC-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02CA0000 +// Image base: 0x00350000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl index 444d581fc63..ad06c65e240 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x000001B5 } +.mresource public FSharpSignatureDataB.Mutation04 +{ + // Offset: 0x000001C0 Length: 0x00000001 +} .mresource public FSharpOptimizationData.Mutation04 { - // Offset: 0x000001C0 Length: 0x0000006C + // Offset: 0x000001C8 Length: 0x0000006C +} +.mresource public FSharpOptimizationDataB.Mutation04 +{ + // Offset: 0x00000238 Length: 0x00000000 } .module Mutation04.exe -// MVID: {5B9A632A-8C6A-2E43-A745-03832A639A5B} +// MVID: {5BF2D41C-8C6A-2E43-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02A80000 +// Image base: 0x00FD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl index fc052bb6e08..115d90a1adb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x000004CE } +.mresource public FSharpSignatureDataB.Mutation05 +{ + // Offset: 0x000004D8 Length: 0x0000003B +} .mresource public FSharpOptimizationData.Mutation05 { - // Offset: 0x000004D8 Length: 0x00000127 + // Offset: 0x00000518 Length: 0x00000127 +} +.mresource public FSharpOptimizationDataB.Mutation05 +{ + // Offset: 0x00000648 Length: 0x00000016 } .module Mutation05.exe -// MVID: {5B9A632A-8C6A-2E22-A745-03832A639A5B} +// MVID: {5BF2D41C-8C6A-2E22-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x008E0000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl index a30c4a069bd..123cc28ed86 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly comparison_decimal01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.comparison_decimal01 { - // Offset: 0x00000000 Length: 0x00000176 + // Offset: 0x00000000 Length: 0x0000017E +} +.mresource public FSharpSignatureDataB.comparison_decimal01 +{ + // Offset: 0x00000188 Length: 0x00000000 } .mresource public FSharpOptimizationData.comparison_decimal01 { - // Offset: 0x00000180 Length: 0x0000005B + // Offset: 0x00000190 Length: 0x0000005B +} +.mresource public FSharpOptimizationDataB.comparison_decimal01 +{ + // Offset: 0x000001F0 Length: 0x00000000 } .module comparison_decimal01.exe -// MVID: {59B19240-76D8-7EE3-A745-03834092B159} +// MVID: {5BF2D41C-76D8-7EE3-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02980000 +// Image base: 0x01950000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl index 78bfe96fcc7..54b100a7ad4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl @@ -40,18 +40,26 @@ { // Offset: 0x00000000 Length: 0x00000614 } +.mresource public FSharpSignatureDataB.Linq101Aggregates01 +{ + // Offset: 0x00000618 Length: 0x00000027 +} .mresource public FSharpOptimizationData.Linq101Aggregates01 { - // Offset: 0x00000618 Length: 0x00000211 + // Offset: 0x00000648 Length: 0x00000211 +} +.mresource public FSharpOptimizationDataB.Linq101Aggregates01 +{ + // Offset: 0x00000860 Length: 0x00000000 } .module Linq101Aggregates01.exe -// MVID: {5B9A632A-D281-4783-A745-03832A639A5B} +// MVID: {5BF2D3C6-D281-4783-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026B0000 +// Image base: 0x03040000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl index b0aa6e961a6..4560207e6f7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl @@ -35,18 +35,26 @@ { // Offset: 0x00000000 Length: 0x0000038A } +.mresource public FSharpSignatureDataB.Linq101ElementOperators01 +{ + // Offset: 0x00000390 Length: 0x0000000C +} .mresource public FSharpOptimizationData.Linq101ElementOperators01 { - // Offset: 0x00000390 Length: 0x00000127 + // Offset: 0x000003A0 Length: 0x00000127 +} +.mresource public FSharpOptimizationDataB.Linq101ElementOperators01 +{ + // Offset: 0x000004D0 Length: 0x00000000 } .module Linq101ElementOperators01.exe -// MVID: {5B9A632A-19D7-C20D-A745-03832A639A5B} +// MVID: {5BF2D3C6-19D7-C20D-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x028F0000 +// Image base: 0x00660000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl index 050bdf1cc6d..84629ce59fe 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl @@ -40,18 +40,26 @@ { // Offset: 0x00000000 Length: 0x0000040F } +.mresource public FSharpSignatureDataB.Linq101Grouping01 +{ + // Offset: 0x00000418 Length: 0x0000001E +} .mresource public FSharpOptimizationData.Linq101Grouping01 { - // Offset: 0x00000418 Length: 0x00000129 + // Offset: 0x00000440 Length: 0x00000129 +} +.mresource public FSharpOptimizationDataB.Linq101Grouping01 +{ + // Offset: 0x00000570 Length: 0x00000000 } .module Linq101Grouping01.exe -// MVID: {5B9A68C1-FB79-E5BF-A745-0383C1689A5B} +// MVID: {5BF2D3C6-FB79-E5BF-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x025F0000 +// Image base: 0x001F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl index f985ce06194..aec28d14dcc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl @@ -40,18 +40,26 @@ { // Offset: 0x00000000 Length: 0x00000316 } +.mresource public FSharpSignatureDataB.Linq101Joins01 +{ + // Offset: 0x00000320 Length: 0x00000011 +} .mresource public FSharpOptimizationData.Linq101Joins01 { - // Offset: 0x00000320 Length: 0x000000C3 + // Offset: 0x00000338 Length: 0x000000C3 +} +.mresource public FSharpOptimizationDataB.Linq101Joins01 +{ + // Offset: 0x00000400 Length: 0x00000000 } .module Linq101Joins01.exe -// MVID: {5B9A68C1-151B-685E-A745-0383C1689A5B} +// MVID: {5BF2D3C6-151B-685E-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026A0000 +// Image base: 0x00350000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl index 79848765473..22088641a28 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl @@ -35,18 +35,26 @@ { // Offset: 0x00000000 Length: 0x000003BA } +.mresource public FSharpSignatureDataB.Linq101Ordering01 +{ + // Offset: 0x000003C0 Length: 0x00000012 +} .mresource public FSharpOptimizationData.Linq101Ordering01 { - // Offset: 0x000003C0 Length: 0x00000134 + // Offset: 0x000003D8 Length: 0x00000134 +} +.mresource public FSharpOptimizationDataB.Linq101Ordering01 +{ + // Offset: 0x00000510 Length: 0x00000000 } .module Linq101Ordering01.exe -// MVID: {5B9A632A-649A-6956-A745-03832A639A5B} +// MVID: {5BF2D3C6-649A-6956-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00AD0000 +// Image base: 0x02AF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl index b210d7f3c90..60eee9f4acb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl @@ -35,18 +35,26 @@ { // Offset: 0x00000000 Length: 0x000003DE } +.mresource public FSharpSignatureDataB.Linq101Partitioning01 +{ + // Offset: 0x000003E8 Length: 0x00000014 +} .mresource public FSharpOptimizationData.Linq101Partitioning01 { - // Offset: 0x000003E8 Length: 0x00000138 + // Offset: 0x00000400 Length: 0x00000138 +} +.mresource public FSharpOptimizationDataB.Linq101Partitioning01 +{ + // Offset: 0x00000540 Length: 0x00000000 } .module Linq101Partitioning01.exe -// MVID: {5B9A632A-B280-A6A2-A745-03832A639A5B} +// MVID: {5BF2D3C6-B280-A6A2-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00AF0000 +// Image base: 0x013D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl index d2b715c5820..84406c42ae6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl @@ -40,18 +40,26 @@ { // Offset: 0x00000000 Length: 0x0000039F } +.mresource public FSharpSignatureDataB.Linq101Quantifiers01 +{ + // Offset: 0x000003A8 Length: 0x00000012 +} .mresource public FSharpOptimizationData.Linq101Quantifiers01 { - // Offset: 0x000003A8 Length: 0x000000FF + // Offset: 0x000003C0 Length: 0x000000FF +} +.mresource public FSharpOptimizationDataB.Linq101Quantifiers01 +{ + // Offset: 0x000004C8 Length: 0x00000000 } .module Linq101Quantifiers01.exe -// MVID: {5B9A632A-76DD-E373-A745-03832A639A5B} +// MVID: {5BF2D3C6-76DD-E373-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x025D0000 +// Image base: 0x02C50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl index 8afae23a726..8ac26b84fca 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl @@ -35,18 +35,26 @@ { // Offset: 0x00000000 Length: 0x00000663 } +.mresource public FSharpSignatureDataB.Linq101Select01 +{ + // Offset: 0x00000668 Length: 0x00000035 +} .mresource public FSharpOptimizationData.Linq101Select01 { - // Offset: 0x00000668 Length: 0x00000204 + // Offset: 0x000006A8 Length: 0x00000204 +} +.mresource public FSharpOptimizationDataB.Linq101Select01 +{ + // Offset: 0x000008B0 Length: 0x00000000 } .module Linq101Select01.exe -// MVID: {5B9A632A-6057-8F80-A745-03832A639A5B} +// MVID: {5BF2D3C6-6057-8F80-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FF0000 +// Image base: 0x00360000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl index 7b308ef661d..65ec82f4292 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl @@ -35,18 +35,26 @@ { // Offset: 0x00000000 Length: 0x00000398 } +.mresource public FSharpSignatureDataB.Linq101SetOperators01 +{ + // Offset: 0x000003A0 Length: 0x0000000E +} .mresource public FSharpOptimizationData.Linq101SetOperators01 { - // Offset: 0x000003A0 Length: 0x0000011E + // Offset: 0x000003B8 Length: 0x0000011E +} +.mresource public FSharpOptimizationDataB.Linq101SetOperators01 +{ + // Offset: 0x000004E0 Length: 0x00000000 } .module Linq101SetOperators01.exe -// MVID: {5B9A632A-4EE5-349F-A745-03832A639A5B} +// MVID: {5BF2D3C6-4EE5-349F-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026A0000 +// Image base: 0x01010000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl index b673d1193cc..040b644cf17 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl @@ -35,18 +35,26 @@ { // Offset: 0x00000000 Length: 0x000003D6 } +.mresource public FSharpSignatureDataB.Linq101Where01 +{ + // Offset: 0x000003E0 Length: 0x00000012 +} .mresource public FSharpOptimizationData.Linq101Where01 { - // Offset: 0x000003E0 Length: 0x0000012E + // Offset: 0x000003F8 Length: 0x0000012E +} +.mresource public FSharpOptimizationDataB.Linq101Where01 +{ + // Offset: 0x00000530 Length: 0x00000000 } .module Linq101Where01.exe -// MVID: {5B9A632A-FF23-CD21-A745-03832A639A5B} +// MVID: {5BF2D3C6-FF23-CD21-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x009E0000 +// Image base: 0x00A70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl index 884c03da12a..471ba037081 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SeqExpressionSteppingTest1 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.SeqExpressionSteppingTest1 { - // Offset: 0x00000000 Length: 0x00000267 + // Offset: 0x00000000 Length: 0x0000026F +} +.mresource public FSharpSignatureDataB.SeqExpressionSteppingTest1 +{ + // Offset: 0x00000278 Length: 0x00000004 } .mresource public FSharpOptimizationData.SeqExpressionSteppingTest1 { - // Offset: 0x00000270 Length: 0x000000AD + // Offset: 0x00000280 Length: 0x000000AD +} +.mresource public FSharpOptimizationDataB.SeqExpressionSteppingTest1 +{ + // Offset: 0x00000338 Length: 0x00000000 } .module SeqExpressionSteppingTest1.exe -// MVID: {59B19240-2432-947D-A745-03834092B159} +// MVID: {5BF2D3C6-2432-947D-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x018E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl index e5450059c32..938d07b4561 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SeqExpressionSteppingTest2 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.SeqExpressionSteppingTest2 { - // Offset: 0x00000000 Length: 0x00000267 + // Offset: 0x00000000 Length: 0x0000026F +} +.mresource public FSharpSignatureDataB.SeqExpressionSteppingTest2 +{ + // Offset: 0x00000278 Length: 0x00000004 } .mresource public FSharpOptimizationData.SeqExpressionSteppingTest2 { - // Offset: 0x00000270 Length: 0x000000AD + // Offset: 0x00000280 Length: 0x000000AD +} +.mresource public FSharpOptimizationDataB.SeqExpressionSteppingTest2 +{ + // Offset: 0x00000338 Length: 0x00000000 } .module SeqExpressionSteppingTest2.exe -// MVID: {59B19240-2432-951E-A745-03834092B159} +// MVID: {5BF2D3C6-2432-951E-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00690000 +// Image base: 0x02EB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl index 37e1a739636..23014de1c4b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SeqExpressionSteppingTest3 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.SeqExpressionSteppingTest3 { - // Offset: 0x00000000 Length: 0x00000277 + // Offset: 0x00000000 Length: 0x0000027F +} +.mresource public FSharpSignatureDataB.SeqExpressionSteppingTest3 +{ + // Offset: 0x00000288 Length: 0x00000005 } .mresource public FSharpOptimizationData.SeqExpressionSteppingTest3 { - // Offset: 0x00000280 Length: 0x000000AD + // Offset: 0x00000298 Length: 0x000000AD +} +.mresource public FSharpOptimizationDataB.SeqExpressionSteppingTest3 +{ + // Offset: 0x00000350 Length: 0x00000000 } .module SeqExpressionSteppingTest3.exe -// MVID: {59B19240-2432-943F-A745-03834092B159} +// MVID: {5BF2D3C6-2432-943F-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02660000 +// Image base: 0x01900000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl index ea764c62bb0..940d987fddf 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000026F } +.mresource public FSharpSignatureDataB.SeqExpressionSteppingTest4 +{ + // Offset: 0x00000278 Length: 0x00000004 +} .mresource public FSharpOptimizationData.SeqExpressionSteppingTest4 { - // Offset: 0x00000278 Length: 0x000000AD + // Offset: 0x00000280 Length: 0x000000AD +} +.mresource public FSharpOptimizationDataB.SeqExpressionSteppingTest4 +{ + // Offset: 0x00000338 Length: 0x00000000 } .module SeqExpressionSteppingTest4.exe -// MVID: {5B9A68C1-2432-93E0-A745-0383C1689A5B} +// MVID: {5BF2D3C6-2432-93E0-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00760000 +// Image base: 0x02510000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl index 0af7608e807..6dfb1b94512 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000026F } +.mresource public FSharpSignatureDataB.SeqExpressionSteppingTest5 +{ + // Offset: 0x00000278 Length: 0x00000004 +} .mresource public FSharpOptimizationData.SeqExpressionSteppingTest5 { - // Offset: 0x00000278 Length: 0x000000AD + // Offset: 0x00000280 Length: 0x000000AD +} +.mresource public FSharpOptimizationDataB.SeqExpressionSteppingTest5 +{ + // Offset: 0x00000338 Length: 0x00000000 } .module SeqExpressionSteppingTest5.exe -// MVID: {5B9A632A-2432-9401-A745-03832A639A5B} +// MVID: {5BF2D3C6-2432-9401-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026A0000 +// Image base: 0x00F20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl index d06d692b20b..7e83b9080ae 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x000002A4 } +.mresource public FSharpSignatureDataB.SeqExpressionSteppingTest6 +{ + // Offset: 0x000002A8 Length: 0x00000006 +} .mresource public FSharpOptimizationData.SeqExpressionSteppingTest6 { - // Offset: 0x000002A8 Length: 0x000000BA + // Offset: 0x000002B8 Length: 0x000000BA +} +.mresource public FSharpOptimizationDataB.SeqExpressionSteppingTest6 +{ + // Offset: 0x00000378 Length: 0x00000000 } .module SeqExpressionSteppingTest6.exe -// MVID: {5B9A632A-2432-94A2-A745-03832A639A5B} +// MVID: {5BF2D3C6-2432-94A2-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01330000 +// Image base: 0x03080000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl index ae9e2337813..258a218d79d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000272 } +.mresource public FSharpSignatureDataB.SeqExpressionSteppingTest7 +{ + // Offset: 0x00000278 Length: 0x00000006 +} .mresource public FSharpOptimizationData.SeqExpressionSteppingTest7 { - // Offset: 0x00000278 Length: 0x00000098 + // Offset: 0x00000288 Length: 0x00000098 +} +.mresource public FSharpOptimizationDataB.SeqExpressionSteppingTest7 +{ + // Offset: 0x00000328 Length: 0x00000000 } .module SeqExpressionSteppingTest7.exe -// MVID: {5B9A632A-2432-93C3-A745-03832A639A5B} +// MVID: {5BF2D3C6-2432-93C3-A745-0383C6D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02450000 +// Image base: 0x02F10000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl index d03a45be913..a4b8d0f0ded 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SeqExpressionTailCalls01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.SeqExpressionTailCalls01 { - // Offset: 0x00000000 Length: 0x0000021D + // Offset: 0x00000000 Length: 0x00000225 +} +.mresource public FSharpSignatureDataB.SeqExpressionTailCalls01 +{ + // Offset: 0x00000230 Length: 0x00000004 } .mresource public FSharpOptimizationData.SeqExpressionTailCalls01 { - // Offset: 0x00000228 Length: 0x0000008C + // Offset: 0x00000238 Length: 0x0000008C +} +.mresource public FSharpOptimizationDataB.SeqExpressionTailCalls01 +{ + // Offset: 0x000002C8 Length: 0x00000000 } .module SeqExpressionTailCalls01.exe -// MVID: {59B19240-093A-A6BE-A745-03834092B159} +// MVID: {5BF2D41C-093A-A6BE-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x027D0000 +// Image base: 0x026B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl index 4cca2bf3f7c..3608269bc35 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SeqExpressionTailCalls02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.SeqExpressionTailCalls02 { - // Offset: 0x00000000 Length: 0x00000256 + // Offset: 0x00000000 Length: 0x0000025E +} +.mresource public FSharpSignatureDataB.SeqExpressionTailCalls02 +{ + // Offset: 0x00000268 Length: 0x00000008 } .mresource public FSharpOptimizationData.SeqExpressionTailCalls02 { - // Offset: 0x00000260 Length: 0x0000009E + // Offset: 0x00000278 Length: 0x0000009E +} +.mresource public FSharpOptimizationDataB.SeqExpressionTailCalls02 +{ + // Offset: 0x00000320 Length: 0x00000000 } .module SeqExpressionTailCalls02.exe -// MVID: {59B19240-093A-EC43-A745-03834092B159} +// MVID: {5BF2D41C-093A-EC43-A745-03831CD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017C0000 +// Image base: 0x00790000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl index c29de0c7bdc..c028e5825e4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly LetBinding01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.LetBinding01 { - // Offset: 0x00000000 Length: 0x000001B4 + // Offset: 0x00000000 Length: 0x000001BC +} +.mresource public FSharpSignatureDataB.LetBinding01 +{ + // Offset: 0x000001C0 Length: 0x00000001 } .mresource public FSharpOptimizationData.LetBinding01 { - // Offset: 0x000001B8 Length: 0x00000070 + // Offset: 0x000001C8 Length: 0x00000070 +} +.mresource public FSharpOptimizationDataB.LetBinding01 +{ + // Offset: 0x00000240 Length: 0x00000000 } .module LetBinding01.exe -// MVID: {59B19250-269D-BEEF-A745-03835092B159} +// MVID: {5BF2D3CD-269D-BEEF-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01570000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl index 2dd345fe2d4..88dc97427cd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly StaticInit_Class01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.StaticInit_Class01 { - // Offset: 0x00000000 Length: 0x00000335 + // Offset: 0x00000000 Length: 0x0000033D +} +.mresource public FSharpSignatureDataB.StaticInit_Class01 +{ + // Offset: 0x00000348 Length: 0x00000011 } .mresource public FSharpOptimizationData.StaticInit_Class01 { - // Offset: 0x00000340 Length: 0x000000AD + // Offset: 0x00000360 Length: 0x000000AD +} +.mresource public FSharpOptimizationDataB.StaticInit_Class01 +{ + // Offset: 0x00000418 Length: 0x00000003 } .module StaticInit_Class01.dll -// MVID: {59B19250-EC34-E66E-A745-03835092B159} +// MVID: {5BF2D3CD-EC34-E66E-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FE0000 +// Image base: 0x01540000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl index c9cd745c46a..42a2e1c2b56 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly StaticInit_Module01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.StaticInit_Module01 { - // Offset: 0x00000000 Length: 0x000002A7 + // Offset: 0x00000000 Length: 0x000002AF +} +.mresource public FSharpSignatureDataB.StaticInit_Module01 +{ + // Offset: 0x000002B8 Length: 0x00000003 } .mresource public FSharpOptimizationData.StaticInit_Module01 { - // Offset: 0x000002B0 Length: 0x000000DF + // Offset: 0x000002C0 Length: 0x000000DF +} +.mresource public FSharpOptimizationDataB.StaticInit_Module01 +{ + // Offset: 0x000003A8 Length: 0x00000000 } .module StaticInit_Module01.dll -// MVID: {59B19250-705F-DF4F-A745-03835092B159} +// MVID: {5BF2D3CD-705F-DF4F-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00370000 +// Image base: 0x027B0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -94,7 +102,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$StaticInit_Module01::'x@5-1' + IL_0000: ldsfld int32 ''.$StaticInit_Module01::'x@5-2' IL_0005: ret } // end of method M::get_x @@ -110,7 +118,7 @@ .class private abstract auto ansi sealed ''.$StaticInit_Module01 extends [mscorlib]System.Object { - .field static assembly initonly int32 'x@5-1' + .field static assembly initonly int32 'x@5-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly initonly int32 y@7 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -133,7 +141,7 @@ IL_0000: ldstr "1" IL_0005: callvirt instance int32 [mscorlib]System.String::get_Length() IL_000a: dup - IL_000b: stsfld int32 ''.$StaticInit_Module01::'x@5-1' + IL_000b: stsfld int32 ''.$StaticInit_Module01::'x@5-2' IL_0010: stloc.0 .line 7,7 : 5,27 '' IL_0011: call int32 StaticInit_Module01/M::get_x() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl index 55664ad8b3a..170b714cb41 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly StaticInit_Struct01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.StaticInit_Struct01 { - // Offset: 0x00000000 Length: 0x000007B1 + // Offset: 0x00000000 Length: 0x000007A5 +} +.mresource public FSharpSignatureDataB.StaticInit_Struct01 +{ + // Offset: 0x000007B0 Length: 0x00000099 } .mresource public FSharpOptimizationData.StaticInit_Struct01 { - // Offset: 0x000007B8 Length: 0x0000021F + // Offset: 0x00000850 Length: 0x0000021F +} +.mresource public FSharpOptimizationDataB.StaticInit_Struct01 +{ + // Offset: 0x00000A78 Length: 0x00000035 } .module StaticInit_Struct01.dll -// MVID: {59B19250-05F6-D6CB-A745-03835092B159} +// MVID: {5BF2D3CD-05F6-D6CB-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02BA0000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl index aa77b1c7e0e..f2f3578c471 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch01 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000021C } +.mresource public FSharpSignatureDataB.SteppingMatch01 +{ + // Offset: 0x00000220 Length: 0x00000005 +} .mresource public FSharpOptimizationData.SteppingMatch01 { - // Offset: 0x00000220 Length: 0x0000007A + // Offset: 0x00000230 Length: 0x0000007A +} +.mresource public FSharpOptimizationDataB.SteppingMatch01 +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module SteppingMatch01.dll -// MVID: {59B19213-ABFD-13F6-A745-03831392B159} +// MVID: {5BF2D3CD-ABFD-13F6-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CA0000 +// Image base: 0x00B00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl index 453261211ee..ed0280a9b7b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch02 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000021C } +.mresource public FSharpSignatureDataB.SteppingMatch02 +{ + // Offset: 0x00000220 Length: 0x00000005 +} .mresource public FSharpOptimizationData.SteppingMatch02 { - // Offset: 0x00000220 Length: 0x0000007A + // Offset: 0x00000230 Length: 0x0000007A +} +.mresource public FSharpOptimizationDataB.SteppingMatch02 +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module SteppingMatch02.dll -// MVID: {59B19213-CAC2-C63D-A745-03831392B159} +// MVID: {5BF2D3CD-CAC2-C63D-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01090000 +// Image base: 0x02630000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl index f2ced1b23d2..36409c086ea 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch03 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000231 } +.mresource public FSharpSignatureDataB.SteppingMatch03 +{ + // Offset: 0x00000238 Length: 0x00000006 +} .mresource public FSharpOptimizationData.SteppingMatch03 { - // Offset: 0x00000238 Length: 0x0000007A + // Offset: 0x00000248 Length: 0x0000007A +} +.mresource public FSharpOptimizationDataB.SteppingMatch03 +{ + // Offset: 0x000002C8 Length: 0x00000000 } .module SteppingMatch03.dll -// MVID: {59B19213-4E87-D110-A745-03831392B159} +// MVID: {5BF2D3CD-4E87-D110-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x00820000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl index dc909634a1a..ca01e65af33 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch04 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000232 } +.mresource public FSharpSignatureDataB.SteppingMatch04 +{ + // Offset: 0x00000238 Length: 0x00000006 +} .mresource public FSharpOptimizationData.SteppingMatch04 { - // Offset: 0x00000238 Length: 0x0000007B + // Offset: 0x00000248 Length: 0x0000007B +} +.mresource public FSharpOptimizationDataB.SteppingMatch04 +{ + // Offset: 0x000002C8 Length: 0x00000000 } .module SteppingMatch04.dll -// MVID: {59B19213-6D4C-8357-A745-03831392B159} +// MVID: {5BF2D3CD-6D4C-8357-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02770000 +// Image base: 0x01760000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl index 8da1f763ae7..7b815297394 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch05 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000232 } +.mresource public FSharpSignatureDataB.SteppingMatch05 +{ + // Offset: 0x00000238 Length: 0x00000006 +} .mresource public FSharpOptimizationData.SteppingMatch05 { - // Offset: 0x00000238 Length: 0x0000007B + // Offset: 0x00000248 Length: 0x0000007B +} +.mresource public FSharpOptimizationDataB.SteppingMatch05 +{ + // Offset: 0x000002C8 Length: 0x00000000 } .module SteppingMatch05.dll -// MVID: {59B19213-30E9-4ADA-A745-03831392B159} +// MVID: {5BF2D3CD-30E9-4ADA-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02FF0000 +// Image base: 0x00C90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl index 078b8cd73e3..cd327ca7dba 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch06 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.SteppingMatch06 { - // Offset: 0x00000000 Length: 0x0000067D + // Offset: 0x00000000 Length: 0x00000679 +} +.mresource public FSharpSignatureDataB.SteppingMatch06 +{ + // Offset: 0x00000680 Length: 0x0000007B } .mresource public FSharpOptimizationData.SteppingMatch06 { - // Offset: 0x00000688 Length: 0x000001D9 + // Offset: 0x00000700 Length: 0x000001D9 +} +.mresource public FSharpOptimizationDataB.SteppingMatch06 +{ + // Offset: 0x000008E0 Length: 0x0000002A } .module SteppingMatch06.dll -// MVID: {59B19213-4FAE-FD21-A745-03831392B159} +// MVID: {5BF2D3CD-4FAE-FD21-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x028F0000 +// Image base: 0x03040000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl index a897b0908a0..89872b6a2c2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch07 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.SteppingMatch07 { - // Offset: 0x00000000 Length: 0x0000067D + // Offset: 0x00000000 Length: 0x00000679 +} +.mresource public FSharpSignatureDataB.SteppingMatch07 +{ + // Offset: 0x00000680 Length: 0x0000007B } .mresource public FSharpOptimizationData.SteppingMatch07 { - // Offset: 0x00000688 Length: 0x000001D9 + // Offset: 0x00000700 Length: 0x000001D9 +} +.mresource public FSharpOptimizationDataB.SteppingMatch07 +{ + // Offset: 0x000008E0 Length: 0x0000002A } .module SteppingMatch07.dll -// MVID: {59B19213-D373-07F3-A745-03831392B159} +// MVID: {5BF2D3CD-D373-07F3-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03330000 +// Image base: 0x00CE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl index 5d87f08136f..d9a69225e5d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch08 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.SteppingMatch08 { - // Offset: 0x00000000 Length: 0x000001DF + // Offset: 0x00000000 Length: 0x000001E7 +} +.mresource public FSharpSignatureDataB.SteppingMatch08 +{ + // Offset: 0x000001F0 Length: 0x00000003 } .mresource public FSharpOptimizationData.SteppingMatch08 { - // Offset: 0x000001E8 Length: 0x00000079 + // Offset: 0x000001F8 Length: 0x00000079 +} +.mresource public FSharpOptimizationDataB.SteppingMatch08 +{ + // Offset: 0x00000278 Length: 0x00000000 } .module SteppingMatch08.dll -// MVID: {59B19213-F238-BA3A-A745-03831392B159} +// MVID: {5BF2D3CD-F238-BA3A-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C70000 +// Image base: 0x00710000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl index 5baef73c908..9f0db454dec 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly SteppingMatch09 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000318 } +.mresource public FSharpSignatureDataB.SteppingMatch09 +{ + // Offset: 0x00000320 Length: 0x00000012 +} .mresource public FSharpOptimizationData.SteppingMatch09 { - // Offset: 0x00000320 Length: 0x000000EB + // Offset: 0x00000338 Length: 0x000000EB +} +.mresource public FSharpOptimizationDataB.SteppingMatch09 +{ + // Offset: 0x00000428 Length: 0x00000000 } .module SteppingMatch09.dll -// MVID: {59B19213-4935-D6AC-A745-03831392B159} +// MVID: {5BF2D3CD-4935-D6AC-A745-0383CDD3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00390000 +// Image base: 0x00520000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl index 028bdaec338..5111245fae6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TailCall01 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000021D } +.mresource public FSharpSignatureDataB.TailCall01 +{ + // Offset: 0x00000228 Length: 0x00000007 +} .mresource public FSharpOptimizationData.TailCall01 { - // Offset: 0x00000228 Length: 0x0000007C + // Offset: 0x00000238 Length: 0x0000007C +} +.mresource public FSharpOptimizationDataB.TailCall01 +{ + // Offset: 0x000002B8 Length: 0x00000000 } .module TailCall01.exe -// MVID: {59B19213-7D8F-CF4A-A745-03831392B159} +// MVID: {5BF2D41D-7D8F-CF4A-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02E90000 +// Image base: 0x00380000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl index 8a7cd2907e0..d8912f079c0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TailCall02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TailCall02 { - // Offset: 0x00000000 Length: 0x00000202 + // Offset: 0x00000000 Length: 0x0000020A +} +.mresource public FSharpSignatureDataB.TailCall02 +{ + // Offset: 0x00000210 Length: 0x00000007 } .mresource public FSharpOptimizationData.TailCall02 { - // Offset: 0x00000208 Length: 0x0000007C + // Offset: 0x00000220 Length: 0x0000007C +} +.mresource public FSharpOptimizationDataB.TailCall02 +{ + // Offset: 0x000002A0 Length: 0x00000000 } .module TailCall02.exe -// MVID: {59B19213-7D8F-CE9D-A745-03831392B159} +// MVID: {5BF2D41D-7D8F-CE9D-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00E20000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl index 0b27a3419b2..e19d5661b50 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TailCall03 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000241 } +.mresource public FSharpSignatureDataB.TailCall03 +{ + // Offset: 0x00000248 Length: 0x0000000C +} .mresource public FSharpOptimizationData.TailCall03 { - // Offset: 0x00000248 Length: 0x0000007C + // Offset: 0x00000258 Length: 0x0000007C +} +.mresource public FSharpOptimizationDataB.TailCall03 +{ + // Offset: 0x000002D8 Length: 0x00000000 } .module TailCall03.exe -// MVID: {59B19213-7D8F-CE88-A745-03831392B159} +// MVID: {5BF2D41D-7D8F-CE88-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00E50000 +// Image base: 0x029E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl index 309f764e782..05a3eb5472a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TailCall04 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000022F } +.mresource public FSharpSignatureDataB.TailCall04 +{ + // Offset: 0x00000238 Length: 0x00000008 +} .mresource public FSharpOptimizationData.TailCall04 { - // Offset: 0x00000238 Length: 0x0000007C + // Offset: 0x00000248 Length: 0x0000007C +} +.mresource public FSharpOptimizationDataB.TailCall04 +{ + // Offset: 0x000002C8 Length: 0x00000000 } .module TailCall04.exe -// MVID: {59B19213-7D8F-CFE3-A745-03831392B159} +// MVID: {5BF2D41D-7D8F-CFE3-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00B70000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl index 5ae3bd0b331..c1e9a1e0c3c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TailCall05 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000023F } +.mresource public FSharpSignatureDataB.TailCall05 +{ + // Offset: 0x00000248 Length: 0x0000000A +} .mresource public FSharpOptimizationData.TailCall05 { - // Offset: 0x00000248 Length: 0x0000007C + // Offset: 0x00000258 Length: 0x0000007C +} +.mresource public FSharpOptimizationDataB.TailCall05 +{ + // Offset: 0x000002D8 Length: 0x00000000 } .module TailCall05.exe -// MVID: {59B19213-7D8F-CFC6-A745-03831392B159} +// MVID: {5BF2D41D-7D8F-CFC6-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03210000 +// Image base: 0x00BF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl index 6a80341afe9..856acc02fd7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction1 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction1 { - // Offset: 0x00000000 Length: 0x000001CA + // Offset: 0x00000000 Length: 0x000001D2 +} +.mresource public FSharpSignatureDataB.TestFunction1 +{ + // Offset: 0x000001D8 Length: 0x00000003 } .mresource public FSharpOptimizationData.TestFunction1 { - // Offset: 0x000001D0 Length: 0x00000070 + // Offset: 0x000001E0 Length: 0x00000070 +} +.mresource public FSharpOptimizationDataB.TestFunction1 +{ + // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction1.exe -// MVID: {59B19208-65FC-8929-A745-03830892B159} +// MVID: {5BF2D41D-65FC-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03230000 +// Image base: 0x01160000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl index 868ca11e97b..f80d99b89dc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction10 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction10 { - // Offset: 0x00000000 Length: 0x000001C9 + // Offset: 0x00000000 Length: 0x000001D1 +} +.mresource public FSharpSignatureDataB.TestFunction10 +{ + // Offset: 0x000001D8 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction10 { - // Offset: 0x000001D0 Length: 0x00000072 + // Offset: 0x000001E0 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.TestFunction10 +{ + // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction10.exe -// MVID: {59B199CC-A624-44FB-A745-0383CC99B159} +// MVID: {5BF2D41D-A624-44FB-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00DA0000 +// Image base: 0x00E70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl index a23943d01bf..dd2268fcc5a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction13 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000020F } +.mresource public FSharpSignatureDataB.TestFunction13 +{ + // Offset: 0x00000218 Length: 0x00000006 +} .mresource public FSharpOptimizationData.TestFunction13 { - // Offset: 0x00000218 Length: 0x00000072 + // Offset: 0x00000228 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.TestFunction13 +{ + // Offset: 0x000002A0 Length: 0x00000000 } .module TestFunction13.exe -// MVID: {59B199CC-A624-451C-A745-0383CC99B159} +// MVID: {5BF2D41D-A624-451C-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01000000 +// Image base: 0x03120000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl index a139e414063..453bb51da69 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction14 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction14 { - // Offset: 0x00000000 Length: 0x000001EA + // Offset: 0x00000000 Length: 0x000001F2 +} +.mresource public FSharpSignatureDataB.TestFunction14 +{ + // Offset: 0x000001F8 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction14 { - // Offset: 0x000001F0 Length: 0x00000072 + // Offset: 0x00000200 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.TestFunction14 +{ + // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction14.exe -// MVID: {59B19208-A624-4587-A745-03830892B159} +// MVID: {5BF2D41D-A624-4587-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x006B0000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl index 35254e97c34..e6ce7c40c8e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction16 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction16 { - // Offset: 0x00000000 Length: 0x00000693 + // Offset: 0x00000000 Length: 0x00000687 +} +.mresource public FSharpSignatureDataB.TestFunction16 +{ + // Offset: 0x00000690 Length: 0x0000007D } .mresource public FSharpOptimizationData.TestFunction16 { - // Offset: 0x00000698 Length: 0x000001CD + // Offset: 0x00000718 Length: 0x000001CD +} +.mresource public FSharpOptimizationDataB.TestFunction16 +{ + // Offset: 0x000008F0 Length: 0x0000002A } .module TestFunction16.exe -// MVID: {59B199CC-A624-45C5-A745-0383CC99B159} +// MVID: {5BF2D41D-A624-45C5-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01940000 +// Image base: 0x00C40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl index cc502982e7b..83c4d740a6f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction17 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction17 { - // Offset: 0x00000000 Length: 0x0000067E + // Offset: 0x00000000 Length: 0x00000672 +} +.mresource public FSharpSignatureDataB.TestFunction17 +{ + // Offset: 0x00000678 Length: 0x0000007C } .mresource public FSharpOptimizationData.TestFunction17 { - // Offset: 0x00000688 Length: 0x000001CD + // Offset: 0x000006F8 Length: 0x000001CD +} +.mresource public FSharpOptimizationDataB.TestFunction17 +{ + // Offset: 0x000008D0 Length: 0x0000002A } .module TestFunction17.exe -// MVID: {59B199CC-A624-45A8-A745-0383CC99B159} +// MVID: {5BF2D41D-A624-45A8-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x027C0000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl index f5468bf0fd6..6dcdb20bfb9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction19 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction19 { - // Offset: 0x00000000 Length: 0x00000352 + // Offset: 0x00000000 Length: 0x0000035A +} +.mresource public FSharpSignatureDataB.TestFunction19 +{ + // Offset: 0x00000360 Length: 0x00000021 } .mresource public FSharpOptimizationData.TestFunction19 { - // Offset: 0x00000358 Length: 0x00000100 + // Offset: 0x00000388 Length: 0x00000100 +} +.mresource public FSharpOptimizationDataB.TestFunction19 +{ + // Offset: 0x00000490 Length: 0x0000000E } .module TestFunction19.exe -// MVID: {59B19208-A624-46AE-A745-03830892B159} +// MVID: {5BF2D41D-A624-46AE-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x016D0000 +// Image base: 0x030C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl index 5b65668cd8c..8dd17a6f9b7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction20 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction20 { - // Offset: 0x00000000 Length: 0x00000393 + // Offset: 0x00000000 Length: 0x0000039B +} +.mresource public FSharpSignatureDataB.TestFunction20 +{ + // Offset: 0x000003A0 Length: 0x00000026 } .mresource public FSharpOptimizationData.TestFunction20 { - // Offset: 0x00000398 Length: 0x00000100 + // Offset: 0x000003D0 Length: 0x00000100 +} +.mresource public FSharpOptimizationDataB.TestFunction20 +{ + // Offset: 0x000004D8 Length: 0x0000000E } .module TestFunction20.exe -// MVID: {59B19208-A643-44FB-A745-03830892B159} +// MVID: {5BF2D41D-A643-44FB-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01320000 +// Image base: 0x01040000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl index 30b59304c56..95ab49b4406 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction21 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction21 { - // Offset: 0x00000000 Length: 0x00000685 + // Offset: 0x00000000 Length: 0x00000679 +} +.mresource public FSharpSignatureDataB.TestFunction21 +{ + // Offset: 0x00000680 Length: 0x0000007C } .mresource public FSharpOptimizationData.TestFunction21 { - // Offset: 0x00000690 Length: 0x000001CD + // Offset: 0x00000700 Length: 0x000001CD +} +.mresource public FSharpOptimizationDataB.TestFunction21 +{ + // Offset: 0x000008D8 Length: 0x0000002A } .module TestFunction21.exe -// MVID: {59B19208-A643-45E6-A745-03830892B159} +// MVID: {5BF2D41D-A643-45E6-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F80000 +// Image base: 0x01850000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl index fffbcac4e2f..c1e170f54c5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction23 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000346 } +.mresource public FSharpSignatureDataB.TestFunction23 +{ + // Offset: 0x00000350 Length: 0x0000001B +} .mresource public FSharpOptimizationData.TestFunction23 { - // Offset: 0x00000350 Length: 0x000000E3 + // Offset: 0x00000370 Length: 0x000000E3 +} +.mresource public FSharpOptimizationDataB.TestFunction23 +{ + // Offset: 0x00000458 Length: 0x00000008 } .module TestFunction23.exe -// MVID: {59B19208-A643-451C-A745-03830892B159} +// MVID: {5BF2D41D-A643-451C-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02D60000 +// Image base: 0x01910000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl index bdbd5f41fc7..ce3a83b1a98 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction24 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction24 { - // Offset: 0x00000000 Length: 0x0000075B + // Offset: 0x00000000 Length: 0x0000074F +} +.mresource public FSharpSignatureDataB.TestFunction24 +{ + // Offset: 0x00000758 Length: 0x00000088 } .mresource public FSharpOptimizationData.TestFunction24 { - // Offset: 0x00000760 Length: 0x00000228 + // Offset: 0x000007E8 Length: 0x00000228 +} +.mresource public FSharpOptimizationDataB.TestFunction24 +{ + // Offset: 0x00000A18 Length: 0x0000002A } .module TestFunction24.exe -// MVID: {59B19208-A643-4587-A745-03830892B159} +// MVID: {5BF2D41D-A643-4587-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01080000 +// Image base: 0x00CD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl index d543e2e48bb..63b97447314 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction3b { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction3b { - // Offset: 0x00000000 Length: 0x00000200 + // Offset: 0x00000000 Length: 0x00000208 +} +.mresource public FSharpSignatureDataB.TestFunction3b +{ + // Offset: 0x00000210 Length: 0x00000006 } .mresource public FSharpOptimizationData.TestFunction3b { - // Offset: 0x00000208 Length: 0x0000008A + // Offset: 0x00000220 Length: 0x0000008A +} +.mresource public FSharpOptimizationDataB.TestFunction3b +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3b.exe -// MVID: {59B19208-A662-4FC9-A745-03830892B159} +// MVID: {5BF2D41D-A662-4FC9-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BB0000 +// Image base: 0x00910000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl index dc790e1200b..671a95fa0aa 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction3c { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction3c { - // Offset: 0x00000000 Length: 0x00000200 + // Offset: 0x00000000 Length: 0x00000208 +} +.mresource public FSharpSignatureDataB.TestFunction3c +{ + // Offset: 0x00000210 Length: 0x00000006 } .mresource public FSharpOptimizationData.TestFunction3c { - // Offset: 0x00000208 Length: 0x0000008A + // Offset: 0x00000220 Length: 0x0000008A +} +.mresource public FSharpOptimizationDataB.TestFunction3c +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3c.exe -// MVID: {59B19208-A662-4FAC-A745-03830892B159} +// MVID: {5BF2D41D-A662-4FAC-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02B20000 +// Image base: 0x03050000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl index a92010a91c4..b14246c5423 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly TestFunction9b4 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000024C } +.mresource public FSharpSignatureDataB.TestFunction9b4 +{ + // Offset: 0x00000250 Length: 0x00000005 +} .mresource public FSharpOptimizationData.TestFunction9b4 { - // Offset: 0x00000250 Length: 0x00000085 + // Offset: 0x00000260 Length: 0x00000085 +} +.mresource public FSharpOptimizationDataB.TestFunction9b4 +{ + // Offset: 0x000002F0 Length: 0x00000000 } .module TestFunction9b4.exe -// MVID: {5B17FC67-A091-56C1-A745-038367FC175B} +// MVID: {5BF2D41D-A091-56C1-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026C0000 +// Image base: 0x014B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl index 5fc9397c162..5e18a755528 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction11 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction11 { - // Offset: 0x00000000 Length: 0x000001E8 + // Offset: 0x00000000 Length: 0x000001F0 +} +.mresource public FSharpSignatureDataB.TestFunction11 +{ + // Offset: 0x000001F8 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction11 { - // Offset: 0x000001F0 Length: 0x00000072 + // Offset: 0x00000200 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.TestFunction11 +{ + // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction11.exe -// MVID: {59B19208-A624-45E6-A745-03830892B159} +// MVID: {5BF2D41D-A624-45E6-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01080000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl index 2f7b3efff8e..2b25d41d7ed 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction12 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction12 { - // Offset: 0x00000000 Length: 0x000001DB + // Offset: 0x00000000 Length: 0x000001E3 +} +.mresource public FSharpSignatureDataB.TestFunction12 +{ + // Offset: 0x000001E8 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction12 { - // Offset: 0x000001E0 Length: 0x00000072 + // Offset: 0x000001F0 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.TestFunction12 +{ + // Offset: 0x00000268 Length: 0x00000000 } .module TestFunction12.exe -// MVID: {59B19208-A624-4539-A745-03830892B159} +// MVID: {5BF2D41D-A624-4539-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x010B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl index ae9215ad18e..630556943eb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction15 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction15 { - // Offset: 0x00000000 Length: 0x000001EA + // Offset: 0x00000000 Length: 0x000001F2 +} +.mresource public FSharpSignatureDataB.TestFunction15 +{ + // Offset: 0x000001F8 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction15 { - // Offset: 0x000001F0 Length: 0x00000072 + // Offset: 0x00000200 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.TestFunction15 +{ + // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction15.exe -// MVID: {59B19208-A624-4662-A745-03830892B159} +// MVID: {5BF2D41D-A624-4662-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02B10000 +// Image base: 0x02FB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl index 80848608547..d49edbe5161 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction18 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x000001ED } +.mresource public FSharpSignatureDataB.TestFunction18 +{ + // Offset: 0x000001F8 Length: 0x00000003 +} .mresource public FSharpOptimizationData.TestFunction18 { - // Offset: 0x000001F8 Length: 0x00000072 + // Offset: 0x00000200 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.TestFunction18 +{ + // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction18.exe -// MVID: {59B19208-A624-4603-A745-03830892B159} +// MVID: {5BF2D41D-A624-4603-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x019B0000 +// Image base: 0x013B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl index 92ec82161db..3f69cf64452 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction2 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction2 { - // Offset: 0x00000000 Length: 0x000001FD + // Offset: 0x00000000 Length: 0x00000205 +} +.mresource public FSharpSignatureDataB.TestFunction2 +{ + // Offset: 0x00000210 Length: 0x00000006 } .mresource public FSharpOptimizationData.TestFunction2 { - // Offset: 0x00000208 Length: 0x00000088 + // Offset: 0x00000220 Length: 0x00000088 +} +.mresource public FSharpOptimizationDataB.TestFunction2 +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction2.exe -// MVID: {59B19208-661D-8929-A745-03830892B159} +// MVID: {5BF2D41D-661D-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x01890000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl index 3c7a947a3b4..4976f6c16ec 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Testfunction22 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Testfunction22 { - // Offset: 0x00000000 Length: 0x0000015B + // Offset: 0x00000000 Length: 0x00000163 +} +.mresource public FSharpSignatureDataB.Testfunction22 +{ + // Offset: 0x00000168 Length: 0x00000000 } .mresource public FSharpOptimizationData.Testfunction22 { - // Offset: 0x00000160 Length: 0x00000055 + // Offset: 0x00000170 Length: 0x00000055 +} +.mresource public FSharpOptimizationDataB.Testfunction22 +{ + // Offset: 0x000001D0 Length: 0x00000000 } .module Testfunction22.exe -// MVID: {59B199CC-5AA3-4518-A745-0383CC99B159} +// MVID: {5BF2D41D-5AA3-4518-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x003D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl index ac3e76f8f2e..8245a7e853c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Testfunction22b { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Testfunction22b { - // Offset: 0x00000000 Length: 0x0000015D + // Offset: 0x00000000 Length: 0x00000165 +} +.mresource public FSharpSignatureDataB.Testfunction22b +{ + // Offset: 0x00000170 Length: 0x00000000 } .mresource public FSharpOptimizationData.Testfunction22b { - // Offset: 0x00000168 Length: 0x00000056 + // Offset: 0x00000178 Length: 0x00000056 +} +.mresource public FSharpOptimizationDataB.Testfunction22b +{ + // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22b.exe -// MVID: {59B19208-8504-18B7-A745-03830892B159} +// MVID: {5BF2D41D-8504-18B7-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl index e5640da7b20..6cbdd683cfe 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Testfunction22c { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Testfunction22c { - // Offset: 0x00000000 Length: 0x0000015D + // Offset: 0x00000000 Length: 0x00000165 +} +.mresource public FSharpSignatureDataB.Testfunction22c +{ + // Offset: 0x00000170 Length: 0x00000000 } .mresource public FSharpOptimizationData.Testfunction22c { - // Offset: 0x00000168 Length: 0x00000056 + // Offset: 0x00000178 Length: 0x00000056 +} +.mresource public FSharpOptimizationDataB.Testfunction22c +{ + // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22c.exe -// MVID: {59B19208-459D-3DF8-A745-03830892B159} +// MVID: {5BF2D41D-459D-3DF8-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03000000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl index 06dc2c7b954..f893f6cf772 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Testfunction22d { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Testfunction22d { - // Offset: 0x00000000 Length: 0x0000015D + // Offset: 0x00000000 Length: 0x00000165 +} +.mresource public FSharpSignatureDataB.Testfunction22d +{ + // Offset: 0x00000170 Length: 0x00000000 } .mresource public FSharpOptimizationData.Testfunction22d { - // Offset: 0x00000168 Length: 0x00000056 + // Offset: 0x00000178 Length: 0x00000056 +} +.mresource public FSharpOptimizationDataB.Testfunction22d +{ + // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22d.exe -// MVID: {59B19208-FDCA-89B1-A745-03830892B159} +// MVID: {5BF2D41D-FDCA-89B1-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00720000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl index ed2dae30740..4f04f30ec14 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Testfunction22e { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Testfunction22e { - // Offset: 0x00000000 Length: 0x0000015D + // Offset: 0x00000000 Length: 0x00000165 +} +.mresource public FSharpSignatureDataB.Testfunction22e +{ + // Offset: 0x00000170 Length: 0x00000000 } .mresource public FSharpOptimizationData.Testfunction22e { - // Offset: 0x00000168 Length: 0x00000056 + // Offset: 0x00000178 Length: 0x00000056 +} +.mresource public FSharpOptimizationDataB.Testfunction22e +{ + // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22e.exe -// MVID: {59B19208-C83B-1CB9-A745-03830892B159} +// MVID: {5BF2D41D-C83B-1CB9-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl index 2dd07a07bb2..a923076f9a3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Testfunction22f { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Testfunction22f { - // Offset: 0x00000000 Length: 0x0000015D + // Offset: 0x00000000 Length: 0x00000165 +} +.mresource public FSharpSignatureDataB.Testfunction22f +{ + // Offset: 0x00000170 Length: 0x00000000 } .mresource public FSharpOptimizationData.Testfunction22f { - // Offset: 0x00000168 Length: 0x00000056 + // Offset: 0x00000178 Length: 0x00000056 +} +.mresource public FSharpOptimizationDataB.Testfunction22f +{ + // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22f.exe -// MVID: {59B19208-C040-2523-A745-03830892B159} +// MVID: {5BF2D41D-C040-2523-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012C0000 +// Image base: 0x00A60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl index 629593f6e0a..ae400771e54 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Testfunction22g { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Testfunction22g { - // Offset: 0x00000000 Length: 0x0000015D + // Offset: 0x00000000 Length: 0x00000165 +} +.mresource public FSharpSignatureDataB.Testfunction22g +{ + // Offset: 0x00000170 Length: 0x00000000 } .mresource public FSharpOptimizationData.Testfunction22g { - // Offset: 0x00000168 Length: 0x00000056 + // Offset: 0x00000178 Length: 0x00000056 +} +.mresource public FSharpOptimizationDataB.Testfunction22g +{ + // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22g.exe -// MVID: {59B19208-CA89-74DB-A745-03830892B159} +// MVID: {5BF2D41D-CA89-74DB-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012F0000 +// Image base: 0x00380000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl index 7fcae895abd..4235854246f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Testfunction22h { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Testfunction22h { - // Offset: 0x00000000 Length: 0x0000015D + // Offset: 0x00000000 Length: 0x00000165 +} +.mresource public FSharpSignatureDataB.Testfunction22h +{ + // Offset: 0x00000170 Length: 0x00000000 } .mresource public FSharpOptimizationData.Testfunction22h { - // Offset: 0x00000168 Length: 0x00000056 + // Offset: 0x00000178 Length: 0x00000056 +} +.mresource public FSharpOptimizationDataB.Testfunction22h +{ + // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22h.exe -// MVID: {59B19208-0266-39F6-A745-03830892B159} +// MVID: {5BF2D41D-0266-39F6-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00370000 +// Image base: 0x02810000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl index 2a64c727d05..8ea2c215ea3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction3 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction3 { - // Offset: 0x00000000 Length: 0x000001FD + // Offset: 0x00000000 Length: 0x00000205 +} +.mresource public FSharpSignatureDataB.TestFunction3 +{ + // Offset: 0x00000210 Length: 0x00000006 } .mresource public FSharpOptimizationData.TestFunction3 { - // Offset: 0x00000208 Length: 0x00000088 + // Offset: 0x00000220 Length: 0x00000088 +} +.mresource public FSharpOptimizationDataB.TestFunction3 +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3.exe -// MVID: {59B19208-663A-8929-A745-03830892B159} +// MVID: {5BF2D41D-663A-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013E0000 +// Image base: 0x00CD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl index 0b9818bebb3..6aa58e66fe0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction4 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction4 { - // Offset: 0x00000000 Length: 0x000001FD + // Offset: 0x00000000 Length: 0x00000205 +} +.mresource public FSharpSignatureDataB.TestFunction4 +{ + // Offset: 0x00000210 Length: 0x00000006 } .mresource public FSharpOptimizationData.TestFunction4 { - // Offset: 0x00000208 Length: 0x00000088 + // Offset: 0x00000220 Length: 0x00000088 +} +.mresource public FSharpOptimizationDataB.TestFunction4 +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction4.exe -// MVID: {59B19208-665B-8929-A745-03830892B159} +// MVID: {5BF2D41D-665B-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026C0000 +// Image base: 0x01460000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl index fb983f1af1e..883487a4db9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction5 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction5 { - // Offset: 0x00000000 Length: 0x000001FD + // Offset: 0x00000000 Length: 0x00000205 +} +.mresource public FSharpSignatureDataB.TestFunction5 +{ + // Offset: 0x00000210 Length: 0x00000006 } .mresource public FSharpOptimizationData.TestFunction5 { - // Offset: 0x00000208 Length: 0x00000088 + // Offset: 0x00000220 Length: 0x00000088 +} +.mresource public FSharpOptimizationDataB.TestFunction5 +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction5.exe -// MVID: {59B19208-6570-8929-A745-03830892B159} +// MVID: {5BF2D41D-6570-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010A0000 +// Image base: 0x013B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl index dcb8a71396b..ac26e0a64b4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly TestFunction6 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000205 } +.mresource public FSharpSignatureDataB.TestFunction6 +{ + // Offset: 0x00000210 Length: 0x00000006 +} .mresource public FSharpOptimizationData.TestFunction6 { - // Offset: 0x00000210 Length: 0x00000088 + // Offset: 0x00000220 Length: 0x00000088 +} +.mresource public FSharpOptimizationDataB.TestFunction6 +{ + // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction6.exe -// MVID: {5B17FC67-6591-8929-A745-038367FC175B} +// MVID: {5BF2D41D-6591-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03360000 +// Image base: 0x014D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl index a9af9b236e4..2a79ad9c582 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction7 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction7 { - // Offset: 0x00000000 Length: 0x000001BF + // Offset: 0x00000000 Length: 0x000001C7 +} +.mresource public FSharpSignatureDataB.TestFunction7 +{ + // Offset: 0x000001D0 Length: 0x00000003 } .mresource public FSharpOptimizationData.TestFunction7 { - // Offset: 0x000001C8 Length: 0x00000070 + // Offset: 0x000001D8 Length: 0x00000070 +} +.mresource public FSharpOptimizationDataB.TestFunction7 +{ + // Offset: 0x00000250 Length: 0x00000000 } .module TestFunction7.exe -// MVID: {59B19208-65AE-8929-A745-03830892B159} +// MVID: {5BF2D41D-65AE-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00E30000 +// Image base: 0x001F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl index 328e4809402..87ff57748b7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction8 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction8 { - // Offset: 0x00000000 Length: 0x000001C8 + // Offset: 0x00000000 Length: 0x000001D0 +} +.mresource public FSharpSignatureDataB.TestFunction8 +{ + // Offset: 0x000001D8 Length: 0x00000003 } .mresource public FSharpOptimizationData.TestFunction8 { - // Offset: 0x000001D0 Length: 0x00000070 + // Offset: 0x000001E0 Length: 0x00000070 +} +.mresource public FSharpOptimizationDataB.TestFunction8 +{ + // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction8.exe -// MVID: {59B19208-65CF-8929-A745-03830892B159} +// MVID: {5BF2D41D-65CF-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01010000 +// Image base: 0x00BE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl index b7e4921fdc3..288186f0a7a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction9 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction9 { - // Offset: 0x00000000 Length: 0x000001D6 + // Offset: 0x00000000 Length: 0x000001DE +} +.mresource public FSharpSignatureDataB.TestFunction9 +{ + // Offset: 0x000001E8 Length: 0x00000003 } .mresource public FSharpOptimizationData.TestFunction9 { - // Offset: 0x000001E0 Length: 0x00000070 + // Offset: 0x000001F0 Length: 0x00000070 +} +.mresource public FSharpOptimizationDataB.TestFunction9 +{ + // Offset: 0x00000268 Length: 0x00000000 } .module TestFunction9.exe -// MVID: {59B19208-64F4-8929-A745-03830892B159} +// MVID: {5BF2D41D-64F4-8929-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x016E0000 +// Image base: 0x018B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl index a4168bde720..928d0446c9f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction9b { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction9b { - // Offset: 0x00000000 Length: 0x000001F6 + // Offset: 0x00000000 Length: 0x000001FE +} +.mresource public FSharpSignatureDataB.TestFunction9b +{ + // Offset: 0x00000208 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction9b { - // Offset: 0x00000200 Length: 0x00000072 + // Offset: 0x00000210 Length: 0x00000072 +} +.mresource public FSharpOptimizationDataB.TestFunction9b +{ + // Offset: 0x00000288 Length: 0x00000000 } .module TestFunction9b.exe -// MVID: {59B19208-A52C-4FC9-A745-03830892B159} +// MVID: {5BF2D41D-A52C-4FC9-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01AA0000 +// Image base: 0x01990000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl index 28857893620..5c7deb8ef58 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction9b1 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction9b1 { - // Offset: 0x00000000 Length: 0x00000208 + // Offset: 0x00000000 Length: 0x00000210 +} +.mresource public FSharpSignatureDataB.TestFunction9b1 +{ + // Offset: 0x00000218 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction9b1 { - // Offset: 0x00000210 Length: 0x00000083 + // Offset: 0x00000220 Length: 0x00000083 +} +.mresource public FSharpOptimizationDataB.TestFunction9b1 +{ + // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b1.exe -// MVID: {59B19208-A406-DAF4-A745-03830892B159} +// MVID: {5BF2D41D-A406-DAF4-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02730000 +// Image base: 0x00FE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl index 005b49c3081..92e4e27cf1f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction9b2 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction9b2 { - // Offset: 0x00000000 Length: 0x00000208 + // Offset: 0x00000000 Length: 0x00000210 +} +.mresource public FSharpSignatureDataB.TestFunction9b2 +{ + // Offset: 0x00000218 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction9b2 { - // Offset: 0x00000210 Length: 0x00000083 + // Offset: 0x00000220 Length: 0x00000083 +} +.mresource public FSharpOptimizationDataB.TestFunction9b2 +{ + // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b2.exe -// MVID: {59B19208-9C0B-E35E-A745-03830892B159} +// MVID: {5BF2D41D-9C0B-E35E-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00730000 +// Image base: 0x01750000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl index dc4f68ffb80..8093ec86471 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TestFunction9b3 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TestFunction9b3 { - // Offset: 0x00000000 Length: 0x00000208 + // Offset: 0x00000000 Length: 0x00000210 +} +.mresource public FSharpSignatureDataB.TestFunction9b3 +{ + // Offset: 0x00000218 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction9b3 { - // Offset: 0x00000210 Length: 0x00000083 + // Offset: 0x00000220 Length: 0x00000083 +} +.mresource public FSharpOptimizationDataB.TestFunction9b3 +{ + // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b3.exe -// MVID: {59B19208-C1A4-612A-A745-03830892B159} +// MVID: {5BF2D41D-C1A4-612A-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x00CE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl index 36d04a11dc5..4608ff9f653 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Tuple01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Tuple01 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Tuple01 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Tuple01 { - // Offset: 0x00000148 Length: 0x0000004E + // Offset: 0x00000158 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Tuple01 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple01.exe -// MVID: {59B19208-6FDB-3E0B-A745-03830892B159} +// MVID: {5BF2D41D-6FDB-3E0B-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl index a668638daa3..78a632b0ac8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Tuple02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Tuple02 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Tuple02 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Tuple02 { - // Offset: 0x00000148 Length: 0x0000004E + // Offset: 0x00000158 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Tuple02 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple02.exe -// MVID: {59B19208-ECCC-7D58-A745-03830892B159} +// MVID: {5BF2D41D-ECCC-7D58-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02C00000 +// Image base: 0x02710000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl index db8af4b0cfa..02cd274bb64 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Tuple03 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Tuple03 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Tuple03 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Tuple03 { - // Offset: 0x00000148 Length: 0x0000004E + // Offset: 0x00000158 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Tuple03 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple03.exe -// MVID: {59B19208-AD65-A299-A745-03830892B159} +// MVID: {5BF2D41D-AD65-A299-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00AF0000 +// Image base: 0x007C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl index a35c62c665d..43955aa0e24 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Tuple04 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Tuple04 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Tuple04 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Tuple04 { - // Offset: 0x00000148 Length: 0x0000004E + // Offset: 0x00000158 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Tuple04 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple04.exe -// MVID: {59B19208-6A2E-9E97-A745-03830892B159} +// MVID: {5BF2D41D-6A2E-9E97-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x001E0000 +// Image base: 0x003A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl index 07388eb7f39..4bb72cb2383 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Tuple05 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Tuple05 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Tuple05 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Tuple05 { - // Offset: 0x00000148 Length: 0x0000004E + // Offset: 0x00000158 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Tuple05 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple05.exe -// MVID: {59B19208-349F-319F-A745-03830892B159} +// MVID: {5BF2D41D-349F-319F-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00730000 +// Image base: 0x02AB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl index adbe519a887..a877051fe59 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Tuple06 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Tuple06 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Tuple06 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Tuple06 { - // Offset: 0x00000148 Length: 0x0000004E + // Offset: 0x00000158 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Tuple06 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple06.exe -// MVID: {59B19208-67E0-4675-A745-03830892B159} +// MVID: {5BF2D41D-67E0-4675-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02A20000 +// Image base: 0x01830000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl index e42f75990a8..ef88d3bc949 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Tuple07 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Tuple07 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Tuple07 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Tuple07 { - // Offset: 0x00000148 Length: 0x0000004E + // Offset: 0x00000158 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Tuple07 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple07.exe -// MVID: {59B19208-7229-962D-A745-03830892B159} +// MVID: {5BF2D41D-7229-962D-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017A0000 +// Image base: 0x00790000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl index d029623cf32..34e71bbe7f0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Tuple08 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Tuple08 { - // Offset: 0x00000000 Length: 0x0000013F + // Offset: 0x00000000 Length: 0x00000147 +} +.mresource public FSharpSignatureDataB.Tuple08 +{ + // Offset: 0x00000150 Length: 0x00000000 } .mresource public FSharpOptimizationData.Tuple08 { - // Offset: 0x00000148 Length: 0x0000004E + // Offset: 0x00000158 Length: 0x0000004E +} +.mresource public FSharpOptimizationDataB.Tuple08 +{ + // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple08.exe -// MVID: {59B19208-E542-67B3-A745-03830892B159} +// MVID: {5BF2D41D-E542-67B3-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00390000 +// Image base: 0x00F60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl index 8feaefd480e..4ce2515f6f0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly TupleElimination { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x00000236 } +.mresource public FSharpSignatureDataB.TupleElimination +{ + // Offset: 0x00000240 Length: 0x00000007 +} .mresource public FSharpOptimizationData.TupleElimination { - // Offset: 0x00000240 Length: 0x0000007B + // Offset: 0x00000250 Length: 0x0000007B +} +.mresource public FSharpOptimizationDataB.TupleElimination +{ + // Offset: 0x000002D0 Length: 0x00000000 } .module TupleElimination.exe -// MVID: {5B17FC67-DFDD-92DF-A745-038367FC175B} +// MVID: {5BF2D41D-DFDD-92DF-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02760000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl index 1626f867b9d..dbd4cd2ae9d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly TupleMonster { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.TupleMonster { - // Offset: 0x00000000 Length: 0x00000149 + // Offset: 0x00000000 Length: 0x00000151 +} +.mresource public FSharpSignatureDataB.TupleMonster +{ + // Offset: 0x00000158 Length: 0x00000000 } .mresource public FSharpOptimizationData.TupleMonster { - // Offset: 0x00000150 Length: 0x00000053 + // Offset: 0x00000160 Length: 0x00000053 +} +.mresource public FSharpOptimizationDataB.TupleMonster +{ + // Offset: 0x000001B8 Length: 0x00000000 } .module TupleMonster.exe -// MVID: {59B19208-1552-41D8-A745-03830892B159} +// MVID: {5BF2D41D-1552-41D8-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010B0000 +// Image base: 0x02FA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl index 768deb722a1..c76f35e9dec 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl @@ -34,20 +34,28 @@ } .mresource public FSharpSignatureData.ValueTupleAliasConstructor { - // Offset: 0x00000000 Length: 0x000001EA + // Offset: 0x00000000 Length: 0x000001EC +} +.mresource public FSharpSignatureDataB.ValueTupleAliasConstructor +{ + // Offset: 0x000001F0 Length: 0x00000002 } .mresource public FSharpOptimizationData.ValueTupleAliasConstructor { - // Offset: 0x000001F0 Length: 0x00000061 + // Offset: 0x000001F8 Length: 0x00000061 +} +.mresource public FSharpOptimizationDataB.ValueTupleAliasConstructor +{ + // Offset: 0x00000260 Length: 0x00000000 } .module ValueTupleAliasConstructor.exe -// MVID: {5B9C53DD-A8CF-BB34-A745-0383DD539C5B} +// MVID: {5BF2D41D-A8CF-BB34-A745-03831DD4F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01B00000 +// Image base: 0x01530000 // =============== CLASS MEMBERS DECLARATION =================== @@ -71,7 +79,7 @@ // Code size 9 (0x9) .maxstack 8 .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' - .line 3,3 : 9,22 'c:\\kevinransom\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\Tuples\\ValueTupleAliasConstructor.fs' + .line 3,3 : 9,22 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\Tuples\\ValueTupleAliasConstructor.fs' IL_0000: ldc.i4.2 IL_0001: ldc.i4.2 IL_0002: newobj instance void valuetype [System.ValueTuple]System.ValueTuple`2::.ctor(!0, From 94745883bca9569f8a97d7baddc849e1e98905a1 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 19 Nov 2018 20:04:35 +0000 Subject: [PATCH 037/137] update test baselines --- .../AsyncExpressionSteppingTest1.il.bsl | 16 +- .../AsyncExpressionSteppingTest2.il.bsl | 62 +- .../AsyncExpressionSteppingTest3.il.bsl | 30 +- .../AsyncExpressionSteppingTest4.il.bsl | 88 +- .../AsyncExpressionSteppingTest5.il.bsl | 108 +- .../AsyncExpressionSteppingTest6.il.bsl | 222 +- .../EmittedIL/AttributeTargets/Default.il.bsl | 8 +- .../EmittedIL/AttributeTargets/Field.il.bsl | 8 +- .../AttributeTargets/Property.il.bsl | 8 +- .../CCtorDUWithMember01.il.bsl | 4 +- .../CCtorDUWithMember02.il.bsl | 4 +- .../CCtorDUWithMember03.il.bsl | 4 +- .../CCtorDUWithMember04.il.bsl | 4 +- .../CompiledNameAttribute01.il.bsl | 4 +- .../CompiledNameAttribute02.il.bsl | 4 +- .../CompiledNameAttribute03.il.bsl | 4 +- .../CompiledNameAttribute04.il.bsl | 4 +- .../ComputationExpr01.il.bsl | 22 +- .../ComputationExpr02.il.bsl | 22 +- .../ComputationExpr03.il.bsl | 88 +- .../ComputationExpr04.il.bsl | 56 +- .../ComputationExpr05.il.bsl | 48 +- .../ComputationExpr06.il.bsl | 80 +- .../ComputationExpr07.il.bsl | 72 +- ...tBoxStruct_ArrayOfArray_CSInterface.il.bsl | 2 +- ...tBoxStruct_ArrayOfArray_FSInterface.il.bsl | 12 +- ..._ArrayOfArray_FSInterface_NoExtMeth.il.bsl | 16 +- .../DoNotBoxStruct_Array_CSInterface.il.bsl | 2 +- .../DoNotBoxStruct_Array_FSInterface.il.bsl | 12 +- ...xStruct_Array_FSInterface_NoExtMeth.il.bsl | 16 +- .../DoNotBoxStruct_MDArray_CSInterface.il.bsl | 2 +- .../DoNotBoxStruct_MDArray_FSInterface.il.bsl | 12 +- ...truct_MDArray_FSInterface_NoExtMeth.il.bsl | 16 +- .../DoNotBoxStruct_NoArray_CSInterface.il.bsl | 2 +- .../DoNotBoxStruct_NoArray_FSInterface.il.bsl | 12 +- ...truct_NoArray_FSInterface_NoExtMeth.il.bsl | 16 +- .../DoNotBoxStruct_ToString.il.bsl | 2 +- .../GeneratedIterators/GenIter01.il.bsl | 76 +- .../GeneratedIterators/GenIter02.il.bsl | 76 +- .../GeneratedIterators/GenIter03.il.bsl | 74 +- .../GeneratedIterators/GenIter04.il.bsl | 82 +- .../InequalityComparison01.il.bsl | 2 +- .../InequalityComparison02.il.bsl | 2 +- .../InequalityComparison03.il.bsl | 2 +- .../InequalityComparison04.il.bsl | 2 +- .../InequalityComparison05.il.bsl | 2 +- .../ListExpressionSteppingTest1.il.bsl | 4 +- .../ListExpressionSteppingTest2.il.bsl | 4 +- .../ListExpressionSteppingTest3.il.bsl | 4 +- .../ListExpressionSteppingTest4.il.bsl | 4 +- .../ListExpressionSteppingTest5.il.bsl | 4 +- .../ListExpressionSteppingTest6.il.bsl | 4 +- .../LiteralValue/LiteralValue.il.bsl | 4 +- ...hodImplAttribute.AggressiveInlining.il.bsl | 4 +- .../MethodImplAttribute.ForwardRef.il.bsl | 4 +- .../MethodImplAttribute.InternalCall.il.bsl | 4 +- .../MethodImplAttribute.NoInlining.il.bsl | 4 +- .../MethodImplAttribute.NoOptimization.il.bsl | 4 +- .../MethodImplAttribute.PreserveSig.il.bsl | 4 +- .../MethodImplAttribute.Synchronized.il.bsl | 4 +- .../MethodImplAttribute.Unmanaged.il.bsl | 4 +- .../EmittedIL/Misc/AbstractClass.il.bsl | 4 +- .../Misc/ArgumentNamesInClosures01.il.bsl | 4 +- .../EmittedIL/Misc/CodeGenRenamings01.il.bsl | 4 +- .../CustomAttributeGenericParameter01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/Decimal01.il.bsl | 4 +- .../EmittedIL/Misc/EntryPoint01.il.bsl | 4 +- .../EmittedIL/Misc/EqualsOnUnions01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/ForLoop01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/ForLoop02.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/ForLoop03.il.bsl | 4 +- .../Misc/GeneralizationOnUnions01.il.bsl | 4 +- .../Misc/GenericTypeStaticField01.il.bsl | 4 +- .../EmittedIL/Misc/IfThenElse01.il.bsl | 4 +- .../EmittedIL/Misc/LetIfThenElse01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/Lock01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/Marshal.il.bsl | 4 +- .../EmittedIL/Misc/MethodImplNoInline.il.bsl | 4 +- .../Misc/MethodImplNoInline02.il.bsl | 4 +- .../Misc/ModuleWithExpression01.il.bsl | 2 +- .../EmittedIL/Misc/NoBoxingOnDispose01.il.bsl | 4 +- .../Misc/NonEscapingArguments02.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/PreserveSig.il.bsl | 4 +- .../EmittedIL/Misc/Seq_for_all01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/Structs01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/Structs02.il.bsl | 4 +- .../Misc/StructsAsArrayElements01.il.bsl | 4 +- .../Misc/TryWith_NoFilterBlocks01.il.bsl | 4 +- .../Source/CodeGen/EmittedIL/Misc/cas.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation01.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation02.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation03.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation04.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation05.il.bsl | 4 +- .../Operators/comparison_decimal01.il.bsl | 4 +- .../Linq101Aggregates01.il.bsl | 1834 ++++++++--------- .../Linq101ElementOperators01.il.bsl | 370 ++-- .../Linq101Grouping01.il.bsl | 370 ++-- .../Linq101Joins01.il.bsl | 314 +-- .../Linq101Ordering01.il.bsl | 480 ++--- .../Linq101Partitioning01.il.bsl | 482 ++--- .../Linq101Quantifiers01.il.bsl | 372 ++-- .../Linq101Select01.il.bsl | 980 ++++----- .../Linq101SetOperators01.il.bsl | 362 ++-- .../Linq101Where01.il.bsl | 296 +-- .../SeqExpressionSteppingTest1.il.bsl | 46 +- .../SeqExpressionSteppingTest2.il.bsl | 50 +- .../SeqExpressionSteppingTest3.il.bsl | 60 +- .../SeqExpressionSteppingTest4.il.bsl | 80 +- .../SeqExpressionSteppingTest5.il.bsl | 94 +- .../SeqExpressionSteppingTest6.il.bsl | 110 +- .../SeqExpressionSteppingTest7.il.bsl | 50 +- .../SeqExpressionTailCalls01.il.bsl | 4 +- .../SeqExpressionTailCalls02.il.bsl | 4 +- .../EmittedIL/StaticInit/LetBinding01.il.bsl | 2 +- .../StaticInit/StaticInit_Class01.il.bsl | 10 +- .../StaticInit/StaticInit_Module01.il.bsl | 20 +- .../StaticInit/StaticInit_Struct01.il.bsl | 10 +- .../SteppingMatch/SteppingMatch01.il.bsl | 2 +- .../SteppingMatch/SteppingMatch02.il.bsl | 2 +- .../SteppingMatch/SteppingMatch03.il.bsl | 2 +- .../SteppingMatch/SteppingMatch04.il.bsl | 2 +- .../SteppingMatch/SteppingMatch05.il.bsl | 2 +- .../SteppingMatch/SteppingMatch06.il.bsl | 2 +- .../SteppingMatch/SteppingMatch07.il.bsl | 2 +- .../SteppingMatch/SteppingMatch08.il.bsl | 2 +- .../SteppingMatch/SteppingMatch09.il.bsl | 56 +- .../EmittedIL/TailCalls/TailCall01.il.bsl | 4 +- .../EmittedIL/TailCalls/TailCall02.il.bsl | 4 +- .../EmittedIL/TailCalls/TailCall03.il.bsl | 4 +- .../EmittedIL/TailCalls/TailCall04.il.bsl | 4 +- .../EmittedIL/TailCalls/TailCall05.il.bsl | 4 +- .../TestFunctions/TestFunction1.il.bsl | 4 +- .../TestFunctions/TestFunction10.il.bsl | 4 +- .../TestFunctions/TestFunction13.il.bsl | 4 +- .../TestFunctions/TestFunction14.il.bsl | 4 +- .../TestFunctions/TestFunction16.il.bsl | 4 +- .../TestFunctions/TestFunction17.il.bsl | 4 +- .../TestFunctions/TestFunction19.il.bsl | 4 +- .../TestFunctions/TestFunction20.il.bsl | 4 +- .../TestFunctions/TestFunction21.il.bsl | 4 +- .../TestFunctions/TestFunction23.il.bsl | 4 +- .../TestFunctions/TestFunction24.il.bsl | 4 +- .../TestFunctions/TestFunction3b.il.bsl | 4 +- .../TestFunctions/TestFunction3c.il.bsl | 4 +- .../TestFunctions/TestFunction9b4.il.bsl | 4 +- .../TestFunctions/Testfunction11.il.bsl | 4 +- .../TestFunctions/Testfunction12.il.bsl | 4 +- .../TestFunctions/Testfunction15.il.bsl | 4 +- .../TestFunctions/Testfunction18.il.bsl | 4 +- .../TestFunctions/Testfunction2.il.bsl | 4 +- .../TestFunctions/Testfunction22.il.bsl | 4 +- .../TestFunctions/Testfunction22b.il.bsl | 4 +- .../TestFunctions/Testfunction22c.il.bsl | 4 +- .../TestFunctions/Testfunction22d.il.bsl | 4 +- .../TestFunctions/Testfunction22e.il.bsl | 4 +- .../TestFunctions/Testfunction22f.il.bsl | 4 +- .../TestFunctions/Testfunction22g.il.bsl | 4 +- .../TestFunctions/Testfunction22h.il.bsl | 4 +- .../TestFunctions/Testfunction3.il.bsl | 4 +- .../TestFunctions/Testfunction4.il.bsl | 4 +- .../TestFunctions/Testfunction5.il.bsl | 4 +- .../TestFunctions/Testfunction6.il.bsl | 4 +- .../TestFunctions/Testfunction7.il.bsl | 4 +- .../TestFunctions/Testfunction8.il.bsl | 4 +- .../TestFunctions/Testfunction9.il.bsl | 4 +- .../TestFunctions/Testfunction9b.il.bsl | 4 +- .../TestFunctions/Testfunction9b1.il.bsl | 4 +- .../TestFunctions/Testfunction9b2.il.bsl | 4 +- .../TestFunctions/Testfunction9b3.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple01.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple02.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple03.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple04.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple05.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple06.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple07.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple08.il.bsl | 4 +- .../EmittedIL/Tuples/TupleElimination.il.bsl | 4 +- .../EmittedIL/Tuples/TupleMonster.il.bsl | 4 +- .../Tuples/ValueTupleAliasConstructor.il.bsl | 4 +- .../fsc/gccerrors/comparer.fsx | 10 +- .../CompilerOptions/fsc/help/comparer.fsx | 59 +- .../fsc/help/help40.437.1033.bsl | 3 +- .../CompilerOptions/fsc/nologo/comparer.fsx | 10 +- .../fsc/nologo/logo.437.1033.bsl | 2 +- .../CompilerOptions/fsi/exename/comparer.fsx | 10 + .../fsi/exename/help40.437.1033.bsl | 1 + .../CompilerOptions/fsi/help/comparer.fsx | 10 +- .../fsi/help/help40-nologo.437.1033.bsl | 5 +- .../fsi/help/help40.437.1033.bsl | 5 +- .../Source/Optimizations/CompareIL.cmd | 7 + .../ForLoop/ForEachOnArray01.il.bsl | 18 +- .../ForLoop/ForEachOnList01.il.bsl | 38 +- .../ForLoop/ForEachOnString01.il.bsl | 38 +- .../ForLoop/NoAllocationOfTuple01.il.bsl | 18 +- .../ForLoop/NoIEnumerable01.il.bsl | 18 +- .../ForLoop/NoIEnumerable02.il.bsl | 18 +- .../ForLoop/NoIEnumerable03.il.bsl | 18 +- .../ForLoop/ZeroToArrLength01.il.bsl | 18 +- .../ForLoop/ZeroToArrLength02.il.bsl | 18 +- .../GenericComparison/Compare01.il.bsl | 18 +- .../GenericComparison/Compare02.il.bsl | 18 +- .../GenericComparison/Compare03.il.bsl | 18 +- .../GenericComparison/Compare04.il.bsl | 18 +- .../GenericComparison/Compare05.il.bsl | 18 +- .../GenericComparison/Compare06.il.bsl | 18 +- .../GenericComparison/Compare07.il.bsl | 18 +- .../GenericComparison/Compare08.il.bsl | 18 +- .../GenericComparison/Compare09.il.bsl | 18 +- .../GenericComparison/Compare10.il.bsl | 18 +- .../GenericComparison/Compare11.il.bsl | 18 +- .../GenericComparison/Equals01.il.bsl | 18 +- .../GenericComparison/Equals02.il.bsl | 24 +- .../GenericComparison/Equals03.il.bsl | 16 +- .../GenericComparison/Equals04.il.bsl | 18 +- .../GenericComparison/Equals05.il.bsl | 18 +- .../GenericComparison/Equals06.il.bsl | 18 +- .../GenericComparison/Equals07.il.bsl | 18 +- .../GenericComparison/Equals08.il.bsl | 18 +- .../GenericComparison/Equals09.il.bsl | 18 +- .../GenericComparison/Hash01.il.bsl | 18 +- .../GenericComparison/Hash02.il.bsl | 18 +- .../GenericComparison/Hash03.il.bsl | 18 +- .../GenericComparison/Hash04.il.bsl | 18 +- .../GenericComparison/Hash05.il.bsl | 18 +- .../GenericComparison/Hash06.il.bsl | 18 +- .../GenericComparison/Hash07.il.bsl | 18 +- .../GenericComparison/Hash08.il.bsl | 18 +- .../GenericComparison/Hash09.il.bsl | 18 +- .../GenericComparison/Hash10.il.bsl | 18 +- .../GenericComparison/Hash11.il.bsl | 18 +- .../GenericComparison/Hash12.il.bsl | 18 +- .../Optimizations/Inlining/Match01.il.bsl | 18 +- .../Optimizations/Inlining/Match02.il.bsl | 16 +- .../Inlining/StructUnion01.il.bsl | 16 +- 236 files changed, 4828 insertions(+), 4418 deletions(-) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl index c859ad798a0..74660c32df2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01170000 +// Image base: 0x02A30000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit f1@6 + .class auto ansi serializable sealed nested assembly beforefieldinit 'f1@6-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/f1@6::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/'f1@6-3'::builder@ IL_000d: ret - } // end of method f1@6::.ctor + } // end of method 'f1@6-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -107,13 +107,13 @@ IL_002a: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_002f: pop IL_0030: ldarg.0 - IL_0031: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/f1@6::builder@ + IL_0031: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/'f1@6-3'::builder@ IL_0036: tail. IL_0038: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Zero() IL_003d: ret - } // end of method f1@6::Invoke + } // end of method 'f1@6-3'::Invoke - } // end of class f1@6 + } // end of class 'f1@6-3' .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f1() cil managed @@ -126,7 +126,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/f1@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/'f1@6-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl index fc590de3ea1..5c5a7277783 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02A10000 +// Image base: 0x02B90000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@6-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@6-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -78,9 +78,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-1'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-16'::x IL_000d: ret - } // end of method 'f2@6-1'::.ctor + } // end of method 'f2@6-16'::.ctor .method public strict virtual instance bool Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -90,16 +90,16 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 6,6 : 23,29 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\AsyncExpressionStepping\\AsyncExpressionSteppingTest2.fs' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-1'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-16'::x IL_0006: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000b: ldc.i4.4 IL_000c: clt IL_000e: ret - } // end of method 'f2@6-1'::Invoke + } // end of method 'f2@6-16'::Invoke - } // end of class 'f2@6-1' + } // end of class 'f2@6-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@7-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@7-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -119,12 +119,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::x IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::builder@ + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::builder@ IL_0014: ret - } // end of method 'f2@7-2'::.ctor + } // end of method 'f2@7-17'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -133,7 +133,7 @@ .maxstack 8 .line 7,7 : 20,26 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::x IL_0006: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000b: nop .line 8,8 : 20,35 '' @@ -142,15 +142,15 @@ IL_0016: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_001b: pop IL_001c: ldarg.0 - IL_001d: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::builder@ + IL_001d: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::builder@ IL_0022: tail. IL_0024: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Zero() IL_0029: ret - } // end of method 'f2@7-2'::Invoke + } // end of method 'f2@7-17'::Invoke - } // end of class 'f2@7-2' + } // end of class 'f2@7-17' - .class auto ansi serializable sealed nested assembly beforefieldinit f2@6 + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@6-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -170,12 +170,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::x IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::builder@ + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::builder@ IL_0014: ret - } // end of method f2@6::.ctor + } // end of method 'f2@6-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -184,26 +184,26 @@ .maxstack 9 .line 6,6 : 17,29 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::builder@ + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::builder@ IL_0006: ldarg.0 - IL_0007: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::x - IL_000c: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0007: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::x + IL_000c: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-16'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0011: ldarg.0 - IL_0012: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::builder@ + IL_0012: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::builder@ IL_0017: ldarg.0 - IL_0018: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::x + IL_0018: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::x IL_001d: ldarg.0 - IL_001e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::builder@ - IL_0023: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_001e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::builder@ + IL_0023: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0028: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002d: tail. IL_002f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::While(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1) IL_0034: ret - } // end of method f2@6::Invoke + } // end of method 'f2@6-15'::Invoke - } // end of class f2@6 + } // end of class 'f2@6-15' .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f2() cil managed @@ -222,8 +222,8 @@ IL_000d: ldloc.1 IL_000e: ldloc.0 IL_000f: ldloc.1 - IL_0010: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0010: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0015: tail. IL_0017: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001c: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl index a94020fe60c..dabfaea9c6f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FC0000 +// Image base: 0x01640000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@10-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@10-37' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public int32 'value' @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-1'::'value' + IL_0008: stfld int32 AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-37'::'value' IL_000d: ret - } // end of method 'f3@10-1'::.ctor + } // end of method 'f3@10-37'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -94,14 +94,14 @@ .line 10,10 : 17,25 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\AsyncExpressionStepping\\AsyncExpressionSteppingTest3.fs' IL_0000: ldarga.s ctxt IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-1'::'value' + IL_0003: ldfld int32 AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-37'::'value' IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1::OnSuccess(!0) IL_000d: ret - } // end of method 'f3@10-1'::Invoke + } // end of method 'f3@10-37'::Invoke - } // end of class 'f3@10-1' + } // end of class 'f3@10-37' - .class auto ansi serializable sealed nested assembly beforefieldinit f3@5 + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@5-36' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -119,9 +119,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/f3@5::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@5-36'::builder@ IL_000d: ret - } // end of method f3@5::.ctor + } // end of method 'f3@5-36'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -158,18 +158,18 @@ IL_0029: stloc.2 .line 10,10 : 17,25 '' IL_002a: ldarg.0 - IL_002b: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/f3@5::builder@ + IL_002b: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@5-36'::builder@ IL_0030: stloc.3 IL_0031: ldloc.2 IL_0032: stloc.s V_4 IL_0034: ldloc.s V_4 - IL_0036: newobj instance void AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-1'::.ctor(int32) + IL_0036: newobj instance void AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-37'::.ctor(int32) IL_003b: tail. IL_003d: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0042: ret - } // end of method f3@5::Invoke + } // end of method 'f3@5-36'::Invoke - } // end of class f3@5 + } // end of class 'f3@5-36' .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f3() cil managed @@ -182,7 +182,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/f3@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@5-36'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl index 9ece3bf8c4a..9ce2db2204d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018B0000 +// Image base: 0x013C0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@10-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@10-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public int32 'value' @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-2'::'value' + IL_0008: stfld int32 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-17'::'value' IL_000d: ret - } // end of method 'f4@10-2'::.ctor + } // end of method 'f4@10-17'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -94,14 +94,14 @@ .line 10,10 : 21,29 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\AsyncExpressionStepping\\AsyncExpressionSteppingTest4.fs' IL_0000: ldarga.s ctxt IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-2'::'value' + IL_0003: ldfld int32 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-17'::'value' IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1::OnSuccess(!0) IL_000d: ret - } // end of method 'f4@10-2'::Invoke + } // end of method 'f4@10-17'::Invoke - } // end of class 'f4@10-2' + } // end of class 'f4@10-17' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@7-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@7-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -121,12 +121,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::x + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::x IL_0014: ret - } // end of method 'f4@7-1'::.ctor + } // end of method 'f4@7-16'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -147,7 +147,7 @@ IL_000d: nop .line 9,9 : 21,36 '' IL_000e: ldarg.0 - IL_000f: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::x + IL_000f: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::x IL_0014: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0019: ldloc.0 IL_001a: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) @@ -155,20 +155,20 @@ IL_0020: stloc.1 .line 10,10 : 21,29 '' IL_0021: ldarg.0 - IL_0022: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::builder@ + IL_0022: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::builder@ IL_0027: stloc.2 IL_0028: ldloc.1 IL_0029: stloc.3 IL_002a: ldloc.3 - IL_002b: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-2'::.ctor(int32) + IL_002b: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-17'::.ctor(int32) IL_0030: tail. IL_0032: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0037: ret - } // end of method 'f4@7-1'::Invoke + } // end of method 'f4@7-16'::Invoke - } // end of class 'f4@7-1' + } // end of class 'f4@7-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@12-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@12-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -183,9 +183,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-3'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-18'::x IL_000d: ret - } // end of method 'f4@12-3'::.ctor + } // end of method 'f4@12-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -194,7 +194,7 @@ .maxstack 8 .line 12,12 : 20,26 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-3'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-18'::x IL_0006: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000b: nop .line 13,13 : 20,34 '' @@ -203,11 +203,11 @@ IL_0016: tail. IL_0018: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_001d: ret - } // end of method 'f4@12-3'::Invoke + } // end of method 'f4@12-18'::Invoke - } // end of class 'f4@12-3' + } // end of class 'f4@12-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@6-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@6-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -230,12 +230,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::compensation + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::compensation IL_0014: ret - } // end of method 'f4@6-4'::.ctor + } // end of method 'f4@6-19'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -245,19 +245,19 @@ .line 6,6 : 17,20 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::compensation + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::compensation IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::TryFinally(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0014: ret - } // end of method 'f4@6-4'::Invoke + } // end of method 'f4@6-19'::Invoke - } // end of class 'f4@6-4' + } // end of class 'f4@6-19' - .class auto ansi serializable sealed nested assembly beforefieldinit f4@5 + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@5-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -275,9 +275,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::builder@ IL_000d: ret - } // end of method f4@5::.ctor + } // end of method 'f4@5-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -294,30 +294,30 @@ IL_0006: stloc.0 .line 6,6 : 17,20 '' IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::builder@ + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::builder@ IL_000d: stloc.1 IL_000e: ldarg.0 - IL_000f: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::builder@ + IL_000f: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::builder@ IL_0014: ldarg.0 - IL_0015: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::builder@ + IL_0015: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::builder@ IL_001a: ldloc.0 - IL_001b: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_001b: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0020: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0025: stloc.2 IL_0026: ldloc.0 - IL_0027: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0027: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_002c: stloc.3 IL_002d: ldloc.2 IL_002e: ldloc.3 - IL_002f: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) + IL_002f: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0034: tail. IL_0036: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_003b: ret - } // end of method f4@5::Invoke + } // end of method 'f4@5-15'::Invoke - } // end of class f4@5 + } // end of class 'f4@5-15' .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f4() cil managed @@ -330,7 +330,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl index 08899741e7c..1c91181a086 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03090000 +// Image base: 0x00C20000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-1'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-19'::builder@ IL_000d: ret - } // end of method 'f7@6-1'::.ctor + } // end of method 'f7@6-19'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg1) cil managed @@ -106,15 +106,15 @@ IL_001c: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_0021: pop IL_0022: ldarg.0 - IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-1'::builder@ + IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-19'::builder@ IL_0028: tail. IL_002a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Zero() IL_002f: ret - } // end of method 'f7@6-1'::Invoke + } // end of method 'f7@6-19'::Invoke - } // end of class 'f7@6-1' + } // end of class 'f7@6-19' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@9-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@9-21' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -132,9 +132,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-21'::builder@ IL_000d: ret - } // end of method 'f7@9-3'::.ctor + } // end of method 'f7@9-21'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg2) cil managed @@ -156,15 +156,15 @@ IL_001c: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_0021: pop IL_0022: ldarg.0 - IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-3'::builder@ + IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-21'::builder@ IL_0028: tail. IL_002a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Zero() IL_002f: ret - } // end of method 'f7@9-3'::Invoke + } // end of method 'f7@9-21'::Invoke - } // end of class 'f7@9-3' + } // end of class 'f7@9-21' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@9-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@9-20' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -182,9 +182,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-2'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-20'::builder@ IL_000d: ret - } // end of method 'f7@9-2'::.ctor + } // end of method 'f7@9-20'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -193,20 +193,20 @@ .maxstack 8 .line 9,9 : 17,31 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-2'::builder@ + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-20'::builder@ IL_0006: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5::get_es() IL_000b: ldarg.0 - IL_000c: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-2'::builder@ - IL_0011: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_000c: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-20'::builder@ + IL_0011: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0016: tail. IL_0018: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::For(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001d: ret - } // end of method 'f7@9-2'::Invoke + } // end of method 'f7@9-20'::Invoke - } // end of class 'f7@9-2' + } // end of class 'f7@9-20' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-22' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation2 @@ -224,9 +224,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-4'::computation2 + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-22'::computation2 IL_000d: ret - } // end of method 'f7@6-4'::.ctor + } // end of method 'f7@6-22'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar0) cil managed @@ -235,13 +235,13 @@ .maxstack 8 .line 6,6 : 17,31 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-4'::computation2 + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-22'::computation2 IL_0006: ret - } // end of method 'f7@6-4'::Invoke + } // end of method 'f7@6-22'::Invoke - } // end of class 'f7@6-4' + } // end of class 'f7@6-22' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-5' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-23' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation1 @@ -264,12 +264,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::computation1 + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::computation1 IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::part2 + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::part2 IL_0014: ret - } // end of method 'f7@6-5'::.ctor + } // end of method 'f7@6-23'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -279,19 +279,19 @@ .line 6,6 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::computation1 + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::computation1 IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::part2 + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::part2 IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f7@6-5'::Invoke + } // end of method 'f7@6-23'::Invoke - } // end of class 'f7@6-5' + } // end of class 'f7@6-23' - .class auto ansi serializable sealed nested assembly beforefieldinit f7@6 + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -309,9 +309,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ IL_000d: ret - } // end of method f7@6::.ctor + } // end of method 'f7@6-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -324,44 +324,44 @@ [3] class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> V_3) .line 6,6 : 17,31 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ IL_0006: stloc.0 IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ IL_000d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5::get_es() IL_0012: ldarg.0 - IL_0013: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ - IL_0018: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0013: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ + IL_0018: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-19'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_001d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::For(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0022: stloc.1 IL_0023: ldarg.0 - IL_0024: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ + IL_0024: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ IL_0029: ldarg.0 - IL_002a: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ - IL_002f: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_002a: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ + IL_002f: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-20'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0034: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0039: stloc.2 IL_003a: ldloc.2 - IL_003b: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1) + IL_003b: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-22'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1) IL_0040: stloc.3 IL_0041: ldloc.1 IL_0042: ldloc.3 - IL_0043: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) + IL_0043: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0048: tail. IL_004a: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_004f: ret - } // end of method f7@6::Invoke + } // end of method 'f7@6-18'::Invoke - } // end of class f7@6 + } // end of class 'f7@6-18' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_es() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$AsyncExpressionSteppingTest5::es@4 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$AsyncExpressionSteppingTest5::'es@4-6' IL_0005: ret } // end of method AsyncExpressionSteppingTest5::get_es @@ -376,7 +376,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret @@ -395,7 +395,7 @@ .class private abstract auto ansi sealed ''.$AsyncExpressionSteppingTest5 extends [mscorlib]System.Object { - .field static assembly initonly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 es@4 + .field static assembly initonly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'es@4-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -421,7 +421,7 @@ IL_0012: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0017: dup - IL_0018: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$AsyncExpressionSteppingTest5::es@4 + IL_0018: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$AsyncExpressionSteppingTest5::'es@4-6' IL_001d: stloc.0 .line 13,13 : 13,43 '' IL_001e: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5::f7() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl index f3d714ff15d..7f22f694cd7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x001E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@10-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@10-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public int32 'value' @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-4'::'value' + IL_0008: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-19'::'value' IL_000d: ret - } // end of method 'f2@10-4'::.ctor + } // end of method 'f2@10-19'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -94,14 +94,14 @@ .line 10,10 : 17,25 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\AsyncExpressionStepping\\AsyncExpressionSteppingTest6.fs' IL_0000: ldarga.s ctxt IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-4'::'value' + IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-19'::'value' IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1::OnSuccess(!0) IL_000d: ret - } // end of method 'f2@10-4'::Invoke + } // end of method 'f2@10-19'::Invoke - } // end of class 'f2@10-4' + } // end of class 'f2@10-19' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@5-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@5-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -119,9 +119,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-18'::builder@ IL_000d: ret - } // end of method 'f2@5-3'::.ctor + } // end of method 'f2@5-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -158,20 +158,20 @@ IL_0029: stloc.2 .line 10,10 : 17,25 '' IL_002a: ldarg.0 - IL_002b: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-3'::builder@ + IL_002b: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-18'::builder@ IL_0030: stloc.3 IL_0031: ldloc.2 IL_0032: stloc.s V_4 IL_0034: ldloc.s V_4 - IL_0036: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-4'::.ctor(int32) + IL_0036: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-19'::.ctor(int32) IL_003b: tail. IL_003d: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0042: ret - } // end of method 'f2@5-3'::Invoke + } // end of method 'f2@5-18'::Invoke - } // end of class 'f2@5-3' + } // end of class 'f2@5-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@20-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@20-43' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public int32 'value' @@ -189,9 +189,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-7'::'value' + IL_0008: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-43'::'value' IL_000d: ret - } // end of method 'f3@20-7'::.ctor + } // end of method 'f3@20-43'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -201,14 +201,14 @@ .line 20,20 : 17,25 '' IL_0000: ldarga.s ctxt IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-7'::'value' + IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-43'::'value' IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1::OnSuccess(!0) IL_000d: ret - } // end of method 'f3@20-7'::Invoke + } // end of method 'f3@20-43'::Invoke - } // end of class 'f3@20-7' + } // end of class 'f3@20-43' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@19-6' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@19-42' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -230,15 +230,15 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::x1 + IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::x1 IL_0014: ldarg.0 IL_0015: ldarg.3 - IL_0016: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::y + IL_0016: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::y IL_001b: ret - } // end of method 'f3@19-6'::.ctor + } // end of method 'f3@19-42'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg4) cil managed @@ -254,9 +254,9 @@ IL_0001: stloc.0 .line 19,19 : 17,37 '' IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::x1 + IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::x1 IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::y + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::y IL_000e: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0013: add IL_0014: ldloc.0 @@ -264,20 +264,20 @@ IL_0016: stloc.1 .line 20,20 : 17,25 '' IL_0017: ldarg.0 - IL_0018: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::builder@ + IL_0018: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::builder@ IL_001d: stloc.2 IL_001e: ldloc.1 IL_001f: stloc.3 IL_0020: ldloc.3 - IL_0021: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-7'::.ctor(int32) + IL_0021: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-43'::.ctor(int32) IL_0026: tail. IL_0028: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_002d: ret - } // end of method 'f3@19-6'::Invoke + } // end of method 'f3@19-42'::Invoke - } // end of class 'f3@19-6' + } // end of class 'f3@19-42' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@18-8' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@18-44' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -300,12 +300,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::binder + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::binder IL_0014: ret - } // end of method 'f3@18-8'::.ctor + } // end of method 'f3@18-44'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -315,19 +315,19 @@ .line 18,18 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::binder + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::binder IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f3@18-8'::Invoke + } // end of method 'f3@18-44'::Invoke - } // end of class 'f3@18-8' + } // end of class 'f3@18-44' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@16-5' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@16-41' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -347,12 +347,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::x1 + IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::x1 IL_0014: ret - } // end of method 'f3@16-5'::.ctor + } // end of method 'f3@16-41'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg3) cil managed @@ -377,31 +377,31 @@ IL_000f: nop .line 18,18 : 17,31 '' IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::builder@ IL_0016: stloc.2 IL_0017: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6::f2() IL_001c: stloc.3 IL_001d: ldarg.0 - IL_001e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::builder@ + IL_001e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::builder@ IL_0023: ldarg.0 - IL_0024: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::x1 + IL_0024: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::x1 IL_0029: ldloc.1 - IL_002a: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, - int32, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_002a: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, + int32, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_002f: stloc.s V_4 IL_0031: ldloc.3 IL_0032: ldloc.s V_4 - IL_0034: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) + IL_0034: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0039: tail. IL_003b: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0040: ret - } // end of method 'f3@16-5'::Invoke + } // end of method 'f3@16-41'::Invoke - } // end of class 'f3@16-5' + } // end of class 'f3@16-41' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@15-9' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@15-45' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -424,12 +424,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::binder + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::binder IL_0014: ret - } // end of method 'f3@15-9'::.ctor + } // end of method 'f3@15-45'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -439,19 +439,19 @@ .line 15,15 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::binder + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::binder IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f3@15-9'::Invoke + } // end of method 'f3@15-45'::Invoke - } // end of class 'f3@15-9' + } // end of class 'f3@15-45' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@15-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@15-40' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -471,12 +471,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::x1 + IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::x1 IL_0014: ret - } // end of method 'f3@15-4'::.ctor + } // end of method 'f3@15-40'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg2) cil managed @@ -492,29 +492,29 @@ IL_0001: stloc.0 .line 15,15 : 17,31 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::builder@ IL_0008: stloc.1 IL_0009: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6::f2() IL_000e: stloc.2 IL_000f: ldarg.0 - IL_0010: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::builder@ + IL_0010: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::builder@ IL_0015: ldarg.0 - IL_0016: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::x1 - IL_001b: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, - int32) + IL_0016: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::x1 + IL_001b: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, + int32) IL_0020: stloc.3 IL_0021: ldloc.2 IL_0022: ldloc.3 - IL_0023: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) + IL_0023: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0028: tail. IL_002a: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_002f: ret - } // end of method 'f3@15-4'::Invoke + } // end of method 'f3@15-40'::Invoke - } // end of class 'f3@15-4' + } // end of class 'f3@15-40' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@14-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@14-46' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -537,12 +537,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::binder + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::binder IL_0014: ret - } // end of method 'f3@14-10'::.ctor + } // end of method 'f3@14-46'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -552,19 +552,19 @@ .line 14,14 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::binder + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::binder IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f3@14-10'::Invoke + } // end of method 'f3@14-46'::Invoke - } // end of class 'f3@14-10' + } // end of class 'f3@14-46' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@14-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@14-39' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -582,9 +582,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-39'::builder@ IL_000d: ret - } // end of method 'f3@14-3'::.ctor + } // end of method 'f3@14-39'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg1) cil managed @@ -600,28 +600,28 @@ IL_0001: stloc.0 .line 14,14 : 17,31 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-39'::builder@ IL_0008: stloc.1 IL_0009: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6::f2() IL_000e: stloc.2 IL_000f: ldarg.0 - IL_0010: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-3'::builder@ + IL_0010: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-39'::builder@ IL_0015: ldloc.0 - IL_0016: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, - int32) + IL_0016: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, + int32) IL_001b: stloc.3 IL_001c: ldloc.2 IL_001d: ldloc.3 - IL_001e: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + IL_001e: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0023: tail. IL_0025: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_002a: ret - } // end of method 'f3@14-3'::Invoke + } // end of method 'f3@14-39'::Invoke - } // end of class 'f3@14-3' + } // end of class 'f3@14-39' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@13-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@13-47' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -644,12 +644,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::binder + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::binder IL_0014: ret - } // end of method 'f3@13-11'::.ctor + } // end of method 'f3@13-47'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -659,19 +659,19 @@ .line 13,13 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::binder + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::binder IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f3@13-11'::Invoke + } // end of method 'f3@13-47'::Invoke - } // end of class 'f3@13-11' + } // end of class 'f3@13-47' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@13-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@13-38' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -689,9 +689,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-2'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-38'::builder@ IL_000d: ret - } // end of method 'f3@13-2'::.ctor + } // end of method 'f3@13-38'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -703,24 +703,24 @@ [2] class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> V_2) .line 13,13 : 17,31 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-2'::builder@ + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-38'::builder@ IL_0006: stloc.0 IL_0007: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6::f2() IL_000c: stloc.1 IL_000d: ldarg.0 - IL_000e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-2'::builder@ - IL_0013: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_000e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-38'::builder@ + IL_0013: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-39'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0018: stloc.2 IL_0019: ldloc.1 IL_001a: ldloc.2 - IL_001b: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + IL_001b: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0020: tail. IL_0022: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0027: ret - } // end of method 'f3@13-2'::Invoke + } // end of method 'f3@13-38'::Invoke - } // end of class 'f3@13-2' + } // end of class 'f3@13-38' .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f2() cil managed @@ -733,7 +733,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret @@ -750,7 +750,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-38'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl index 504d1db21cc..b4cd97e17e5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01750000 +// Image base: 0x006F0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -86,7 +86,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$M::T@12 + IL_0000: ldsfld int32 ''.$M::'T@12-18' IL_0005: ret } // end of method M::get_T @@ -101,7 +101,7 @@ .class private abstract auto ansi sealed ''.$M extends [mscorlib]System.Object { - .field static assembly initonly int32 T@12 + .field static assembly initonly int32 'T@12-18' .custom instance void M/ExportAttribute::.ctor() = ( 01 00 00 00 ) .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ @@ -122,7 +122,7 @@ .line 12,12 : 27,28 '' IL_0010: ldc.i4.1 IL_0011: dup - IL_0012: stsfld int32 ''.$M::T@12 + IL_0012: stsfld int32 ''.$M::'T@12-18' IL_0017: stloc.0 IL_0018: ret } // end of method $M::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl index e3f0e3ce615..d576c428303 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x030E0000 +// Image base: 0x007B0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -86,7 +86,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$M::'T@12-2' + IL_0000: ldsfld int32 ''.$M::'T@12-20' IL_0005: ret } // end of method M::get_T @@ -100,7 +100,7 @@ .class private abstract auto ansi sealed ''.$M extends [mscorlib]System.Object { - .field static assembly initonly int32 'T@12-2' + .field static assembly initonly int32 'T@12-20' .custom instance void M/ExportAttribute::.ctor() = ( 01 00 00 00 ) .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ @@ -121,7 +121,7 @@ .line 12,12 : 27,28 '' IL_0010: ldc.i4.1 IL_0011: dup - IL_0012: stsfld int32 ''.$M::'T@12-2' + IL_0012: stsfld int32 ''.$M::'T@12-20' IL_0017: stloc.0 IL_0018: ret } // end of method $M::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl index ad59fec2f27..910135fd524 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01570000 +// Image base: 0x01250000 // =============== CLASS MEMBERS DECLARATION =================== @@ -86,7 +86,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$M::'T@12-4' + IL_0000: ldsfld int32 ''.$M::'T@12-22' IL_0005: ret } // end of method M::get_T @@ -101,7 +101,7 @@ .class private abstract auto ansi sealed ''.$M extends [mscorlib]System.Object { - .field static assembly initonly int32 'T@12-4' + .field static assembly initonly int32 'T@12-22' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -121,7 +121,7 @@ .line 12,12 : 27,28 '' IL_0010: ldc.i4.1 IL_0011: dup - IL_0012: stsfld int32 ''.$M::'T@12-4' + IL_0012: stsfld int32 ''.$M::'T@12-22' IL_0017: stloc.0 IL_0018: ret } // end of method $M::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl index bc31f32303d..b65e3b0079e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000A40 Length: 0x0000002F } .module CCtorDUWithMember01.exe -// MVID: {5BF2D41B-26F1-14EE-A745-03831BD4F25B} +// MVID: {5BF2DEA9-26F1-14EE-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CF0000 +// Image base: 0x018F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl index da0a3ee6bd3..64223fdce8b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000408 Length: 0x00000000 } .module CCtorDUWithMember02.exe -// MVID: {5BF2D41B-D176-C99D-A745-03831BD4F25B} +// MVID: {5BF2DEA9-D176-C99D-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x019A0000 +// Image base: 0x016A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl index 0791ebcb6e2..a3fc1880e4a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000370 Length: 0x00000000 } .module CCtorDUWithMember03.exe -// MVID: {5BF2D41B-C97B-D207-A745-03831BD4F25B} +// MVID: {5BF2DEA9-C97B-D207-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012D0000 +// Image base: 0x00AF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl index 0479ca6cdd4..fe4c90df41b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000370 Length: 0x00000000 } .module CCtorDUWithMember04.exe -// MVID: {5BF2D41B-CF28-717B-A745-03831BD4F25B} +// MVID: {5BF2DEA9-CF28-717B-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02360000 +// Image base: 0x00300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl index a895fab909b..575e62d5e0f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000318 Length: 0x00000000 } .module CompiledNameAttribute01.exe -// MVID: {5BF2D41B-EF5A-FC2A-A745-03831BD4F25B} +// MVID: {5BF2DEA9-EF5A-FC2A-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00360000 +// Image base: 0x01950000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl index 469669c48d7..3942227ee24 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E8 Length: 0x00000006 } .module CompiledNameAttribute02.exe -// MVID: {5BF2D41B-F755-F3C0-A745-03831BD4F25B} +// MVID: {5BF2DEA9-F755-F3C0-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013E0000 +// Image base: 0x026B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl index 3a08617c25e..725047f0c76 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000328 Length: 0x00000000 } .module CompiledNameAttribute03.exe -// MVID: {5BF2D41B-2CE4-60B9-A745-03831BD4F25B} +// MVID: {5BF2DEA9-2CE4-60B9-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x01620000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl index 8351df5f9a4..eefcad4311e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000010C8 Length: 0x0000004C } .module CompiledNameAttribute04.exe -// MVID: {5BF2D41B-34DF-584F-A745-03831BD4F25B} +// MVID: {5BF2DEA9-34DF-584F-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00690000 +// Image base: 0x009F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl index 09fe9b130a1..6144f7ae6d1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x001E0000 +// Image base: 0x030C0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit res1@8 + .class auto ansi serializable sealed nested assembly beforefieldinit 'res1@8-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/res1@8::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/'res1@8-3'::builder@ IL_000d: ret - } // end of method res1@8::.ctor + } // end of method 'res1@8-3'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -93,21 +93,21 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 8,8 : 9,17 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr01.fs' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/res1@8::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/'res1@8-3'::builder@ IL_0006: ldc.i4.1 IL_0007: tail. IL_0009: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_000e: ret - } // end of method res1@8::Invoke + } // end of method 'res1@8-3'::Invoke - } // end of class res1@8 + } // end of class 'res1@8-3' .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res1() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr01::res1@6 + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr01::'res1@6-22' IL_0005: ret } // end of method ComputationExpr01::get_res1 @@ -122,7 +122,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr01 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res1@6 + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res1@6-22' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -140,10 +140,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr01/res1@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr01/'res1@8-3'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr01::res1@6 + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr01::'res1@6-22' IL_0018: stloc.0 .line 10,10 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr01::get_res1() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl index 9117d6d0521..788ca1397ae 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C80000 +// Image base: 0x02CA0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit res2@8 + .class auto ansi serializable sealed nested assembly beforefieldinit 'res2@8-6' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr02/res2@8::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr02/'res2@8-6'::builder@ IL_000d: ret - } // end of method res2@8::.ctor + } // end of method 'res2@8-6'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -103,23 +103,23 @@ IL_001a: stloc.0 .line 9,9 : 9,21 '' IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr02/res2@8::builder@ + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr02/'res2@8-6'::builder@ IL_0021: ldloc.0 IL_0022: ldloc.0 IL_0023: add IL_0024: tail. IL_0026: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_002b: ret - } // end of method res2@8::Invoke + } // end of method 'res2@8-6'::Invoke - } // end of class res2@8 + } // end of class 'res2@8-6' .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res2() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr02::res2@6 + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr02::'res2@6-28' IL_0005: ret } // end of method ComputationExpr02::get_res2 @@ -134,7 +134,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr02 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res2@6 + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res2@6-28' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -152,10 +152,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr02/res2@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr02/'res2@8-6'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr02::res2@6 + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr02::'res2@6-28' IL_0018: stloc.0 .line 10,10 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr02::get_res2() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl index cb24e6563c6..eb12fe63cbd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x008E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res2@8-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res2@8-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res2@8-1'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res2@8-7'::builder@ IL_000d: ret - } // end of method 'res2@8-1'::.ctor + } // end of method 'res2@8-7'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -103,18 +103,18 @@ IL_001a: stloc.0 .line 9,9 : 9,21 '' IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res2@8-1'::builder@ + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res2@8-7'::builder@ IL_0021: ldloc.0 IL_0022: ldloc.0 IL_0023: add IL_0024: tail. IL_0026: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_002b: ret - } // end of method 'res2@8-1'::Invoke + } // end of method 'res2@8-7'::Invoke - } // end of class 'res2@8-1' + } // end of class 'res2@8-7' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@17-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@17-14' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -132,9 +132,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@17-2'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@17-14'::builder@ IL_000d: ret - } // end of method 'res3@17-2'::.ctor + } // end of method 'res3@17-14'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -153,16 +153,16 @@ IL_001a: stloc.0 .line 18,18 : 17,25 '' IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@17-2'::builder@ + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@17-14'::builder@ IL_0021: ldc.i4.1 IL_0022: tail. IL_0024: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_0029: ret - } // end of method 'res3@17-2'::Invoke + } // end of method 'res3@17-14'::Invoke - } // end of class 'res3@17-2' + } // end of class 'res3@17-14' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@20-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@20-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -180,9 +180,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@20-3'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@20-15'::builder@ IL_000d: ret - } // end of method 'res3@20-3'::.ctor + } // end of method 'res3@20-15'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(int32 _arg2) cil managed @@ -195,16 +195,16 @@ IL_0001: stloc.0 .line 20,20 : 9,17 '' IL_0002: ldarg.0 - IL_0003: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@20-3'::builder@ + IL_0003: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@20-15'::builder@ IL_0008: ldc.i4.1 IL_0009: tail. IL_000b: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_0010: ret - } // end of method 'res3@20-3'::Invoke + } // end of method 'res3@20-15'::Invoke - } // end of class 'res3@20-3' + } // end of class 'res3@20-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@15-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@15-13' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -222,9 +222,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-1'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-13'::builder@ IL_000d: ret - } // end of method 'res3@15-1'::.ctor + } // end of method 'res3@15-13'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(int32 _arg1) cil managed @@ -238,25 +238,25 @@ IL_0001: stloc.0 .line 15,19 : 9,14 '' IL_0002: ldarg.0 - IL_0003: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-1'::builder@ + IL_0003: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-13'::builder@ IL_0008: call class [ComputationExprLibrary]Library.EventuallyBuilder [ComputationExprLibrary]Library.TheEventuallyBuilder::get_eventually() IL_000d: stloc.1 IL_000e: ldloc.1 IL_000f: ldloc.1 - IL_0010: newobj instance void ComputationExpr03/'res3@17-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0010: newobj instance void ComputationExpr03/'res3@17-14'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0015: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001a: ldarg.0 - IL_001b: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-1'::builder@ - IL_0020: newobj instance void ComputationExpr03/'res3@20-3'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_001b: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-13'::builder@ + IL_0020: newobj instance void ComputationExpr03/'res3@20-15'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0025: tail. IL_0027: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Bind(class [ComputationExprLibrary]Library.Eventually`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'res3@15-1'::Invoke + } // end of method 'res3@15-13'::Invoke - } // end of class 'res3@15-1' + } // end of class 'res3@15-13' - .class auto ansi serializable sealed nested assembly beforefieldinit res3@14 + .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@14-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -274,9 +274,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/res3@14::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@14-12'::builder@ IL_000d: ret - } // end of method res3@14::.ctor + } // end of method 'res3@14-12'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -285,25 +285,25 @@ .maxstack 8 .line 14,14 : 9,23 '' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/res3@14::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@14-12'::builder@ IL_0006: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr03::get_res2() IL_000b: ldarg.0 - IL_000c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/res3@14::builder@ - IL_0011: newobj instance void ComputationExpr03/'res3@15-1'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_000c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@14-12'::builder@ + IL_0011: newobj instance void ComputationExpr03/'res3@15-13'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0016: tail. IL_0018: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Bind(class [ComputationExprLibrary]Library.Eventually`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001d: ret - } // end of method res3@14::Invoke + } // end of method 'res3@14-12'::Invoke - } // end of class res3@14 + } // end of class 'res3@14-12' .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res2() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res2@6-2' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res2@6-30' IL_0005: ret } // end of method ComputationExpr03::get_res2 @@ -312,7 +312,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::res3@12 + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res3@12-6' IL_0005: ret } // end of method ComputationExpr03::get_res3 @@ -333,9 +333,9 @@ .class private abstract auto ansi sealed ''.$ComputationExpr03 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res2@6-2' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res2@6-30' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res3@12 + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res3@12-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -355,10 +355,10 @@ IL_0005: stloc.2 IL_0006: ldloc.2 IL_0007: ldloc.2 - IL_0008: newobj instance void ComputationExpr03/'res2@8-1'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr03/'res2@8-7'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res2@6-2' + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res2@6-30' IL_0018: stloc.0 .line 10,10 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr03::get_res2() @@ -368,10 +368,10 @@ IL_0029: stloc.3 IL_002a: ldloc.3 IL_002b: ldloc.3 - IL_002c: newobj instance void ComputationExpr03/res3@14::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_002c: newobj instance void ComputationExpr03/'res3@14-12'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0031: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0036: dup - IL_0037: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::res3@12 + IL_0037: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res3@12-6' IL_003c: stloc.1 .line 22,22 : 1,26 '' IL_003d: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr03::get_res3() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl index cb7eb4731fb..9b59927709d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x032C0000 +// Image base: 0x01A20000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@7-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@7-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@7-1'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@7-10'::builder@ IL_000d: ret - } // end of method 'res4@7-1'::.ctor + } // end of method 'res4@7-10'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -119,16 +119,16 @@ IL_0033: pop .line 9,9 : 13,21 '' IL_0034: ldarg.0 - IL_0035: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@7-1'::builder@ + IL_0035: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@7-10'::builder@ IL_003a: ldloc.0 IL_003b: tail. IL_003d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_0042: ret - } // end of method 'res4@7-1'::Invoke + } // end of method 'res4@7-10'::Invoke - } // end of class 'res4@7-1' + } // end of class 'res4@7-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@6-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@6-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -146,9 +146,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-2'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-11'::builder@ IL_000d: ret - } // end of method 'res4@6-2'::.ctor + } // end of method 'res4@6-11'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [mscorlib]System.Exception _arg1) cil managed @@ -173,16 +173,16 @@ IL_001d: stloc.1 .line 12,12 : 13,21 '' IL_001e: ldarg.0 - IL_001f: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-2'::builder@ + IL_001f: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-11'::builder@ IL_0024: ldloc.1 IL_0025: tail. IL_0027: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_002c: ret - } // end of method 'res4@6-2'::Invoke + } // end of method 'res4@6-11'::Invoke - } // end of class 'res4@6-2' + } // end of class 'res4@6-11' - .class auto ansi serializable sealed nested assembly beforefieldinit res4@6 + .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@6-9' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -200,9 +200,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ IL_000d: ret - } // end of method res4@6::.ctor + } // end of method 'res4@6-9'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -211,30 +211,30 @@ .maxstack 8 .line 6,6 : 9,12 '' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ IL_0006: ldarg.0 - IL_0007: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ + IL_0007: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ IL_000c: ldarg.0 - IL_000d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ - IL_0012: newobj instance void ComputationExpr04/'res4@7-1'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_000d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ + IL_0012: newobj instance void ComputationExpr04/'res4@7-10'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0017: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001c: ldarg.0 - IL_001d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ - IL_0022: newobj instance void ComputationExpr04/'res4@6-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_001d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ + IL_0022: newobj instance void ComputationExpr04/'res4@6-11'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0027: tail. IL_0029: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::TryWith(class [ComputationExprLibrary]Library.Eventually`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002e: ret - } // end of method res4@6::Invoke + } // end of method 'res4@6-9'::Invoke - } // end of class res4@6 + } // end of class 'res4@6-9' .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res4() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr04::res4@4 + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr04::'res4@4-6' IL_0005: ret } // end of method ComputationExpr04::get_res4 @@ -249,7 +249,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr04 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res4@4 + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res4@4-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -267,10 +267,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr04/res4@6::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr04/'res4@6-9'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr04::res4@4 + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr04::'res4@4-6' IL_0018: stloc.0 .line 14,14 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr04::get_res4() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl index 0e25abf7e10..fe605a1c581 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C90000 +// Image base: 0x01430000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'res5@9-1' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'res5@9-10' extends [mscorlib]System.Object implements [mscorlib]System.IDisposable { @@ -78,7 +78,7 @@ IL_0006: ldarg.0 IL_0007: pop IL_0008: ret - } // end of method 'res5@9-1'::.ctor + } // end of method 'res5@9-10'::.ctor .method private hidebysig newslot virtual final instance void 'System-IDisposable-Dispose'() cil managed @@ -89,11 +89,11 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 9,9 : 68,70 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr05.fs' IL_0000: ret - } // end of method 'res5@9-1'::'System-IDisposable-Dispose' + } // end of method 'res5@9-10'::'System-IDisposable-Dispose' - } // end of class 'res5@9-1' + } // end of class 'res5@9-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res5@10-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res5@10-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -111,9 +111,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@10-2'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@10-11'::builder@ IL_000d: ret - } // end of method 'res5@10-2'::.ctor + } // end of method 'res5@10-11'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [mscorlib]System.IDisposable _arg1) cil managed @@ -138,16 +138,16 @@ IL_001d: stloc.1 .line 11,11 : 9,17 '' IL_001e: ldarg.0 - IL_001f: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@10-2'::builder@ + IL_001f: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@10-11'::builder@ IL_0024: ldc.i4.1 IL_0025: tail. IL_0027: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_002c: ret - } // end of method 'res5@10-2'::Invoke + } // end of method 'res5@10-11'::Invoke - } // end of class 'res5@10-2' + } // end of class 'res5@10-11' - .class auto ansi serializable sealed nested assembly beforefieldinit res5@8 + .class auto ansi serializable sealed nested assembly beforefieldinit 'res5@8-9' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -165,9 +165,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/res5@8::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@8-9'::builder@ IL_000d: ret - } // end of method res5@8::.ctor + } // end of method 'res5@8-9'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -186,25 +186,25 @@ IL_001a: stloc.0 .line 9,9 : 17,72 '' IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/res5@8::builder@ - IL_0021: newobj instance void ComputationExpr05/'res5@9-1'::.ctor() + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@8-9'::builder@ + IL_0021: newobj instance void ComputationExpr05/'res5@9-10'::.ctor() IL_0026: ldarg.0 - IL_0027: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/res5@8::builder@ - IL_002c: newobj instance void ComputationExpr05/'res5@10-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0027: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@8-9'::builder@ + IL_002c: newobj instance void ComputationExpr05/'res5@10-11'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0031: tail. IL_0033: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Using(class [mscorlib]System.IDisposable, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0038: ret - } // end of method res5@8::Invoke + } // end of method 'res5@8-9'::Invoke - } // end of class res5@8 + } // end of class 'res5@8-9' .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res5() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr05::res5@6 + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr05::'res5@6-6' IL_0005: ret } // end of method ComputationExpr05::get_res5 @@ -219,7 +219,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr05 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res5@6 + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res5@6-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -237,10 +237,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr05/res5@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr05/'res5@8-9'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr05::res5@6 + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr05::'res5@6-6' IL_0018: stloc.0 .line 13,13 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr05::get_res5() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl index bcfe1f6e811..ef90e20f095 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CF0000 +// Image base: 0x00AE0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@9-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@9-13' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -78,9 +78,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-1'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-13'::x IL_000d: ret - } // end of method 'res6@9-1'::.ctor + } // end of method 'res6@9-13'::.ctor .method public strict virtual instance bool Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -90,16 +90,16 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 9,9 : 15,21 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr06.fs' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-1'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-13'::x IL_0006: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000b: ldc.i4.0 IL_000c: cgt IL_000e: ret - } // end of method 'res6@9-1'::Invoke + } // end of method 'res6@9-13'::Invoke - } // end of class 'res6@9-1' + } // end of class 'res6@9-13' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@10-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@10-14' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -119,12 +119,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@10-2'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@10-14'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@10-2'::x + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@10-14'::x IL_0014: ret - } // end of method 'res6@10-2'::.ctor + } // end of method 'res6@10-14'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -158,19 +158,19 @@ IL_004f: pop .line 15,15 : 13,19 '' IL_0050: ldarg.0 - IL_0051: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@10-2'::x + IL_0051: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@10-14'::x IL_0056: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Decrement(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_005b: nop IL_005c: ldarg.0 - IL_005d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@10-2'::builder@ + IL_005d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@10-14'::builder@ IL_0062: tail. IL_0064: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Zero() IL_0069: ret - } // end of method 'res6@10-2'::Invoke + } // end of method 'res6@10-14'::Invoke - } // end of class 'res6@10-2' + } // end of class 'res6@10-14' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@16-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@16-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -188,9 +188,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@16-3'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@16-15'::builder@ IL_000d: ret - } // end of method 'res6@16-3'::.ctor + } // end of method 'res6@16-15'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -199,16 +199,16 @@ .maxstack 8 .line 16,16 : 9,17 '' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@16-3'::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@16-15'::builder@ IL_0006: ldc.i4.1 IL_0007: tail. IL_0009: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_000e: ret - } // end of method 'res6@16-3'::Invoke + } // end of method 'res6@16-15'::Invoke - } // end of class 'res6@16-3' + } // end of class 'res6@16-15' - .class auto ansi serializable sealed nested assembly beforefieldinit res6@8 + .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@8-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -226,9 +226,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ IL_000d: ret - } // end of method res6@8::.ctor + } // end of method 'res6@8-12'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -242,41 +242,41 @@ IL_0006: stloc.0 .line 9,9 : 9,21 '' IL_0007: ldarg.0 - IL_0008: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ + IL_0008: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ IL_000d: ldarg.0 - IL_000e: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ + IL_000e: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ IL_0013: ldloc.0 - IL_0014: newobj instance void ComputationExpr06/'res6@9-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0014: newobj instance void ComputationExpr06/'res6@9-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0019: ldarg.0 - IL_001a: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ + IL_001a: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ IL_001f: ldarg.0 - IL_0020: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ + IL_0020: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ IL_0025: ldloc.0 - IL_0026: newobj instance void ComputationExpr06/'res6@10-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0026: newobj instance void ComputationExpr06/'res6@10-14'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_002b: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0030: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::While(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [ComputationExprLibrary]Library.Eventually`1) IL_0035: ldarg.0 - IL_0036: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ + IL_0036: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ IL_003b: ldarg.0 - IL_003c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ - IL_0041: newobj instance void ComputationExpr06/'res6@16-3'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_003c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ + IL_0041: newobj instance void ComputationExpr06/'res6@16-15'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0046: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_004b: tail. IL_004d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Combine(class [ComputationExprLibrary]Library.Eventually`1, class [ComputationExprLibrary]Library.Eventually`1) IL_0052: ret - } // end of method res6@8::Invoke + } // end of method 'res6@8-12'::Invoke - } // end of class res6@8 + } // end of class 'res6@8-12' .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res6() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr06::res6@6 + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr06::'res6@6-6' IL_0005: ret } // end of method ComputationExpr06::get_res6 @@ -291,7 +291,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr06 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res6@6 + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res6@6-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -309,10 +309,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr06/res6@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr06/'res6@8-12'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr06::res6@6 + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr06::'res6@6-6' IL_0018: stloc.0 .line 18,18 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr06::get_res6() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl index 25db98d4691..67b90acc1cd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00AC0000 +// Image base: 0x00500000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@9-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@9-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -83,12 +83,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@9-1'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@9-10'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-1'::x + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-10'::x IL_0014: ret - } // end of method 'res7@9-1'::.ctor + } // end of method 'res7@9-10'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(int32 _arg1) cil managed @@ -102,9 +102,9 @@ IL_0001: stloc.0 .line 10,10 : 13,24 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-1'::x + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-10'::x IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-1'::x + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-10'::x IL_000e: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0013: ldloc.0 IL_0014: sub @@ -112,15 +112,15 @@ !!0) IL_001a: nop IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@9-1'::builder@ + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@9-10'::builder@ IL_0021: tail. IL_0023: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Zero() IL_0028: ret - } // end of method 'res7@9-1'::Invoke + } // end of method 'res7@9-10'::Invoke - } // end of class 'res7@9-1' + } // end of class 'res7@9-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@11-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@11-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -140,12 +140,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@11-2'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@11-11'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@11-2'::x + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@11-11'::x IL_0014: ret - } // end of method 'res7@11-2'::.ctor + } // end of method 'res7@11-11'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -154,18 +154,18 @@ .maxstack 8 .line 11,11 : 9,18 '' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@11-2'::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@11-11'::builder@ IL_0006: ldarg.0 - IL_0007: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@11-2'::x + IL_0007: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@11-11'::x IL_000c: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0011: tail. IL_0013: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_0018: ret - } // end of method 'res7@11-2'::Invoke + } // end of method 'res7@11-11'::Invoke - } // end of class 'res7@11-2' + } // end of class 'res7@11-11' - .class auto ansi serializable sealed nested assembly beforefieldinit res7@8 + .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@8-9' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -183,9 +183,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ IL_000d: ret - } // end of method res7@8::.ctor + } // end of method 'res7@8-9'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -199,9 +199,9 @@ IL_0006: stloc.0 .line 9,9 : 9,29 '' IL_0007: ldarg.0 - IL_0008: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ + IL_0008: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ IL_000d: ldarg.0 - IL_000e: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ + IL_000e: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ IL_0013: ldc.i4.0 IL_0014: ldc.i4.1 IL_0015: ldc.i4.3 @@ -211,34 +211,34 @@ IL_001b: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::CreateSequence(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0020: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0025: ldarg.0 - IL_0026: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ + IL_0026: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ IL_002b: ldloc.0 - IL_002c: newobj instance void ComputationExpr07/'res7@9-1'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_002c: newobj instance void ComputationExpr07/'res7@9-10'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0031: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::For(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0036: ldarg.0 - IL_0037: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ + IL_0037: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ IL_003c: ldarg.0 - IL_003d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ + IL_003d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ IL_0042: ldloc.0 - IL_0043: newobj instance void ComputationExpr07/'res7@11-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0043: newobj instance void ComputationExpr07/'res7@11-11'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0048: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_004d: tail. IL_004f: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Combine(class [ComputationExprLibrary]Library.Eventually`1, class [ComputationExprLibrary]Library.Eventually`1) IL_0054: ret - } // end of method res7@8::Invoke + } // end of method 'res7@8-9'::Invoke - } // end of class res7@8 + } // end of class 'res7@8-9' .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res7() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr07::res7@6 + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr07::'res7@6-6' IL_0005: ret } // end of method ComputationExpr07::get_res7 @@ -253,7 +253,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr07 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res7@6 + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res7@6-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -271,10 +271,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr07/res7@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr07/'res7@8-9'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr07::res7@6 + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr07::'res7@6-6' IL_0018: stloc.0 .line 13,13 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr07::get_res7() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl index 6316ec52153..9c2fb69bc0d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00730000 +// Image base: 0x00860000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl index 7afa0c80702..d30b72bab25 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00A10000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-28' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'F@5-4'::.ctor + } // end of method 'F@5-28'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(int32 x) cil managed @@ -83,9 +83,9 @@ .line 5,5 : 71,73 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\DoNotBoxStruct\\DoNotBoxStruct_ArrayOfArray_FSInterface.fs' IL_0000: ldnull IL_0001: ret - } // end of method 'F@5-4'::Invoke + } // end of method 'F@5-28'::Invoke - } // end of class 'F@5-4' + } // end of class 'F@5-28' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[][] x) cil managed { @@ -99,7 +99,7 @@ IL_0008: ldelem !!T IL_000d: box !!T IL_0012: unbox.any class [mscorlib]System.IObservable`1 - IL_0017: newobj instance void DoNotBoxStruct_ArrayOfArray_FSInterface/'F@5-4'::.ctor() + IL_0017: newobj instance void DoNotBoxStruct_ArrayOfArray_FSInterface/'F@5-28'::.ctor() IL_001c: tail. IL_001e: call void [FSharp.Core]Microsoft.FSharp.Control.CommonExtensions::AddToObservable(class [mscorlib]System.IObservable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl index 7d97378763a..9610bb6de4d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C50000 +// Image base: 0x01630000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname F@6 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-24' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -71,7 +71,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method F@6::.ctor + } // end of method 'F@6-24'::.ctor .method assembly hidebysig instance void Invoke(object x, @@ -86,9 +86,9 @@ IL_0001: stloc.0 .line 6,6 : 80,82 '' IL_0002: ret - } // end of method F@6::Invoke + } // end of method 'F@6-24'::Invoke - } // end of class F@6 + } // end of class 'F@6-24' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[][] x) cil managed { @@ -101,9 +101,9 @@ IL_0007: ldc.i4.0 IL_0008: readonly. IL_000a: ldelema !!T - IL_000f: newobj instance void DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth/F@6::.ctor() - IL_0014: ldftn instance void DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth/F@6::Invoke(object, - int32) + IL_000f: newobj instance void DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth/'F@6-24'::.ctor() + IL_0014: ldftn instance void DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth/'F@6-24'::Invoke(object, + int32) IL_001a: newobj instance void class [FSharp.Core]Microsoft.FSharp.Control.FSharpHandler`1::.ctor(object, native int) IL_001f: constrained. !!T diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl index 4edad8cbffc..af6de48929d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03160000 +// Image base: 0x01940000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl index 8de966720e0..59fe06dbe43 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C50000 +// Image base: 0x02930000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-5' + .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-29' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'F@5-5'::.ctor + } // end of method 'F@5-29'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(int32 x) cil managed @@ -83,9 +83,9 @@ .line 5,5 : 65,67 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\DoNotBoxStruct\\DoNotBoxStruct_Array_FSInterface.fs' IL_0000: ldnull IL_0001: ret - } // end of method 'F@5-5'::Invoke + } // end of method 'F@5-29'::Invoke - } // end of class 'F@5-5' + } // end of class 'F@5-29' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[] x) cil managed { @@ -97,7 +97,7 @@ IL_0002: ldelem !!T IL_0007: box !!T IL_000c: unbox.any class [mscorlib]System.IObservable`1 - IL_0011: newobj instance void DoNotBoxStruct_Array_FSInterface/'F@5-5'::.ctor() + IL_0011: newobj instance void DoNotBoxStruct_Array_FSInterface/'F@5-29'::.ctor() IL_0016: tail. IL_0018: call void [FSharp.Core]Microsoft.FSharp.Control.CommonExtensions::AddToObservable(class [mscorlib]System.IObservable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl index f350407b675..2902d707b16 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012C0000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-1' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-25' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -71,7 +71,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'F@6-1'::.ctor + } // end of method 'F@6-25'::.ctor .method assembly hidebysig instance void Invoke(object x, @@ -86,9 +86,9 @@ IL_0001: stloc.0 .line 6,6 : 74,76 '' IL_0002: ret - } // end of method 'F@6-1'::Invoke + } // end of method 'F@6-25'::Invoke - } // end of class 'F@6-1' + } // end of class 'F@6-25' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[] x) cil managed { @@ -99,9 +99,9 @@ IL_0001: ldc.i4.0 IL_0002: readonly. IL_0004: ldelema !!T - IL_0009: newobj instance void DoNotBoxStruct_Array_FSInterface_NoExtMeth/'F@6-1'::.ctor() - IL_000e: ldftn instance void DoNotBoxStruct_Array_FSInterface_NoExtMeth/'F@6-1'::Invoke(object, - int32) + IL_0009: newobj instance void DoNotBoxStruct_Array_FSInterface_NoExtMeth/'F@6-25'::.ctor() + IL_000e: ldftn instance void DoNotBoxStruct_Array_FSInterface_NoExtMeth/'F@6-25'::Invoke(object, + int32) IL_0014: newobj instance void class [FSharp.Core]Microsoft.FSharp.Control.FSharpHandler`1::.ctor(object, native int) IL_0019: constrained. !!T diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl index bd321304efe..53f46440766 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x00C40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl index 5dcd9ff2d28..61ef3b223cc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CB0000 +// Image base: 0x01640000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-6' + .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-30' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'F@5-6'::.ctor + } // end of method 'F@5-30'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(int32 x) cil managed @@ -83,9 +83,9 @@ .line 5,5 : 68,70 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\DoNotBoxStruct\\DoNotBoxStruct_MDArray_FSInterface.fs' IL_0000: ldnull IL_0001: ret - } // end of method 'F@5-6'::Invoke + } // end of method 'F@5-30'::Invoke - } // end of class 'F@5-6' + } // end of class 'F@5-30' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[0...,0...] x) cil managed { @@ -99,7 +99,7 @@ int32) IL_0008: box !!T IL_000d: unbox.any class [mscorlib]System.IObservable`1 - IL_0012: newobj instance void DoNotBoxStruct_MDArray_FSInterface/'F@5-6'::.ctor() + IL_0012: newobj instance void DoNotBoxStruct_MDArray_FSInterface/'F@5-30'::.ctor() IL_0017: tail. IL_0019: call void [FSharp.Core]Microsoft.FSharp.Control.CommonExtensions::AddToObservable(class [mscorlib]System.IObservable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl index 48715a6f6a4..e87c74bf321 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01190000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-2' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-26' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -71,7 +71,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'F@6-2'::.ctor + } // end of method 'F@6-26'::.ctor .method assembly hidebysig instance void Invoke(object x, @@ -86,9 +86,9 @@ IL_0001: stloc.0 .line 6,6 : 77,79 '' IL_0002: ret - } // end of method 'F@6-2'::Invoke + } // end of method 'F@6-26'::Invoke - } // end of class 'F@6-2' + } // end of class 'F@6-26' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[0...,0...] x) cil managed { @@ -101,9 +101,9 @@ IL_0003: readonly. IL_0005: call instance !!T& !!T[0...,0...]::Address(int32, int32) - IL_000a: newobj instance void DoNotBoxStruct_MDArray_FSInterface_NoExtMeth/'F@6-2'::.ctor() - IL_000f: ldftn instance void DoNotBoxStruct_MDArray_FSInterface_NoExtMeth/'F@6-2'::Invoke(object, - int32) + IL_000a: newobj instance void DoNotBoxStruct_MDArray_FSInterface_NoExtMeth/'F@6-26'::.ctor() + IL_000f: ldftn instance void DoNotBoxStruct_MDArray_FSInterface_NoExtMeth/'F@6-26'::Invoke(object, + int32) IL_0015: newobj instance void class [FSharp.Core]Microsoft.FSharp.Control.FSharpHandler`1::.ctor(object, native int) IL_001a: constrained. !!T diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl index 03e382c3731..bc12a2a7b08 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FF0000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl index 80340df53ed..30e19f7dd58 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007B0000 +// Image base: 0x00A50000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-31' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'F@5-7'::.ctor + } // end of method 'F@5-31'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(int32 x) cil managed @@ -83,9 +83,9 @@ .line 5,5 : 59,61 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\DoNotBoxStruct\\DoNotBoxStruct_NoArray_FSInterface.fs' IL_0000: ldnull IL_0001: ret - } // end of method 'F@5-7'::Invoke + } // end of method 'F@5-31'::Invoke - } // end of class 'F@5-7' + } // end of class 'F@5-31' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T x) cil managed { @@ -95,7 +95,7 @@ IL_0000: ldarg.0 IL_0001: box !!T IL_0006: unbox.any class [mscorlib]System.IObservable`1 - IL_000b: newobj instance void DoNotBoxStruct_NoArray_FSInterface/'F@5-7'::.ctor() + IL_000b: newobj instance void DoNotBoxStruct_NoArray_FSInterface/'F@5-31'::.ctor() IL_0010: tail. IL_0012: call void [FSharp.Core]Microsoft.FSharp.Control.CommonExtensions::AddToObservable(class [mscorlib]System.IObservable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl index 3e56ad8ce0c..2b510a563d5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01350000 +// Image base: 0x00C60000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-27' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -71,7 +71,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'F@6-3'::.ctor + } // end of method 'F@6-27'::.ctor .method assembly hidebysig instance void Invoke(object x, @@ -86,9 +86,9 @@ IL_0001: stloc.0 .line 6,6 : 68,70 '' IL_0002: ret - } // end of method 'F@6-3'::Invoke + } // end of method 'F@6-27'::Invoke - } // end of class 'F@6-3' + } // end of class 'F@6-27' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T x) cil managed { @@ -99,9 +99,9 @@ IL_0000: ldarg.0 IL_0001: stloc.0 IL_0002: ldloca.s V_0 - IL_0004: newobj instance void DoNotBoxStruct_NoArray_FSInterface_NoExtMeth/'F@6-3'::.ctor() - IL_0009: ldftn instance void DoNotBoxStruct_NoArray_FSInterface_NoExtMeth/'F@6-3'::Invoke(object, - int32) + IL_0004: newobj instance void DoNotBoxStruct_NoArray_FSInterface_NoExtMeth/'F@6-27'::.ctor() + IL_0009: ldftn instance void DoNotBoxStruct_NoArray_FSInterface_NoExtMeth/'F@6-27'::Invoke(object, + int32) IL_000f: newobj instance void class [FSharp.Core]Microsoft.FSharp.Control.FSharpHandler`1::.ctor(object, native int) IL_0014: constrained. !!T diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl index e00a55f8a86..d07fcee337e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A80000 +// Image base: 0x00CD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl index dc452a6def3..cb08b546b46 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x011A0000 +// Image base: 0x00480000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname squaresOfOneToTen@5 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'squaresOfOneToTen@5-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -84,17 +84,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_0009: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 GenIter01/squaresOfOneToTen@5::current + IL_0010: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method squaresOfOneToTen@5::.ctor + } // end of method 'squaresOfOneToTen@5-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\GeneratedIterators\\GenIter01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_0001: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,29 +143,29 @@ int32, int32) IL_0034: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0039: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' + IL_0039: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' IL_003e: ldarg.0 IL_003f: ldc.i4.1 - IL_0040: stfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_0040: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc .line 5,6 : 7,23 '' IL_0045: ldarg.0 - IL_0046: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' + IL_0046: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' IL_004b: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0050: brfalse.s IL_0073 IL_0052: ldarg.0 - IL_0053: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' + IL_0053: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' IL_0058: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005d: stloc.0 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_0060: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc .line 6,6 : 18,23 '' IL_0065: ldarg.0 IL_0066: ldloc.0 IL_0067: ldloc.0 IL_0068: mul - IL_0069: stfld int32 GenIter01/squaresOfOneToTen@5::current + IL_0069: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::current IL_006e: ldc.i4.1 IL_006f: ret @@ -175,24 +175,24 @@ IL_0073: ldarg.0 IL_0074: ldc.i4.3 - IL_0075: stfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_0075: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc .line 5,6 : 7,23 '' IL_007a: ldarg.0 - IL_007b: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' + IL_007b: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' IL_0080: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0085: nop IL_0086: ldarg.0 IL_0087: ldnull - IL_0088: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' + IL_0088: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' IL_008d: ldarg.0 IL_008e: ldc.i4.3 - IL_008f: stfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_008f: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc IL_0094: ldarg.0 IL_0095: ldc.i4.0 - IL_0096: stfld int32 GenIter01/squaresOfOneToTen@5::current + IL_0096: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::current IL_009b: ldc.i4.0 IL_009c: ret - } // end of method squaresOfOneToTen@5::GenerateNext + } // end of method 'squaresOfOneToTen@5-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -204,7 +204,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_0001: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -220,7 +220,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_001b: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -258,19 +258,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_004f: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_0063: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 GenIter01/squaresOfOneToTen@5::current + IL_006a: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -310,7 +310,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method squaresOfOneToTen@5::Close + } // end of method 'squaresOfOneToTen@5-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -319,7 +319,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter01/squaresOfOneToTen@5::pc + IL_0001: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -361,7 +361,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method squaresOfOneToTen@5::get_CheckClose + } // end of method 'squaresOfOneToTen@5-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -371,9 +371,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter01/squaresOfOneToTen@5::current + IL_0001: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::current IL_0006: ret - } // end of method squaresOfOneToTen@5::get_LastGenerated + } // end of method 'squaresOfOneToTen@5-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -385,13 +385,13 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter01/squaresOfOneToTen@5::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter01/'squaresOfOneToTen@5-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method squaresOfOneToTen@5::GetFreshEnumerator + } // end of method 'squaresOfOneToTen@5-3'::GetFreshEnumerator - } // end of class squaresOfOneToTen@5 + } // end of class 'squaresOfOneToTen@5-3' .method public static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 squaresOfOneToTen() cil managed @@ -402,9 +402,9 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter01/squaresOfOneToTen@5::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter01/'squaresOfOneToTen@5-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: tail. IL_000a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000f: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl index ad5a1a7266e..77129079f47 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A50000 +// Image base: 0x00410000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname squaresOfOneToTenB@5 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'squaresOfOneToTenB@5-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -84,17 +84,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_0009: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 GenIter02/squaresOfOneToTenB@5::current + IL_0010: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method squaresOfOneToTenB@5::.ctor + } // end of method 'squaresOfOneToTenB@5-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\GeneratedIterators\\GenIter02.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_0001: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ int32, int32) IL_0037: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_003c: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' + IL_003c: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' IL_0041: ldarg.0 IL_0042: ldc.i4.1 - IL_0043: stfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_0043: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc .line 5,7 : 7,23 '' IL_0048: ldarg.0 - IL_0049: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' + IL_0049: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' IL_004e: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0053: brfalse.s IL_0086 IL_0055: ldarg.0 - IL_0056: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' + IL_0056: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' IL_005b: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0060: stloc.0 .line 6,6 : 12,27 '' @@ -164,13 +164,13 @@ IL_0070: pop IL_0071: ldarg.0 IL_0072: ldc.i4.2 - IL_0073: stfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_0073: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc .line 7,7 : 12,23 '' IL_0078: ldarg.0 IL_0079: ldloc.0 IL_007a: ldloc.0 IL_007b: mul - IL_007c: stfld int32 GenIter02/squaresOfOneToTenB@5::current + IL_007c: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current IL_0081: ldc.i4.1 IL_0082: ret @@ -180,24 +180,24 @@ IL_0086: ldarg.0 IL_0087: ldc.i4.3 - IL_0088: stfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_0088: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc .line 5,7 : 7,23 '' IL_008d: ldarg.0 - IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' + IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' IL_0093: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0098: nop IL_0099: ldarg.0 IL_009a: ldnull - IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' + IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' IL_00a0: ldarg.0 IL_00a1: ldc.i4.3 - IL_00a2: stfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_00a2: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc IL_00a7: ldarg.0 IL_00a8: ldc.i4.0 - IL_00a9: stfld int32 GenIter02/squaresOfOneToTenB@5::current + IL_00a9: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current IL_00ae: ldc.i4.0 IL_00af: ret - } // end of method squaresOfOneToTenB@5::GenerateNext + } // end of method 'squaresOfOneToTenB@5-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -209,7 +209,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_0001: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -225,7 +225,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_001b: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -263,19 +263,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_004f: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_0063: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 GenIter02/squaresOfOneToTenB@5::current + IL_006a: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -315,7 +315,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method squaresOfOneToTenB@5::Close + } // end of method 'squaresOfOneToTenB@5-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -324,7 +324,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter02/squaresOfOneToTenB@5::pc + IL_0001: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -366,7 +366,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method squaresOfOneToTenB@5::get_CheckClose + } // end of method 'squaresOfOneToTenB@5-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -376,9 +376,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter02/squaresOfOneToTenB@5::current + IL_0001: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current IL_0006: ret - } // end of method squaresOfOneToTenB@5::get_LastGenerated + } // end of method 'squaresOfOneToTenB@5-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -390,13 +390,13 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter02/squaresOfOneToTenB@5::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter02/'squaresOfOneToTenB@5-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method squaresOfOneToTenB@5::GetFreshEnumerator + } // end of method 'squaresOfOneToTenB@5-3'::GetFreshEnumerator - } // end of class squaresOfOneToTenB@5 + } // end of class 'squaresOfOneToTenB@5-3' .method public static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 squaresOfOneToTenB() cil managed @@ -407,9 +407,9 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter02/squaresOfOneToTenB@5::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter02/'squaresOfOneToTenB@5-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: tail. IL_000a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000f: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl index 68e409afba7..d0896ee0018 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname squaresOfOneToTenC@4 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'squaresOfOneToTenC@4-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -84,17 +84,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0009: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 GenIter03/squaresOfOneToTenC@4::current + IL_0010: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method squaresOfOneToTenC@4::.ctor + } // end of method 'squaresOfOneToTenC@4-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\GeneratedIterators\\GenIter03.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0001: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,29 +143,29 @@ int32, int32) IL_0035: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_003a: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' + IL_003a: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' IL_003f: ldarg.0 IL_0040: ldc.i4.1 - IL_0041: stfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0041: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc .line 4,4 : 30,55 '' IL_0046: ldarg.0 - IL_0047: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' + IL_0047: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' IL_004c: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0051: brfalse.s IL_0074 IL_0053: ldarg.0 - IL_0054: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' + IL_0054: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' IL_0059: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005e: stloc.0 IL_005f: ldarg.0 IL_0060: ldc.i4.2 - IL_0061: stfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0061: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc .line 4,4 : 50,55 '' IL_0066: ldarg.0 IL_0067: ldloc.0 IL_0068: ldloc.0 IL_0069: mul - IL_006a: stfld int32 GenIter03/squaresOfOneToTenC@4::current + IL_006a: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current IL_006f: ldc.i4.1 IL_0070: ret @@ -175,24 +175,24 @@ IL_0074: ldarg.0 IL_0075: ldc.i4.3 - IL_0076: stfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0076: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc .line 4,4 : 30,55 '' IL_007b: ldarg.0 - IL_007c: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' + IL_007c: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' IL_0081: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0086: nop IL_0087: ldarg.0 IL_0088: ldnull - IL_0089: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' + IL_0089: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' IL_008e: ldarg.0 IL_008f: ldc.i4.3 - IL_0090: stfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0090: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc IL_0095: ldarg.0 IL_0096: ldc.i4.0 - IL_0097: stfld int32 GenIter03/squaresOfOneToTenC@4::current + IL_0097: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current IL_009c: ldc.i4.0 IL_009d: ret - } // end of method squaresOfOneToTenC@4::GenerateNext + } // end of method 'squaresOfOneToTenC@4-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -204,7 +204,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0001: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -220,7 +220,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_001b: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -258,19 +258,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_004f: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0063: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 GenIter03/squaresOfOneToTenC@4::current + IL_006a: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -310,7 +310,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method squaresOfOneToTenC@4::Close + } // end of method 'squaresOfOneToTenC@4-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -319,7 +319,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter03/squaresOfOneToTenC@4::pc + IL_0001: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -361,7 +361,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method squaresOfOneToTenC@4::get_CheckClose + } // end of method 'squaresOfOneToTenC@4-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -371,9 +371,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter03/squaresOfOneToTenC@4::current + IL_0001: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current IL_0006: ret - } // end of method squaresOfOneToTenC@4::get_LastGenerated + } // end of method 'squaresOfOneToTenC@4-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -385,13 +385,13 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter03/squaresOfOneToTenC@4::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter03/'squaresOfOneToTenC@4-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method squaresOfOneToTenC@4::GetFreshEnumerator + } // end of method 'squaresOfOneToTenC@4-3'::GetFreshEnumerator - } // end of class squaresOfOneToTenC@4 + } // end of class 'squaresOfOneToTenC@4-3' .method public static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 squaresOfOneToTenC() cil managed @@ -402,9 +402,9 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter03/squaresOfOneToTenC@4::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter03/'squaresOfOneToTenC@4-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: tail. IL_000a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000f: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl index 4630db812d0..3d43451a8b7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x010E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname squaresOfOneToTenD@4 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'squaresOfOneToTenD@4-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -84,17 +84,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0009: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 GenIter04/squaresOfOneToTenD@4::current + IL_0010: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method squaresOfOneToTenD@4::.ctor + } // end of method 'squaresOfOneToTenD@4-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\GeneratedIterators\\GenIter04.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0001: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,29 +143,29 @@ int32, int32) IL_0035: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_003a: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' + IL_003a: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' IL_003f: ldarg.0 IL_0040: ldc.i4.1 - IL_0041: stfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0041: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc .line 4,4 : 28,53 '' IL_0046: ldarg.0 - IL_0047: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' + IL_0047: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' IL_004c: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0051: brfalse.s IL_0074 IL_0053: ldarg.0 - IL_0054: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' + IL_0054: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' IL_0059: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005e: stloc.0 IL_005f: ldarg.0 IL_0060: ldc.i4.2 - IL_0061: stfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0061: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc .line 4,4 : 48,53 '' IL_0066: ldarg.0 IL_0067: ldloc.0 IL_0068: ldloc.0 IL_0069: mul - IL_006a: stfld int32 GenIter04/squaresOfOneToTenD@4::current + IL_006a: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current IL_006f: ldc.i4.1 IL_0070: ret @@ -175,24 +175,24 @@ IL_0074: ldarg.0 IL_0075: ldc.i4.3 - IL_0076: stfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0076: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc .line 4,4 : 28,53 '' IL_007b: ldarg.0 - IL_007c: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' + IL_007c: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' IL_0081: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0086: nop IL_0087: ldarg.0 IL_0088: ldnull - IL_0089: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' + IL_0089: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' IL_008e: ldarg.0 IL_008f: ldc.i4.3 - IL_0090: stfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0090: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc IL_0095: ldarg.0 IL_0096: ldc.i4.0 - IL_0097: stfld int32 GenIter04/squaresOfOneToTenD@4::current + IL_0097: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current IL_009c: ldc.i4.0 IL_009d: ret - } // end of method squaresOfOneToTenD@4::GenerateNext + } // end of method 'squaresOfOneToTenD@4-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -204,7 +204,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0001: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -220,7 +220,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_001b: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -258,19 +258,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_004f: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0063: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 GenIter04/squaresOfOneToTenD@4::current + IL_006a: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -310,7 +310,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method squaresOfOneToTenD@4::Close + } // end of method 'squaresOfOneToTenD@4-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -319,7 +319,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter04/squaresOfOneToTenD@4::pc + IL_0001: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -361,7 +361,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method squaresOfOneToTenD@4::get_CheckClose + } // end of method 'squaresOfOneToTenD@4-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -371,9 +371,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter04/squaresOfOneToTenD@4::current + IL_0001: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current IL_0006: ret - } // end of method squaresOfOneToTenD@4::get_LastGenerated + } // end of method 'squaresOfOneToTenD@4-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -385,20 +385,20 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter04/squaresOfOneToTenD@4::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter04/'squaresOfOneToTenD@4-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method squaresOfOneToTenD@4::GetFreshEnumerator + } // end of method 'squaresOfOneToTenD@4-3'::GetFreshEnumerator - } // end of class squaresOfOneToTenD@4 + } // end of class 'squaresOfOneToTenD@4-3' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_squaresOfOneToTenD() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$GenIter04::squaresOfOneToTenD@4 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$GenIter04::'squaresOfOneToTenD@4-6' IL_0005: ret } // end of method GenIter04::get_squaresOfOneToTenD @@ -413,7 +413,7 @@ .class private abstract auto ansi sealed ''.$GenIter04 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 squaresOfOneToTenD@4 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'squaresOfOneToTenD@4-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -429,12 +429,12 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter04/squaresOfOneToTenD@4::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter04/'squaresOfOneToTenD@4-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000d: dup - IL_000e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$GenIter04::squaresOfOneToTenD@4 + IL_000e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$GenIter04::'squaresOfOneToTenD@4-6' IL_0013: stloc.0 IL_0014: ret } // end of method $GenIter04::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl index a04f6a6977a..46960c84f92 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A10000 +// Image base: 0x010D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl index d86598429b9..9eaaf64912e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00400000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl index 789caa75905..4e41af1303f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x03090000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl index 9bbaf7c3f5a..b3644992f25 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x004F0000 +// Image base: 0x02870000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl index f81b86f4b1c..da1f8d8cd87 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C60000 +// Image base: 0x00350000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl index 332b58beb5a..413acecfd9c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest1.exe -// MVID: {5BF2D41C-50CF-F6CE-A745-03831CD4F25B} +// MVID: {5BF2DEA8-50CF-F6CE-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02BD0000 +// Image base: 0x02E40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl index 23e2bb4bf3f..13fb77e4c23 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest2.exe -// MVID: {5BF2D41C-D3DE-B780-A745-03831CD4F25B} +// MVID: {5BF2DEA8-D3DE-B780-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00350000 +// Image base: 0x014E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl index a852f25beeb..2ec71e9a369 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000358 Length: 0x00000000 } .module ListExpressionSteppingTest3.exe -// MVID: {5BF2D41C-AE45-39B4-A745-03831CD4F25B} +// MVID: {5BF2DEA8-AE45-39B4-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01920000 +// Image base: 0x00EF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl index cb3c9ba45f0..5b3d1ca57ff 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest4.exe -// MVID: {5BF2D41C-3154-FA67-A745-03831CD4F25B} +// MVID: {5BF2DEA8-3154-FA67-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01780000 +// Image base: 0x00B40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl index 8119583b909..92c8bdf9ff9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest5.exe -// MVID: {5BF2D41C-CBE3-BFEA-A745-03831CD4F25B} +// MVID: {5BF2DEA8-CBE3-BFEA-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013B0000 +// Image base: 0x01710000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl index ec33ea70a4d..62c55b750db 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000378 Length: 0x00000000 } .module ListExpressionSteppingTest6.exe -// MVID: {5BF2D41C-98A2-AB14-A745-03831CD4F25B} +// MVID: {5BF2DEA8-98A2-AB14-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01170000 +// Image base: 0x02FD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl index 42bbef35de3..5d1b5f4b0a4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000328 Length: 0x00000000 } .module LiteralValue.exe -// MVID: {5BF2D41C-196E-5E7E-A745-03831CD4F25B} +// MVID: {5BF2DEA8-196E-5E7E-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01320000 +// Image base: 0x016C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl index fa4dd93d325..cbcd3e2e5e1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003F8 Length: 0x00000000 } .module MethodImplAttribute.AggressiveInlining.dll -// MVID: {5BF2D41C-66DC-14D3-A745-03831CD4F25B} +// MVID: {5BF2DEA8-66DC-14D3-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03090000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl index da2d4716dba..21724a160b1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003D8 Length: 0x00000000 } .module MethodImplAttribute.ForwardRef.dll -// MVID: {5BF2D41C-C517-03FF-A745-03831CD4F25B} +// MVID: {5BF2DEA8-C517-03FF-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x009C0000 +// Image base: 0x011B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl index 7626aef4abe..e18cd0224bb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.InternalCall.dll -// MVID: {5BF2D41C-FBF7-6A35-A745-03831CD4F25B} +// MVID: {5BF2DEA8-FBF7-6A35-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A70000 +// Image base: 0x00310000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl index 822aebf1c39..c2f7ca1de4f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003D8 Length: 0x00000000 } .module MethodImplAttribute.NoInlining.dll -// MVID: {5BF2D41C-F47B-58B3-A745-03831CD4F25B} +// MVID: {5BF2DEA8-F47B-58B3-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x011C0000 +// Image base: 0x017D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl index 41a0adfc724..f7db3b0f70b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E8 Length: 0x00000000 } .module MethodImplAttribute.NoOptimization.dll -// MVID: {5BF2D41C-D394-5177-A745-03831CD4F25B} +// MVID: {5BF2DEA8-D394-5177-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C20000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl index 1c58b648d11..34b9e37a71f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.PreserveSig.dll -// MVID: {5BF2D41C-0C64-31CC-A745-03831CD4F25B} +// MVID: {5BF2DEA8-0C64-31CC-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02680000 +// Image base: 0x01630000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl index 1de884d19c2..097e57afbb9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.Synchronized.dll -// MVID: {5BF2D41C-D8F1-2CC7-A745-03831CD4F25B} +// MVID: {5BF2DEA8-D8F1-2CC7-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01230000 +// Image base: 0x00FA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl index 94242cd3740..68d55a33d71 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003D0 Length: 0x00000000 } .module MethodImplAttribute.Unmanaged.dll -// MVID: {5BF2D41C-FF34-309C-A745-03831CD4F25B} +// MVID: {5BF2DEA8-FF34-309C-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017F0000 +// Image base: 0x00CE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl index 798af0b18cd..e1b8cb13459 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003F0 Length: 0x00000003 } .module AbstractClass.exe -// MVID: {5BF2D41C-333C-8BAF-A745-03831CD4F25B} +// MVID: {5BF2DEA8-333C-8BAF-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F90000 +// Image base: 0x00BE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl index 50fa87b24da..522ee756d6d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000004F0 Length: 0x0000000F } .module ArgumentNamesInClosures01.dll -// MVID: {5BF2D41C-39CA-41B5-A745-03831CD4F25B} +// MVID: {5BF2DEA8-39CA-41B5-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007B0000 +// Image base: 0x033A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl index f6a7d5be66c..793dafe34dd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000518 Length: 0x00000000 } .module CodeGenRenamings01.exe -// MVID: {5BF2D41C-8173-986B-A745-03831CD4F25B} +// MVID: {5BF2DEA8-8173-986B-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x028F0000 +// Image base: 0x02BA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl index 67962e2a16e..c02a0d6c02b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000360 Length: 0x00000000 } .module CustomAttributeGenericParameter01.exe -// MVID: {5BF2D41C-F08A-F524-A745-03831CD4F25B} +// MVID: {5BF2DEA8-F08A-F524-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00AF0000 +// Image base: 0x00300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl index b2540491e79..1a313f7b2b6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Decimal01.exe -// MVID: {5BF2D41C-F150-FA46-A745-03831CD4F25B} +// MVID: {5BF2DEA8-F150-FA46-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A80000 +// Image base: 0x03080000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl index e5b917f8bc6..93c73fa6ead 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000308 Length: 0x00000000 } .module EntryPoint01.exe -// MVID: {5BF2D41C-9846-72C1-A745-03831CD4F25B} +// MVID: {5BF2DEA8-9846-72C1-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03180000 +// Image base: 0x02F90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl index 2033f001e51..1306998b9d0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000898 Length: 0x0000002A } .module EqualsOnUnions01.exe -// MVID: {5BF2D41C-BBFB-14A0-A745-03831CD4F25B} +// MVID: {5BF2DEA8-BBFB-14A0-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00480000 +// Image base: 0x01330000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl index 7a351fdec57..ca5cd5c7374 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module ForLoop01.exe -// MVID: {5BF2D41C-1795-791C-A745-03831CD4F25B} +// MVID: {5BF2DEA8-1795-791C-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FE0000 +// Image base: 0x01260000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl index 252b445706a..f3a501b83c5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module ForLoop02.exe -// MVID: {5BF2D41C-1736-791C-A745-03831CD4F25B} +// MVID: {5BF2DEA8-1736-791C-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013C0000 +// Image base: 0x02A30000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl index e93a5bcdf92..ab6ff9e751b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000298 Length: 0x00000000 } .module ForLoop03.exe -// MVID: {5BF2D41C-1757-791C-A745-03831CD4F25B} +// MVID: {5BF2DEA8-1757-791C-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017F0000 +// Image base: 0x02F30000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl index 1177eb51d7f..ca61b156a50 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000918 Length: 0x0000002A } .module GeneralizationOnUnions01.exe -// MVID: {5BF2D41C-4CA2-8CD1-A745-03831CD4F25B} +// MVID: {5BF2DEA8-4CA2-8CD1-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x015C0000 +// Image base: 0x019C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl index c7f4c2bd652..a2a6f326bfd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000848 Length: 0x00000012 } .module GenericTypeStaticField01.exe -// MVID: {5BF2D41C-1E75-7E6B-A745-03831CD4F25B} +// MVID: {5BF2DEA8-1E75-7E6B-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018F0000 +// Image base: 0x011D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl index f77f16851b5..2f3722d1a28 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module IfThenElse01.dll -// MVID: {5BF2D41C-2D6C-0B5D-A745-03831CD4F25B} +// MVID: {5BF2DEA8-2D6C-0B5D-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x01820000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl index acbf6b974fd..9fa45c755c2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000280 Length: 0x00000000 } .module LetIfThenElse01.exe -// MVID: {5BF2D41C-BE5A-D8FD-A745-03831CD4F25B} +// MVID: {5BF2DEA8-BE5A-D8FD-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02F00000 +// Image base: 0x01830000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl index 7e869e28b4f..d1925d80451 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000200 Length: 0x00000000 } .module Lock01.exe -// MVID: {5BF2D41C-2BCA-B308-A745-03831CD4F25B} +// MVID: {5BF2DEA8-2BCA-B308-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03090000 +// Image base: 0x00CB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl index a4aa325797b..b62c614ce36 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000005A0 Length: 0x00000000 } .module Marshal.exe -// MVID: {5BF2D41C-7500-369C-A745-03831CD4F25B} +// MVID: {5BF2DEA8-7500-369C-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00750000 +// Image base: 0x013B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl index b4ddb94b435..ea083c4bf66 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl @@ -40,13 +40,13 @@ // Offset: 0x00000420 Length: 0x00000009 } .module MethodImplNoInline.exe -// MVID: {5BF2D41C-4480-09E2-A745-03831CD4F25B} +// MVID: {5BF2DEA8-4480-09E2-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02980000 +// Image base: 0x00A40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl index ead351cf35b..442b098c5e0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl @@ -40,13 +40,13 @@ // Offset: 0x00000428 Length: 0x00000009 } .module MethodImplNoInline02.exe -// MVID: {5BF2D41C-084F-1A8E-A745-03831CD4F25B} +// MVID: {5BF2DEA8-084F-1A8E-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x014C0000 +// Image base: 0x010F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl index 44c856dae9c..66a0b09cb37 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl @@ -44,7 +44,7 @@ // Offset: 0x000002D8 Length: 0x00000000 } .module ModuleWithExpression01.exe -// MVID: {5BF2D41C-CD1E-A8B4-A745-03831CD4F25B} +// MVID: {5BF2DEA8-CD1E-A8B4-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl index 53808635c17..45688bab3db 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B8 Length: 0x00000000 } .module NoBoxingOnDispose01.exe -// MVID: {5BF2D41C-4EA9-C934-A745-03831CD4F25B} +// MVID: {5BF2DEA8-4EA9-C934-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01530000 +// Image base: 0x00C50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl index 408a0ad0123..43fe172a53b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000530 Length: 0x0000000B } .module NonEscapingArguments02.dll -// MVID: {5BF2D41C-BB56-6582-A745-03831CD4F25B} +// MVID: {5BF2DEA8-BB56-6582-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018F0000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl index dfb8f4cb56a..a1079dc9b47 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000370 Length: 0x00000000 } .module PreserveSig.dll -// MVID: {5BF2D41C-E8CC-64FE-A745-03831CD4F25B} +// MVID: {5BF2DEA8-E8CC-64FE-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00700000 +// Image base: 0x026B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl index 1e861263a2e..794ccadd811 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000238 Length: 0x00000000 } .module Seq_for_all01.exe -// MVID: {5BF2D41C-D30D-BA80-A745-03831CD4F25B} +// MVID: {5BF2DEA8-D30D-BA80-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00640000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl index cc2c154d820..2a437387e71 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000A18 Length: 0x00000035 } .module Structs01.exe -// MVID: {5BF2D41C-701F-5E27-A745-03831CD4F25B} +// MVID: {5BF2DEA8-701F-5E27-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02D30000 +// Image base: 0x014A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl index 029876acee3..e8a4ad12dce 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000A58 Length: 0x00000035 } .module Structs02.exe -// MVID: {5BF2D41C-7040-5E27-A745-03831CD4F25B} +// MVID: {5BF2DEA8-7040-5E27-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00960000 +// Image base: 0x03050000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl index 55f35d4bafb..b6a7d10503f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000A30 Length: 0x00000038 } .module StructsAsArrayElements01.dll -// MVID: {5BF2D41C-29F3-6E68-A745-03831CD4F25B} +// MVID: {5BF2DEA8-29F3-6E68-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00810000 +// Image base: 0x00CE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl index f47dc3101b8..b3298f901ad 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001E0 Length: 0x00000000 } .module TryWith_NoFilterBlocks01.exe -// MVID: {5BF2D41C-3DEF-9A40-A745-03831CD4F25B} +// MVID: {5BF2DEA8-3DEF-9A40-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00690000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl index a88cd1bafdc..357e0e5535e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl @@ -51,13 +51,13 @@ // Offset: 0x00000758 Length: 0x00000008 } .module cas.exe -// MVID: {5BF2D41C-35EA-18E3-A745-03831CD4F25B} +// MVID: {5BF2DEA8-35EA-18E3-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018C0000 +// Image base: 0x00890000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl index 2a87131406e..fa99d2c6633 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000009C0 Length: 0x00000038 } .module Mutation01.exe -// MVID: {5BF2D41C-8C6A-2EAE-A745-03831CD4F25B} +// MVID: {5BF2DEA8-8C6A-2EAE-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00390000 +// Image base: 0x00F80000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl index 2ea8322e4ca..ec7e13275cf 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000220 Length: 0x00000000 } .module Mutation02.exe -// MVID: {5BF2D41C-8C6A-2F0D-A745-03831CD4F25B} +// MVID: {5BF2DEA8-8C6A-2F0D-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02FA0000 +// Image base: 0x01730000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl index 00adfa21501..a669940a9d8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000220 Length: 0x00000000 } .module Mutation03.exe -// MVID: {5BF2D41C-8C6A-2EEC-A745-03831CD4F25B} +// MVID: {5BF2DEA8-8C6A-2EEC-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00350000 +// Image base: 0x00A70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl index ad06c65e240..32946d7cd3e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000238 Length: 0x00000000 } .module Mutation04.exe -// MVID: {5BF2D41C-8C6A-2E43-A745-03831CD4F25B} +// MVID: {5BF2DEA8-8C6A-2E43-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FD0000 +// Image base: 0x01670000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl index 115d90a1adb..7b09e47610a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000648 Length: 0x00000016 } .module Mutation05.exe -// MVID: {5BF2D41C-8C6A-2E22-A745-03831CD4F25B} +// MVID: {5BF2DEA8-8C6A-2E22-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x00FC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl index 123cc28ed86..bc75ff246a3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001F0 Length: 0x00000000 } .module comparison_decimal01.exe -// MVID: {5BF2D41C-76D8-7EE3-A745-03831CD4F25B} +// MVID: {5BF2DEA8-76D8-7EE3-A745-0383A8DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01950000 +// Image base: 0x02C80000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl index 54b100a7ad4..320bc8526ac 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl @@ -59,7 +59,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03040000 +// Image base: 0x01140000 // =============== CLASS MEMBERS DECLARATION =================== @@ -68,7 +68,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname uniqueFactors@12 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'uniqueFactors@12-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -93,17 +93,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_0009: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/uniqueFactors@12::current + IL_0010: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method uniqueFactors@12::.ctor + } // end of method 'uniqueFactors@12-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -115,7 +115,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Aggregates01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_0001: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -148,18 +148,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_factorsOf300() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_003d: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc .line 12,12 : 9,33 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 12,12 : 9,33 '' @@ -167,11 +167,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_005f: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc .line 13,13 : 9,17 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Aggregates01/uniqueFactors@12::current + IL_0066: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -181,24 +181,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_0072: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc .line 12,12 : 9,33 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_008c: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Aggregates01/uniqueFactors@12::current + IL_0093: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method uniqueFactors@12::GenerateNext + } // end of method 'uniqueFactors@12-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -210,7 +210,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_0001: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -226,7 +226,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_001b: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -264,19 +264,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_004f: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_0063: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Aggregates01/uniqueFactors@12::current + IL_006a: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -316,7 +316,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method uniqueFactors@12::Close + } // end of method 'uniqueFactors@12-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -325,7 +325,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/uniqueFactors@12::pc + IL_0001: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -367,7 +367,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method uniqueFactors@12::get_CheckClose + } // end of method 'uniqueFactors@12-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -377,9 +377,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/uniqueFactors@12::current + IL_0001: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current IL_0006: ret - } // end of method uniqueFactors@12::get_LastGenerated + } // end of method 'uniqueFactors@12-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -391,15 +391,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Aggregates01/uniqueFactors@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Aggregates01/'uniqueFactors@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method uniqueFactors@12::GetFreshEnumerator + } // end of method 'uniqueFactors@12-6'::GetFreshEnumerator - } // end of class uniqueFactors@12 + } // end of class 'uniqueFactors@12-6' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname numSum@21 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'numSum@21-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -424,17 +424,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/numSum@21::pc + IL_0009: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/numSum@21::current + IL_0010: stfld int32 Linq101Aggregates01/'numSum@21-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method numSum@21::.ctor + } // end of method 'numSum@21-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -445,7 +445,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/numSum@21::pc + IL_0001: ldfld int32 Linq101Aggregates01/'numSum@21-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -478,18 +478,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/numSum@21::pc + IL_003d: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc .line 21,21 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 21,21 : 9,28 '' @@ -497,11 +497,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/numSum@21::pc + IL_005f: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc .line 22,22 : 9,16 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Aggregates01/numSum@21::current + IL_0066: stfld int32 Linq101Aggregates01/'numSum@21-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -511,24 +511,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/numSum@21::pc + IL_0072: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc .line 21,21 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/numSum@21::pc + IL_008c: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Aggregates01/numSum@21::current + IL_0093: stfld int32 Linq101Aggregates01/'numSum@21-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method numSum@21::GenerateNext + } // end of method 'numSum@21-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -540,7 +540,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/numSum@21::pc + IL_0001: ldfld int32 Linq101Aggregates01/'numSum@21-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -556,7 +556,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/numSum@21::pc + IL_001b: ldfld int32 Linq101Aggregates01/'numSum@21-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -594,19 +594,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/numSum@21::pc + IL_004f: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/numSum@21::pc + IL_0063: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Aggregates01/numSum@21::current + IL_006a: stfld int32 Linq101Aggregates01/'numSum@21-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -646,7 +646,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method numSum@21::Close + } // end of method 'numSum@21-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -655,7 +655,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/numSum@21::pc + IL_0001: ldfld int32 Linq101Aggregates01/'numSum@21-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -697,7 +697,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method numSum@21::get_CheckClose + } // end of method 'numSum@21-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -707,9 +707,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/numSum@21::current + IL_0001: ldfld int32 Linq101Aggregates01/'numSum@21-6'::current IL_0006: ret - } // end of method numSum@21::get_LastGenerated + } // end of method 'numSum@21-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -721,15 +721,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Aggregates01/numSum@21::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Aggregates01/'numSum@21-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method numSum@21::GetFreshEnumerator + } // end of method 'numSum@21-6'::GetFreshEnumerator - } // end of class numSum@21 + } // end of class 'numSum@21-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'numSum@22-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numSum@22-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -742,7 +742,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'numSum@22-1'::.ctor + } // end of method 'numSum@22-7'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -752,11 +752,11 @@ .line 22,22 : 15,16 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'numSum@22-1'::Invoke + } // end of method 'numSum@22-7'::Invoke - } // end of class 'numSum@22-1' + } // end of class 'numSum@22-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname totalChars@30 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'totalChars@30-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -781,17 +781,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/totalChars@30::pc + IL_0009: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Aggregates01/totalChars@30::current + IL_0010: stfld string Linq101Aggregates01/'totalChars@30-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method totalChars@30::.ctor + } // end of method 'totalChars@30-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -802,7 +802,7 @@ [1] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/totalChars@30::pc + IL_0001: ldfld int32 Linq101Aggregates01/'totalChars@30-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -835,18 +835,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/totalChars@30::pc + IL_003d: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc .line 30,30 : 9,26 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 30,30 : 9,26 '' @@ -854,11 +854,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/totalChars@30::pc + IL_005f: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc .line 31,31 : 9,25 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Aggregates01/totalChars@30::current + IL_0066: stfld string Linq101Aggregates01/'totalChars@30-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -868,24 +868,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/totalChars@30::pc + IL_0072: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc .line 30,30 : 9,26 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/totalChars@30::pc + IL_008c: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Aggregates01/totalChars@30::current + IL_0093: stfld string Linq101Aggregates01/'totalChars@30-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method totalChars@30::GenerateNext + } // end of method 'totalChars@30-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -897,7 +897,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/totalChars@30::pc + IL_0001: ldfld int32 Linq101Aggregates01/'totalChars@30-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -913,7 +913,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/totalChars@30::pc + IL_001b: ldfld int32 Linq101Aggregates01/'totalChars@30-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -951,19 +951,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/totalChars@30::pc + IL_004f: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/totalChars@30::pc + IL_0063: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Aggregates01/totalChars@30::current + IL_006a: stfld string Linq101Aggregates01/'totalChars@30-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1003,7 +1003,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method totalChars@30::Close + } // end of method 'totalChars@30-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1012,7 +1012,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/totalChars@30::pc + IL_0001: ldfld int32 Linq101Aggregates01/'totalChars@30-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1054,7 +1054,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method totalChars@30::get_CheckClose + } // end of method 'totalChars@30-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -1064,9 +1064,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Aggregates01/totalChars@30::current + IL_0001: ldfld string Linq101Aggregates01/'totalChars@30-6'::current IL_0006: ret - } // end of method totalChars@30::get_LastGenerated + } // end of method 'totalChars@30-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1078,15 +1078,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Aggregates01/totalChars@30::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Aggregates01/'totalChars@30-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method totalChars@30::GetFreshEnumerator + } // end of method 'totalChars@30-6'::GetFreshEnumerator - } // end of class totalChars@30 + } // end of class 'totalChars@30-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'totalChars@31-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'totalChars@31-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1099,7 +1099,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'totalChars@31-1'::.ctor + } // end of method 'totalChars@31-7'::.ctor .method public strict virtual instance int32 Invoke(string w) cil managed @@ -1110,11 +1110,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'totalChars@31-1'::Invoke + } // end of method 'totalChars@31-7'::Invoke - } // end of class 'totalChars@31-1' + } // end of class 'totalChars@31-7' - .class auto ansi serializable sealed nested assembly beforefieldinit categories@39 + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@39-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1132,9 +1132,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories@39::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@39-15'::builder@ IL_000d: ret - } // end of method categories@39::.ctor + } // end of method 'categories@39-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -1147,16 +1147,16 @@ IL_0001: stloc.0 .line 40,40 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories@39::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@39-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method categories@39::Invoke + } // end of method 'categories@39-15'::Invoke - } // end of class categories@39 + } // end of class 'categories@39-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1169,7 +1169,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories@40-1'::.ctor + } // end of method 'categories@40-16'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -1179,11 +1179,11 @@ .line 40,40 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories@40-1'::Invoke + } // end of method 'categories@40-16'::Invoke - } // end of class 'categories@40-1' + } // end of class 'categories@40-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1196,7 +1196,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories@40-2'::.ctor + } // end of method 'categories@40-17'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -1208,11 +1208,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories@40-2'::Invoke + } // end of method 'categories@40-17'::Invoke - } // end of class 'categories@40-2' + } // end of class 'categories@40-17' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname sum@42 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sum@42-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1239,20 +1239,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/sum@42::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'sum@42-6'::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/sum@42::pc + IL_0010: stfld int32 Linq101Aggregates01/'sum@42-6'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method sum@42::.ctor + } // end of method 'sum@42-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1263,7 +1263,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/sum@42::pc + IL_0001: ldfld int32 Linq101Aggregates01/'sum@42-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1295,20 +1295,20 @@ .line 42,42 : 13,26 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/sum@42::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'sum@42-6'::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/sum@42::pc + IL_003e: stfld int32 Linq101Aggregates01/'sum@42-6'::pc .line 42,42 : 13,26 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 42,42 : 13,26 '' @@ -1316,11 +1316,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/sum@42::pc + IL_0060: stfld int32 Linq101Aggregates01/'sum@42-6'::pc .line 43,43 : 13,33 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current IL_006c: ldc.i4.1 IL_006d: ret @@ -1330,24 +1330,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/sum@42::pc + IL_0073: stfld int32 Linq101Aggregates01/'sum@42-6'::pc .line 42,42 : 13,26 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/sum@42::pc + IL_008d: stfld int32 Linq101Aggregates01/'sum@42-6'::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method sum@42::GenerateNext + } // end of method 'sum@42-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1359,7 +1359,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/sum@42::pc + IL_0001: ldfld int32 Linq101Aggregates01/'sum@42-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1375,7 +1375,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/sum@42::pc + IL_001b: ldfld int32 Linq101Aggregates01/'sum@42-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1413,19 +1413,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/sum@42::pc + IL_004f: stfld int32 Linq101Aggregates01/'sum@42-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/sum@42::pc + IL_0063: stfld int32 Linq101Aggregates01/'sum@42-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1465,7 +1465,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method sum@42::Close + } // end of method 'sum@42-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1474,7 +1474,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/sum@42::pc + IL_0001: ldfld int32 Linq101Aggregates01/'sum@42-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1516,7 +1516,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method sum@42::get_CheckClose + } // end of method 'sum@42-6'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -1526,9 +1526,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current IL_0006: ret - } // end of method sum@42::get_LastGenerated + } // end of method 'sum@42-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1538,20 +1538,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/sum@42::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'sum@42-6'::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/sum@42::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/'sum@42-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method sum@42::GetFreshEnumerator + } // end of method 'sum@42-6'::GetFreshEnumerator - } // end of class sum@42 + } // end of class 'sum@42-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sum@43-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sum@43-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1564,7 +1564,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sum@43-1'::.ctor + } // end of method 'sum@43-7'::.ctor .method public strict virtual instance int32 Invoke(class [Utils]Utils/Product x) cil managed @@ -1576,11 +1576,11 @@ IL_0001: tail. IL_0003: callvirt instance int32 [Utils]Utils/Product::get_UnitsInStock() IL_0008: ret - } // end of method 'sum@43-1'::Invoke + } // end of method 'sum@43-7'::Invoke - } // end of class 'sum@43-1' + } // end of class 'sum@43-7' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,int32>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1598,9 +1598,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,int32>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@40-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@40-18'::builder@ IL_000d: ret - } // end of method 'categories@40-3'::.ctor + } // end of method 'categories@40-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,int32>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -1629,13 +1629,13 @@ IL_000b: ldnull IL_000c: ldc.i4.0 IL_000d: ldnull - IL_000e: newobj instance void Linq101Aggregates01/sum@42::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000e: newobj instance void Linq101Aggregates01/'sum@42-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0013: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0018: stloc.s V_4 - IL_001a: newobj instance void Linq101Aggregates01/'sum@43-1'::.ctor() + IL_001a: newobj instance void Linq101Aggregates01/'sum@43-7'::.ctor() IL_001f: stloc.s V_5 IL_0021: ldloc.s V_4 IL_0023: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -1696,7 +1696,7 @@ IL_007b: stloc.1 .line 45,45 : 9,28 '' IL_007c: ldarg.0 - IL_007d: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@40-3'::builder@ + IL_007d: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@40-18'::builder@ IL_0082: ldloc.0 IL_0083: ldloc.1 IL_0084: newobj instance void class [mscorlib]System.Tuple`2,int32>::.ctor(!0, @@ -1704,11 +1704,11 @@ IL_0089: tail. IL_008b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,int32>,object>(!!0) IL_0090: ret - } // end of method 'categories@40-3'::Invoke + } // end of method 'categories@40-18'::Invoke - } // end of class 'categories@40-3' + } // end of class 'categories@40-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@45-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@45-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -1721,7 +1721,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'categories@45-4'::.ctor + } // end of method 'categories@45-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2,int32> tupledArg) cil managed @@ -1744,11 +1744,11 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'categories@45-4'::Invoke + } // end of method 'categories@45-19'::Invoke - } // end of class 'categories@45-4' + } // end of class 'categories@45-19' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname minNum@49 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'minNum@49-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1773,17 +1773,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/minNum@49::pc + IL_0009: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/minNum@49::current + IL_0010: stfld int32 Linq101Aggregates01/'minNum@49-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method minNum@49::.ctor + } // end of method 'minNum@49-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1794,7 +1794,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/minNum@49::pc + IL_0001: ldfld int32 Linq101Aggregates01/'minNum@49-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1827,18 +1827,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/minNum@49::pc + IL_003d: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc .line 49,49 : 22,41 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 49,49 : 22,41 '' @@ -1846,11 +1846,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/minNum@49::pc + IL_005f: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc .line 49,49 : 42,49 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Aggregates01/minNum@49::current + IL_0066: stfld int32 Linq101Aggregates01/'minNum@49-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1860,24 +1860,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/minNum@49::pc + IL_0072: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc .line 49,49 : 22,41 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/minNum@49::pc + IL_008c: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Aggregates01/minNum@49::current + IL_0093: stfld int32 Linq101Aggregates01/'minNum@49-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method minNum@49::GenerateNext + } // end of method 'minNum@49-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1889,7 +1889,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/minNum@49::pc + IL_0001: ldfld int32 Linq101Aggregates01/'minNum@49-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1905,7 +1905,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/minNum@49::pc + IL_001b: ldfld int32 Linq101Aggregates01/'minNum@49-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1943,19 +1943,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/minNum@49::pc + IL_004f: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/minNum@49::pc + IL_0063: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Aggregates01/minNum@49::current + IL_006a: stfld int32 Linq101Aggregates01/'minNum@49-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1995,7 +1995,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method minNum@49::Close + } // end of method 'minNum@49-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -2004,7 +2004,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/minNum@49::pc + IL_0001: ldfld int32 Linq101Aggregates01/'minNum@49-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -2046,7 +2046,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method minNum@49::get_CheckClose + } // end of method 'minNum@49-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -2056,9 +2056,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/minNum@49::current + IL_0001: ldfld int32 Linq101Aggregates01/'minNum@49-6'::current IL_0006: ret - } // end of method minNum@49::get_LastGenerated + } // end of method 'minNum@49-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -2070,15 +2070,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Aggregates01/minNum@49::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Aggregates01/'minNum@49-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method minNum@49::GetFreshEnumerator + } // end of method 'minNum@49-6'::GetFreshEnumerator - } // end of class minNum@49 + } // end of class 'minNum@49-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'minNum@49-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'minNum@49-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2091,7 +2091,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'minNum@49-1'::.ctor + } // end of method 'minNum@49-7'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -2101,11 +2101,11 @@ .line 49,49 : 48,49 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'minNum@49-1'::Invoke + } // end of method 'minNum@49-7'::Invoke - } // end of class 'minNum@49-1' + } // end of class 'minNum@49-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname shortestWord@52 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'shortestWord@52-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -2130,17 +2130,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_0009: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Aggregates01/shortestWord@52::current + IL_0010: stfld string Linq101Aggregates01/'shortestWord@52-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method shortestWord@52::.ctor + } // end of method 'shortestWord@52-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -2151,7 +2151,7 @@ [1] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_0001: ldfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -2184,18 +2184,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_003d: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc .line 52,52 : 28,45 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 52,52 : 28,45 '' @@ -2203,11 +2203,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_005f: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc .line 52,52 : 46,60 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Aggregates01/shortestWord@52::current + IL_0066: stfld string Linq101Aggregates01/'shortestWord@52-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -2217,24 +2217,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_0072: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc .line 52,52 : 28,45 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_008c: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Aggregates01/shortestWord@52::current + IL_0093: stfld string Linq101Aggregates01/'shortestWord@52-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method shortestWord@52::GenerateNext + } // end of method 'shortestWord@52-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -2246,7 +2246,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_0001: ldfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -2262,7 +2262,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_001b: ldfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -2300,19 +2300,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_004f: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_0063: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Aggregates01/shortestWord@52::current + IL_006a: stfld string Linq101Aggregates01/'shortestWord@52-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -2352,7 +2352,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method shortestWord@52::Close + } // end of method 'shortestWord@52-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -2361,7 +2361,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/shortestWord@52::pc + IL_0001: ldfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -2403,7 +2403,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method shortestWord@52::get_CheckClose + } // end of method 'shortestWord@52-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -2413,9 +2413,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Aggregates01/shortestWord@52::current + IL_0001: ldfld string Linq101Aggregates01/'shortestWord@52-6'::current IL_0006: ret - } // end of method shortestWord@52::get_LastGenerated + } // end of method 'shortestWord@52-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -2427,15 +2427,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Aggregates01/shortestWord@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Aggregates01/'shortestWord@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method shortestWord@52::GetFreshEnumerator + } // end of method 'shortestWord@52-6'::GetFreshEnumerator - } // end of class shortestWord@52 + } // end of class 'shortestWord@52-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'shortestWord@52-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'shortestWord@52-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2448,7 +2448,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'shortestWord@52-1'::.ctor + } // end of method 'shortestWord@52-7'::.ctor .method public strict virtual instance int32 Invoke(string w) cil managed @@ -2459,11 +2459,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'shortestWord@52-1'::Invoke + } // end of method 'shortestWord@52-7'::Invoke - } // end of class 'shortestWord@52-1' + } // end of class 'shortestWord@52-7' - .class auto ansi serializable sealed nested assembly beforefieldinit categories2@57 + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@57-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2481,9 +2481,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories2@57::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@57-15'::builder@ IL_000d: ret - } // end of method categories2@57::.ctor + } // end of method 'categories2@57-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -2496,16 +2496,16 @@ IL_0001: stloc.0 .line 58,58 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories2@57::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@57-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method categories2@57::Invoke + } // end of method 'categories2@57-15'::Invoke - } // end of class categories2@57 + } // end of class 'categories2@57-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2518,7 +2518,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories2@58-1'::.ctor + } // end of method 'categories2@58-16'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -2528,11 +2528,11 @@ .line 58,58 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories2@58-1'::Invoke + } // end of method 'categories2@58-16'::Invoke - } // end of class 'categories2@58-1' + } // end of class 'categories2@58-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2545,7 +2545,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories2@58-2'::.ctor + } // end of method 'categories2@58-17'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -2557,11 +2557,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories2@58-2'::Invoke + } // end of method 'categories2@58-17'::Invoke - } // end of class 'categories2@58-2' + } // end of class 'categories2@58-17' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname min@59 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'min@59-9' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -2588,20 +2588,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/min@59::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'min@59-9'::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/min@59::pc + IL_0010: stfld int32 Linq101Aggregates01/'min@59-9'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method min@59::.ctor + } // end of method 'min@59-9'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -2612,7 +2612,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/min@59::pc + IL_0001: ldfld int32 Linq101Aggregates01/'min@59-9'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -2644,20 +2644,20 @@ .line 59,59 : 27,40 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/min@59::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'min@59-9'::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/min@59::pc + IL_003e: stfld int32 Linq101Aggregates01/'min@59-9'::pc .line 59,59 : 27,40 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 59,59 : 27,40 '' @@ -2665,11 +2665,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/min@59::pc + IL_0060: stfld int32 Linq101Aggregates01/'min@59-9'::pc .line 59,59 : 41,58 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current IL_006c: ldc.i4.1 IL_006d: ret @@ -2679,24 +2679,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/min@59::pc + IL_0073: stfld int32 Linq101Aggregates01/'min@59-9'::pc .line 59,59 : 27,40 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/min@59::pc + IL_008d: stfld int32 Linq101Aggregates01/'min@59-9'::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method min@59::GenerateNext + } // end of method 'min@59-9'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -2708,7 +2708,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/min@59::pc + IL_0001: ldfld int32 Linq101Aggregates01/'min@59-9'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -2724,7 +2724,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/min@59::pc + IL_001b: ldfld int32 Linq101Aggregates01/'min@59-9'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -2762,19 +2762,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/min@59::pc + IL_004f: stfld int32 Linq101Aggregates01/'min@59-9'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/min@59::pc + IL_0063: stfld int32 Linq101Aggregates01/'min@59-9'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -2814,7 +2814,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method min@59::Close + } // end of method 'min@59-9'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -2823,7 +2823,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/min@59::pc + IL_0001: ldfld int32 Linq101Aggregates01/'min@59-9'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -2865,7 +2865,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method min@59::get_CheckClose + } // end of method 'min@59-9'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -2875,9 +2875,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current IL_0006: ret - } // end of method min@59::get_LastGenerated + } // end of method 'min@59-9'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -2887,20 +2887,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/min@59::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'min@59-9'::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/min@59::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/'min@59-9'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method min@59::GetFreshEnumerator + } // end of method 'min@59-9'::GetFreshEnumerator - } // end of class min@59 + } // end of class 'min@59-9' - .class auto ansi serializable sealed nested assembly beforefieldinit 'min@59-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'min@59-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2913,7 +2913,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'min@59-1'::.ctor + } // end of method 'min@59-10'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product x) cil managed @@ -2925,11 +2925,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'min@59-1'::Invoke + } // end of method 'min@59-10'::Invoke - } // end of class 'min@59-1' + } // end of class 'min@59-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2947,9 +2947,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@58-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@58-18'::builder@ IL_000d: ret - } // end of method 'categories2@58-3'::.ctor + } // end of method 'categories2@58-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -2966,18 +2966,18 @@ IL_0008: ldnull IL_0009: ldc.i4.0 IL_000a: ldnull - IL_000b: newobj instance void Linq101Aggregates01/min@59::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000b: newobj instance void Linq101Aggregates01/'min@59-9'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0010: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0015: newobj instance void Linq101Aggregates01/'min@59-1'::.ctor() + IL_0015: newobj instance void Linq101Aggregates01/'min@59-10'::.ctor() IL_001a: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MinBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_001f: stloc.1 .line 60,60 : 9,28 '' IL_0020: ldarg.0 - IL_0021: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@58-3'::builder@ + IL_0021: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@58-18'::builder@ IL_0026: ldloc.0 IL_0027: ldloc.1 IL_0028: newobj instance void class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>::.ctor(!0, @@ -2985,11 +2985,11 @@ IL_002d: tail. IL_002f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal>,object>(!!0) IL_0034: ret - } // end of method 'categories2@58-3'::Invoke + } // end of method 'categories2@58-18'::Invoke - } // end of class 'categories2@58-3' + } // end of class 'categories2@58-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@60-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@60-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -3002,7 +3002,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'categories2@60-4'::.ctor + } // end of method 'categories2@60-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal> tupledArg) cil managed @@ -3025,11 +3025,11 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'categories2@60-4'::Invoke + } // end of method 'categories2@60-19'::Invoke - } // end of class 'categories2@60-4' + } // end of class 'categories2@60-19' - .class auto ansi serializable sealed nested assembly beforefieldinit categories3@66 + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@66-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3047,9 +3047,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories3@66::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@66-15'::builder@ IL_000d: ret - } // end of method categories3@66::.ctor + } // end of method 'categories3@66-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -3062,16 +3062,16 @@ IL_0001: stloc.0 .line 67,67 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories3@66::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@66-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method categories3@66::Invoke + } // end of method 'categories3@66-15'::Invoke - } // end of class categories3@66 + } // end of class 'categories3@66-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -3084,7 +3084,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories3@67-1'::.ctor + } // end of method 'categories3@67-16'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -3094,11 +3094,11 @@ .line 67,67 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories3@67-1'::Invoke + } // end of method 'categories3@67-16'::Invoke - } // end of class 'categories3@67-1' + } // end of class 'categories3@67-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -3111,7 +3111,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories3@67-2'::.ctor + } // end of method 'categories3@67-17'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -3123,11 +3123,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories3@67-2'::Invoke + } // end of method 'categories3@67-17'::Invoke - } // end of class 'categories3@67-2' + } // end of class 'categories3@67-17' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'min@68-2' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'min@68-11' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -3139,7 +3139,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'min@68-2'::.ctor + } // end of method 'min@68-11'::.ctor .method assembly hidebysig instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product p) cil managed @@ -3151,11 +3151,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'min@68-2'::Invoke + } // end of method 'min@68-11'::Invoke - } // end of class 'min@68-2' + } // end of class 'min@68-11' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname cheapestProducts@69 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'cheapestProducts@69-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -3182,20 +3182,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/cheapestProducts@69::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'cheapestProducts@69-6'::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_0010: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method cheapestProducts@69::.ctor + } // end of method 'cheapestProducts@69-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -3206,7 +3206,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_0001: ldfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -3238,20 +3238,20 @@ .line 69,69 : 40,53 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/cheapestProducts@69::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'cheapestProducts@69-6'::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_003e: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc .line 69,69 : 40,53 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 69,69 : 40,53 '' @@ -3259,11 +3259,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_0060: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc .line 69,69 : 54,79 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current IL_006c: ldc.i4.1 IL_006d: ret @@ -3273,24 +3273,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_0073: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc .line 69,69 : 40,53 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_008d: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method cheapestProducts@69::GenerateNext + } // end of method 'cheapestProducts@69-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -3302,7 +3302,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_0001: ldfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -3318,7 +3318,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_001b: ldfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -3356,19 +3356,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_004f: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_0063: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -3408,7 +3408,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method cheapestProducts@69::Close + } // end of method 'cheapestProducts@69-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -3417,7 +3417,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/cheapestProducts@69::pc + IL_0001: ldfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -3459,7 +3459,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method cheapestProducts@69::get_CheckClose + } // end of method 'cheapestProducts@69-6'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -3469,9 +3469,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current IL_0006: ret - } // end of method cheapestProducts@69::get_LastGenerated + } // end of method 'cheapestProducts@69-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -3481,20 +3481,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/cheapestProducts@69::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'cheapestProducts@69-6'::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/cheapestProducts@69::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/'cheapestProducts@69-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method cheapestProducts@69::GetFreshEnumerator + } // end of method 'cheapestProducts@69-6'::GetFreshEnumerator - } // end of class cheapestProducts@69 + } // end of class 'cheapestProducts@69-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'cheapestProducts@69-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'cheapestProducts@69-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public valuetype [mscorlib]System.Decimal min @@ -3509,9 +3509,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'cheapestProducts@69-1'::min + IL_0008: stfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'cheapestProducts@69-7'::min IL_000d: ret - } // end of method 'cheapestProducts@69-1'::.ctor + } // end of method 'cheapestProducts@69-7'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product x) cil managed @@ -3522,15 +3522,15 @@ IL_0000: ldarg.1 IL_0001: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0006: ldarg.0 - IL_0007: ldfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'cheapestProducts@69-1'::min + IL_0007: ldfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'cheapestProducts@69-7'::min IL_000c: call bool [mscorlib]System.Decimal::op_Equality(valuetype [mscorlib]System.Decimal, valuetype [mscorlib]System.Decimal) IL_0011: ret - } // end of method 'cheapestProducts@69-1'::Invoke + } // end of method 'cheapestProducts@69-7'::Invoke - } // end of class 'cheapestProducts@69-1' + } // end of class 'cheapestProducts@69-7' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3548,9 +3548,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@67-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@67-18'::builder@ IL_000d: ret - } // end of method 'categories3@67-3'::.ctor + } // end of method 'categories3@67-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -3566,8 +3566,8 @@ IL_0001: stloc.0 .line 68,68 : 9,58 '' IL_0002: ldloc.0 - IL_0003: newobj instance void Linq101Aggregates01/'min@68-2'::.ctor() - IL_0008: ldftn instance valuetype [mscorlib]System.Decimal Linq101Aggregates01/'min@68-2'::Invoke(class [Utils]Utils/Product) + IL_0003: newobj instance void Linq101Aggregates01/'min@68-11'::.ctor() + IL_0008: ldftn instance valuetype [mscorlib]System.Decimal Linq101Aggregates01/'min@68-11'::Invoke(class [Utils]Utils/Product) IL_000e: newobj instance void class [mscorlib]System.Func`2::.ctor(object, native int) IL_0013: call valuetype [mscorlib]System.Decimal [System.Core]System.Linq.Enumerable::Min(class [mscorlib]System.Collections.Generic.IEnumerable`1, @@ -3581,20 +3581,20 @@ IL_0021: ldnull IL_0022: ldc.i4.0 IL_0023: ldnull - IL_0024: newobj instance void Linq101Aggregates01/cheapestProducts@69::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0024: newobj instance void Linq101Aggregates01/'cheapestProducts@69-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0029: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_002e: ldloc.1 - IL_002f: newobj instance void Linq101Aggregates01/'cheapestProducts@69-1'::.ctor(valuetype [mscorlib]System.Decimal) + IL_002f: newobj instance void Linq101Aggregates01/'cheapestProducts@69-7'::.ctor(valuetype [mscorlib]System.Decimal) IL_0034: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0039: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_003e: stloc.2 .line 70,70 : 9,41 '' IL_003f: ldarg.0 - IL_0040: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@67-3'::builder@ + IL_0040: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@67-18'::builder@ IL_0045: ldloc.0 IL_0046: ldloc.1 IL_0047: ldloc.2 @@ -3604,11 +3604,11 @@ IL_004d: tail. IL_004f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>(!!0) IL_0054: ret - } // end of method 'categories3@67-3'::Invoke + } // end of method 'categories3@67-18'::Invoke - } // end of class 'categories3@67-3' + } // end of class 'categories3@67-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@70-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@70-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -3621,7 +3621,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'categories3@70-4'::.ctor + } // end of method 'categories3@70-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [mscorlib]System.Tuple`3,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1> tupledArg) cil managed @@ -3648,11 +3648,11 @@ IL_001c: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0021: ret - } // end of method 'categories3@70-4'::Invoke + } // end of method 'categories3@70-19'::Invoke - } // end of class 'categories3@70-4' + } // end of class 'categories3@70-19' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname maxNum@74 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'maxNum@74-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -3677,17 +3677,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/maxNum@74::pc + IL_0009: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/maxNum@74::current + IL_0010: stfld int32 Linq101Aggregates01/'maxNum@74-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method maxNum@74::.ctor + } // end of method 'maxNum@74-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -3698,7 +3698,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/maxNum@74::pc + IL_0001: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -3731,18 +3731,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/maxNum@74::pc + IL_003d: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc .line 74,74 : 22,41 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 74,74 : 22,41 '' @@ -3750,11 +3750,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/maxNum@74::pc + IL_005f: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc .line 74,74 : 42,49 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Aggregates01/maxNum@74::current + IL_0066: stfld int32 Linq101Aggregates01/'maxNum@74-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -3764,24 +3764,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/maxNum@74::pc + IL_0072: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc .line 74,74 : 22,41 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/maxNum@74::pc + IL_008c: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Aggregates01/maxNum@74::current + IL_0093: stfld int32 Linq101Aggregates01/'maxNum@74-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method maxNum@74::GenerateNext + } // end of method 'maxNum@74-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -3793,7 +3793,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/maxNum@74::pc + IL_0001: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -3809,7 +3809,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/maxNum@74::pc + IL_001b: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -3847,19 +3847,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/maxNum@74::pc + IL_004f: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/maxNum@74::pc + IL_0063: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Aggregates01/maxNum@74::current + IL_006a: stfld int32 Linq101Aggregates01/'maxNum@74-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -3899,7 +3899,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method maxNum@74::Close + } // end of method 'maxNum@74-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -3908,7 +3908,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/maxNum@74::pc + IL_0001: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -3950,7 +3950,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method maxNum@74::get_CheckClose + } // end of method 'maxNum@74-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -3960,9 +3960,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/maxNum@74::current + IL_0001: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::current IL_0006: ret - } // end of method maxNum@74::get_LastGenerated + } // end of method 'maxNum@74-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -3974,15 +3974,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Aggregates01/maxNum@74::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Aggregates01/'maxNum@74-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method maxNum@74::GetFreshEnumerator + } // end of method 'maxNum@74-6'::GetFreshEnumerator - } // end of class maxNum@74 + } // end of class 'maxNum@74-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'maxNum@74-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'maxNum@74-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -3995,7 +3995,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'maxNum@74-1'::.ctor + } // end of method 'maxNum@74-7'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -4005,11 +4005,11 @@ .line 74,74 : 48,49 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'maxNum@74-1'::Invoke + } // end of method 'maxNum@74-7'::Invoke - } // end of class 'maxNum@74-1' + } // end of class 'maxNum@74-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname longestLength@77 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'longestLength@77-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -4034,17 +4034,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/longestLength@77::pc + IL_0009: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Aggregates01/longestLength@77::current + IL_0010: stfld string Linq101Aggregates01/'longestLength@77-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method longestLength@77::.ctor + } // end of method 'longestLength@77-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -4055,7 +4055,7 @@ [1] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/longestLength@77::pc + IL_0001: ldfld int32 Linq101Aggregates01/'longestLength@77-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -4088,18 +4088,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/longestLength@77::pc + IL_003d: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc .line 77,77 : 29,46 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 77,77 : 29,46 '' @@ -4107,11 +4107,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/longestLength@77::pc + IL_005f: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc .line 77,77 : 47,61 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Aggregates01/longestLength@77::current + IL_0066: stfld string Linq101Aggregates01/'longestLength@77-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -4121,24 +4121,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/longestLength@77::pc + IL_0072: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc .line 77,77 : 29,46 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/longestLength@77::pc + IL_008c: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Aggregates01/longestLength@77::current + IL_0093: stfld string Linq101Aggregates01/'longestLength@77-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method longestLength@77::GenerateNext + } // end of method 'longestLength@77-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -4150,7 +4150,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/longestLength@77::pc + IL_0001: ldfld int32 Linq101Aggregates01/'longestLength@77-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -4166,7 +4166,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/longestLength@77::pc + IL_001b: ldfld int32 Linq101Aggregates01/'longestLength@77-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -4204,19 +4204,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/longestLength@77::pc + IL_004f: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/longestLength@77::pc + IL_0063: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Aggregates01/longestLength@77::current + IL_006a: stfld string Linq101Aggregates01/'longestLength@77-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -4256,7 +4256,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method longestLength@77::Close + } // end of method 'longestLength@77-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -4265,7 +4265,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/longestLength@77::pc + IL_0001: ldfld int32 Linq101Aggregates01/'longestLength@77-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -4307,7 +4307,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method longestLength@77::get_CheckClose + } // end of method 'longestLength@77-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -4317,9 +4317,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Aggregates01/longestLength@77::current + IL_0001: ldfld string Linq101Aggregates01/'longestLength@77-6'::current IL_0006: ret - } // end of method longestLength@77::get_LastGenerated + } // end of method 'longestLength@77-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -4331,15 +4331,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Aggregates01/longestLength@77::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Aggregates01/'longestLength@77-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method longestLength@77::GetFreshEnumerator + } // end of method 'longestLength@77-6'::GetFreshEnumerator - } // end of class longestLength@77 + } // end of class 'longestLength@77-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'longestLength@77-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'longestLength@77-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4352,7 +4352,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'longestLength@77-1'::.ctor + } // end of method 'longestLength@77-7'::.ctor .method public strict virtual instance int32 Invoke(string w) cil managed @@ -4363,11 +4363,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'longestLength@77-1'::Invoke + } // end of method 'longestLength@77-7'::Invoke - } // end of class 'longestLength@77-1' + } // end of class 'longestLength@77-7' - .class auto ansi serializable sealed nested assembly beforefieldinit categories4@82 + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@82-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -4385,9 +4385,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories4@82::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@82-15'::builder@ IL_000d: ret - } // end of method categories4@82::.ctor + } // end of method 'categories4@82-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -4400,16 +4400,16 @@ IL_0001: stloc.0 .line 83,83 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories4@82::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@82-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method categories4@82::Invoke + } // end of method 'categories4@82-15'::Invoke - } // end of class categories4@82 + } // end of class 'categories4@82-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4422,7 +4422,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories4@83-1'::.ctor + } // end of method 'categories4@83-16'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -4432,11 +4432,11 @@ .line 83,83 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories4@83-1'::Invoke + } // end of method 'categories4@83-16'::Invoke - } // end of class 'categories4@83-1' + } // end of class 'categories4@83-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4449,7 +4449,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories4@83-2'::.ctor + } // end of method 'categories4@83-17'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -4461,11 +4461,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories4@83-2'::Invoke + } // end of method 'categories4@83-17'::Invoke - } // end of class 'categories4@83-2' + } // end of class 'categories4@83-17' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname mostExpensivePrice@84 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'mostExpensivePrice@84-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -4492,20 +4492,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensivePrice@84::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensivePrice@84-6'::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_0010: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method mostExpensivePrice@84::.ctor + } // end of method 'mostExpensivePrice@84-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -4516,7 +4516,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -4548,20 +4548,20 @@ .line 84,84 : 42,55 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensivePrice@84::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensivePrice@84-6'::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_003e: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc .line 84,84 : 42,55 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 84,84 : 42,55 '' @@ -4569,11 +4569,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_0060: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc .line 84,84 : 56,73 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current IL_006c: ldc.i4.1 IL_006d: ret @@ -4583,24 +4583,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_0073: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc .line 84,84 : 42,55 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_008d: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method mostExpensivePrice@84::GenerateNext + } // end of method 'mostExpensivePrice@84-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -4612,7 +4612,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -4628,7 +4628,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_001b: ldfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -4666,19 +4666,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_004f: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_0063: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -4718,7 +4718,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method mostExpensivePrice@84::Close + } // end of method 'mostExpensivePrice@84-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -4727,7 +4727,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc + IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -4769,7 +4769,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method mostExpensivePrice@84::get_CheckClose + } // end of method 'mostExpensivePrice@84-6'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -4779,9 +4779,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current IL_0006: ret - } // end of method mostExpensivePrice@84::get_LastGenerated + } // end of method 'mostExpensivePrice@84-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -4791,20 +4791,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensivePrice@84::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensivePrice@84-6'::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/mostExpensivePrice@84::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/'mostExpensivePrice@84-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method mostExpensivePrice@84::GetFreshEnumerator + } // end of method 'mostExpensivePrice@84-6'::GetFreshEnumerator - } // end of class mostExpensivePrice@84 + } // end of class 'mostExpensivePrice@84-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'mostExpensivePrice@84-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'mostExpensivePrice@84-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4817,7 +4817,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'mostExpensivePrice@84-1'::.ctor + } // end of method 'mostExpensivePrice@84-7'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product x) cil managed @@ -4829,11 +4829,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'mostExpensivePrice@84-1'::Invoke + } // end of method 'mostExpensivePrice@84-7'::Invoke - } // end of class 'mostExpensivePrice@84-1' + } // end of class 'mostExpensivePrice@84-7' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -4851,9 +4851,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@83-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@83-18'::builder@ IL_000d: ret - } // end of method 'categories4@83-3'::.ctor + } // end of method 'categories4@83-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -4870,18 +4870,18 @@ IL_0008: ldnull IL_0009: ldc.i4.0 IL_000a: ldnull - IL_000b: newobj instance void Linq101Aggregates01/mostExpensivePrice@84::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000b: newobj instance void Linq101Aggregates01/'mostExpensivePrice@84-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0010: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0015: newobj instance void Linq101Aggregates01/'mostExpensivePrice@84-1'::.ctor() + IL_0015: newobj instance void Linq101Aggregates01/'mostExpensivePrice@84-7'::.ctor() IL_001a: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MaxBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_001f: stloc.1 .line 85,85 : 9,43 '' IL_0020: ldarg.0 - IL_0021: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@83-3'::builder@ + IL_0021: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@83-18'::builder@ IL_0026: ldloc.0 IL_0027: ldloc.1 IL_0028: newobj instance void class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>::.ctor(!0, @@ -4889,11 +4889,11 @@ IL_002d: tail. IL_002f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal>,object>(!!0) IL_0034: ret - } // end of method 'categories4@83-3'::Invoke + } // end of method 'categories4@83-18'::Invoke - } // end of class 'categories4@83-3' + } // end of class 'categories4@83-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@85-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@85-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -4906,7 +4906,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'categories4@85-4'::.ctor + } // end of method 'categories4@85-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal> tupledArg) cil managed @@ -4929,11 +4929,11 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'categories4@85-4'::Invoke + } // end of method 'categories4@85-19'::Invoke - } // end of class 'categories4@85-4' + } // end of class 'categories4@85-19' - .class auto ansi serializable sealed nested assembly beforefieldinit categories5@91 + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@91-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -4951,9 +4951,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories5@91::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@91-15'::builder@ IL_000d: ret - } // end of method categories5@91::.ctor + } // end of method 'categories5@91-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -4966,16 +4966,16 @@ IL_0001: stloc.0 .line 92,92 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories5@91::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@91-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method categories5@91::Invoke + } // end of method 'categories5@91-15'::Invoke - } // end of class categories5@91 + } // end of class 'categories5@91-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4988,7 +4988,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories5@92-1'::.ctor + } // end of method 'categories5@92-16'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -4998,11 +4998,11 @@ .line 92,92 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories5@92-1'::Invoke + } // end of method 'categories5@92-16'::Invoke - } // end of class 'categories5@92-1' + } // end of class 'categories5@92-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -5015,7 +5015,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories5@92-2'::.ctor + } // end of method 'categories5@92-17'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -5027,11 +5027,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories5@92-2'::Invoke + } // end of method 'categories5@92-17'::Invoke - } // end of class 'categories5@92-2' + } // end of class 'categories5@92-17' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname maxPrice@93 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'maxPrice@93-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -5058,20 +5058,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/maxPrice@93::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'maxPrice@93-6'::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_0010: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method maxPrice@93::.ctor + } // end of method 'maxPrice@93-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -5082,7 +5082,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_0001: ldfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -5114,20 +5114,20 @@ .line 93,93 : 32,45 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/maxPrice@93::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'maxPrice@93-6'::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_003e: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc .line 93,93 : 32,45 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 93,93 : 32,45 '' @@ -5135,11 +5135,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_0060: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc .line 93,93 : 46,63 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current IL_006c: ldc.i4.1 IL_006d: ret @@ -5149,24 +5149,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_0073: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc .line 93,93 : 32,45 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_008d: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method maxPrice@93::GenerateNext + } // end of method 'maxPrice@93-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -5178,7 +5178,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_0001: ldfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -5194,7 +5194,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_001b: ldfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -5232,19 +5232,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_004f: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_0063: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -5284,7 +5284,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method maxPrice@93::Close + } // end of method 'maxPrice@93-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -5293,7 +5293,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/maxPrice@93::pc + IL_0001: ldfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -5335,7 +5335,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method maxPrice@93::get_CheckClose + } // end of method 'maxPrice@93-6'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -5345,9 +5345,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current IL_0006: ret - } // end of method maxPrice@93::get_LastGenerated + } // end of method 'maxPrice@93-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -5357,20 +5357,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/maxPrice@93::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'maxPrice@93-6'::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/maxPrice@93::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/'maxPrice@93-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method maxPrice@93::GetFreshEnumerator + } // end of method 'maxPrice@93-6'::GetFreshEnumerator - } // end of class maxPrice@93 + } // end of class 'maxPrice@93-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'maxPrice@93-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'maxPrice@93-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -5383,7 +5383,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'maxPrice@93-1'::.ctor + } // end of method 'maxPrice@93-7'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product x) cil managed @@ -5395,11 +5395,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'maxPrice@93-1'::Invoke + } // end of method 'maxPrice@93-7'::Invoke - } // end of class 'maxPrice@93-1' + } // end of class 'maxPrice@93-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname mostExpensiveProducts@94 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'mostExpensiveProducts@94-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -5426,20 +5426,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensiveProducts@94::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensiveProducts@94-6'::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_0010: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method mostExpensiveProducts@94::.ctor + } // end of method 'mostExpensiveProducts@94-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -5450,7 +5450,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -5482,20 +5482,20 @@ .line 94,94 : 45,58 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensiveProducts@94::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensiveProducts@94-6'::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_003e: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc .line 94,94 : 45,58 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 94,94 : 45,58 '' @@ -5503,11 +5503,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_0060: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc .line 94,94 : 59,89 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current IL_006c: ldc.i4.1 IL_006d: ret @@ -5517,24 +5517,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_0073: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc .line 94,94 : 45,58 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_008d: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method mostExpensiveProducts@94::GenerateNext + } // end of method 'mostExpensiveProducts@94-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -5546,7 +5546,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -5562,7 +5562,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_001b: ldfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -5600,19 +5600,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_004f: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_0063: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -5652,7 +5652,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method mostExpensiveProducts@94::Close + } // end of method 'mostExpensiveProducts@94-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -5661,7 +5661,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc + IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -5703,7 +5703,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method mostExpensiveProducts@94::get_CheckClose + } // end of method 'mostExpensiveProducts@94-6'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -5713,9 +5713,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current IL_0006: ret - } // end of method mostExpensiveProducts@94::get_LastGenerated + } // end of method 'mostExpensiveProducts@94-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -5725,20 +5725,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensiveProducts@94::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensiveProducts@94-6'::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/mostExpensiveProducts@94::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/'mostExpensiveProducts@94-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method mostExpensiveProducts@94::GetFreshEnumerator + } // end of method 'mostExpensiveProducts@94-6'::GetFreshEnumerator - } // end of class mostExpensiveProducts@94 + } // end of class 'mostExpensiveProducts@94-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'mostExpensiveProducts@94-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'mostExpensiveProducts@94-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public valuetype [mscorlib]System.Decimal maxPrice @@ -5753,9 +5753,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'mostExpensiveProducts@94-1'::maxPrice + IL_0008: stfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'mostExpensiveProducts@94-7'::maxPrice IL_000d: ret - } // end of method 'mostExpensiveProducts@94-1'::.ctor + } // end of method 'mostExpensiveProducts@94-7'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product x) cil managed @@ -5766,15 +5766,15 @@ IL_0000: ldarg.1 IL_0001: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0006: ldarg.0 - IL_0007: ldfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'mostExpensiveProducts@94-1'::maxPrice + IL_0007: ldfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'mostExpensiveProducts@94-7'::maxPrice IL_000c: call bool [mscorlib]System.Decimal::op_Equality(valuetype [mscorlib]System.Decimal, valuetype [mscorlib]System.Decimal) IL_0011: ret - } // end of method 'mostExpensiveProducts@94-1'::Invoke + } // end of method 'mostExpensiveProducts@94-7'::Invoke - } // end of class 'mostExpensiveProducts@94-1' + } // end of class 'mostExpensiveProducts@94-7' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -5792,9 +5792,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@92-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@92-18'::builder@ IL_000d: ret - } // end of method 'categories5@92-3'::.ctor + } // end of method 'categories5@92-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -5813,12 +5813,12 @@ IL_0008: ldnull IL_0009: ldc.i4.0 IL_000a: ldnull - IL_000b: newobj instance void Linq101Aggregates01/maxPrice@93::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000b: newobj instance void Linq101Aggregates01/'maxPrice@93-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0010: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0015: newobj instance void Linq101Aggregates01/'maxPrice@93-1'::.ctor() + IL_0015: newobj instance void Linq101Aggregates01/'maxPrice@93-7'::.ctor() IL_001a: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MaxBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_001f: stloc.1 @@ -5830,20 +5830,20 @@ IL_0028: ldnull IL_0029: ldc.i4.0 IL_002a: ldnull - IL_002b: newobj instance void Linq101Aggregates01/mostExpensiveProducts@94::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_002b: newobj instance void Linq101Aggregates01/'mostExpensiveProducts@94-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0030: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0035: ldloc.1 - IL_0036: newobj instance void Linq101Aggregates01/'mostExpensiveProducts@94-1'::.ctor(valuetype [mscorlib]System.Decimal) + IL_0036: newobj instance void Linq101Aggregates01/'mostExpensiveProducts@94-7'::.ctor(valuetype [mscorlib]System.Decimal) IL_003b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0040: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0045: stloc.2 .line 95,95 : 9,46 '' IL_0046: ldarg.0 - IL_0047: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@92-3'::builder@ + IL_0047: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@92-18'::builder@ IL_004c: ldloc.0 IL_004d: ldloc.1 IL_004e: ldloc.2 @@ -5853,11 +5853,11 @@ IL_0054: tail. IL_0056: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>(!!0) IL_005b: ret - } // end of method 'categories5@92-3'::Invoke + } // end of method 'categories5@92-18'::Invoke - } // end of class 'categories5@92-3' + } // end of class 'categories5@92-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@95-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@95-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -5870,7 +5870,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'categories5@95-4'::.ctor + } // end of method 'categories5@95-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [mscorlib]System.Tuple`3,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1> tupledArg) cil managed @@ -5897,11 +5897,11 @@ IL_001c: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0021: ret - } // end of method 'categories5@95-4'::Invoke + } // end of method 'categories5@95-19'::Invoke - } // end of class 'categories5@95-4' + } // end of class 'categories5@95-19' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname averageNum@100 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'averageNum@100-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -5926,17 +5926,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/averageNum@100::pc + IL_0009: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld float64 Linq101Aggregates01/averageNum@100::current + IL_0010: stfld float64 Linq101Aggregates01/'averageNum@100-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method averageNum@100::.ctor + } // end of method 'averageNum@100-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -5947,7 +5947,7 @@ [1] float64 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/averageNum@100::pc + IL_0001: ldfld int32 Linq101Aggregates01/'averageNum@100-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -5980,18 +5980,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_numbers2() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/averageNum@100::pc + IL_003d: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc .line 100,100 : 26,46 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 100,100 : 26,46 '' @@ -5999,11 +5999,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/averageNum@100::pc + IL_005f: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc .line 100,100 : 47,58 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld float64 Linq101Aggregates01/averageNum@100::current + IL_0066: stfld float64 Linq101Aggregates01/'averageNum@100-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -6013,24 +6013,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/averageNum@100::pc + IL_0072: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc .line 100,100 : 26,46 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/averageNum@100::pc + IL_008c: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc IL_0091: ldarg.0 IL_0092: ldc.r8 0.0 - IL_009b: stfld float64 Linq101Aggregates01/averageNum@100::current + IL_009b: stfld float64 Linq101Aggregates01/'averageNum@100-6'::current IL_00a0: ldc.i4.0 IL_00a1: ret - } // end of method averageNum@100::GenerateNext + } // end of method 'averageNum@100-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -6042,7 +6042,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/averageNum@100::pc + IL_0001: ldfld int32 Linq101Aggregates01/'averageNum@100-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -6058,7 +6058,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/averageNum@100::pc + IL_001b: ldfld int32 Linq101Aggregates01/'averageNum@100-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -6096,19 +6096,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/averageNum@100::pc + IL_004f: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/averageNum@100::pc + IL_0063: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc IL_0068: ldarg.0 IL_0069: ldc.r8 0.0 - IL_0072: stfld float64 Linq101Aggregates01/averageNum@100::current + IL_0072: stfld float64 Linq101Aggregates01/'averageNum@100-6'::current IL_0077: ldnull IL_0078: stloc.1 IL_0079: leave.s IL_0087 @@ -6148,7 +6148,7 @@ .line 100001,100001 : 0,0 '' IL_009b: ret - } // end of method averageNum@100::Close + } // end of method 'averageNum@100-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -6157,7 +6157,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/averageNum@100::pc + IL_0001: ldfld int32 Linq101Aggregates01/'averageNum@100-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -6199,7 +6199,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method averageNum@100::get_CheckClose + } // end of method 'averageNum@100-6'::get_CheckClose .method public strict virtual instance float64 get_LastGenerated() cil managed @@ -6209,9 +6209,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld float64 Linq101Aggregates01/averageNum@100::current + IL_0001: ldfld float64 Linq101Aggregates01/'averageNum@100-6'::current IL_0006: ret - } // end of method averageNum@100::get_LastGenerated + } // end of method 'averageNum@100-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -6223,15 +6223,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.r8 0.0 - IL_000b: newobj instance void Linq101Aggregates01/averageNum@100::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - float64) + IL_000b: newobj instance void Linq101Aggregates01/'averageNum@100-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + float64) IL_0010: ret - } // end of method averageNum@100::GetFreshEnumerator + } // end of method 'averageNum@100-6'::GetFreshEnumerator - } // end of class averageNum@100 + } // end of class 'averageNum@100-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'averageNum@100-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'averageNum@100-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -6244,7 +6244,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'averageNum@100-1'::.ctor + } // end of method 'averageNum@100-7'::.ctor .method public strict virtual instance float64 Invoke(float64 n) cil managed @@ -6254,11 +6254,11 @@ .line 100,100 : 57,58 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'averageNum@100-1'::Invoke + } // end of method 'averageNum@100-7'::Invoke - } // end of class 'averageNum@100-1' + } // end of class 'averageNum@100-7' - .class auto ansi serializable sealed nested assembly beforefieldinit averageLength@105 + .class auto ansi serializable sealed nested assembly beforefieldinit 'averageLength@105-6' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -6276,9 +6276,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/averageLength@105::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'averageLength@105-6'::builder@ IL_000d: ret - } // end of method averageLength@105::.ctor + } // end of method 'averageLength@105-6'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(string _arg1) cil managed @@ -6297,7 +6297,7 @@ IL_0009: stloc.1 .line 107,107 : 9,21 '' IL_000a: ldarg.0 - IL_000b: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/averageLength@105::builder@ + IL_000b: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'averageLength@105-6'::builder@ IL_0010: ldloc.0 IL_0011: ldloc.1 IL_0012: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, @@ -6305,11 +6305,11 @@ IL_0017: tail. IL_0019: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001e: ret - } // end of method averageLength@105::Invoke + } // end of method 'averageLength@105-6'::Invoke - } // end of class averageLength@105 + } // end of class 'averageLength@105-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'averageLength@107-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'averageLength@107-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,float64> { .method assembly specialname rtspecialname @@ -6322,7 +6322,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,float64>::.ctor() IL_0006: ret - } // end of method 'averageLength@107-1'::.ctor + } // end of method 'averageLength@107-7'::.ctor .method public strict virtual instance float64 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -6341,11 +6341,11 @@ .line 107,107 : 19,21 '' IL_000e: ldloc.1 IL_000f: ret - } // end of method 'averageLength@107-1'::Invoke + } // end of method 'averageLength@107-7'::Invoke - } // end of class 'averageLength@107-1' + } // end of class 'averageLength@107-7' - .class auto ansi serializable sealed nested assembly beforefieldinit categories6@113 + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@113-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -6363,9 +6363,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories6@113::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@113-15'::builder@ IL_000d: ret - } // end of method categories6@113::.ctor + } // end of method 'categories6@113-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -6378,16 +6378,16 @@ IL_0001: stloc.0 .line 114,114 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories6@113::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@113-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method categories6@113::Invoke + } // end of method 'categories6@113-15'::Invoke - } // end of class categories6@113 + } // end of class 'categories6@113-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -6400,7 +6400,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories6@114-1'::.ctor + } // end of method 'categories6@114-16'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -6410,11 +6410,11 @@ .line 114,114 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories6@114-1'::Invoke + } // end of method 'categories6@114-16'::Invoke - } // end of class 'categories6@114-1' + } // end of class 'categories6@114-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -6427,7 +6427,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories6@114-2'::.ctor + } // end of method 'categories6@114-17'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -6439,11 +6439,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories6@114-2'::Invoke + } // end of method 'categories6@114-17'::Invoke - } // end of class 'categories6@114-2' + } // end of class 'categories6@114-17' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname averagePrice@115 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'averagePrice@115-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -6470,20 +6470,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/averagePrice@115::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'averagePrice@115-6'::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_0010: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method averagePrice@115::.ctor + } // end of method 'averagePrice@115-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -6494,7 +6494,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_0001: ldfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -6526,20 +6526,20 @@ .line 115,115 : 36,49 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/averagePrice@115::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'averagePrice@115-6'::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_003e: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc .line 115,115 : 36,49 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 115,115 : 36,49 '' @@ -6547,11 +6547,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_0060: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc .line 115,115 : 50,71 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current IL_006c: ldc.i4.1 IL_006d: ret @@ -6561,24 +6561,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_0073: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc .line 115,115 : 36,49 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_008d: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method averagePrice@115::GenerateNext + } // end of method 'averagePrice@115-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -6590,7 +6590,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_0001: ldfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -6606,7 +6606,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_001b: ldfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -6644,19 +6644,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_004f: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_0063: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -6696,7 +6696,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method averagePrice@115::Close + } // end of method 'averagePrice@115-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -6705,7 +6705,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/averagePrice@115::pc + IL_0001: ldfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -6747,7 +6747,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method averagePrice@115::get_CheckClose + } // end of method 'averagePrice@115-6'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -6757,9 +6757,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current IL_0006: ret - } // end of method averagePrice@115::get_LastGenerated + } // end of method 'averagePrice@115-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -6769,20 +6769,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/averagePrice@115::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'averagePrice@115-6'::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/averagePrice@115::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/'averagePrice@115-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method averagePrice@115::GetFreshEnumerator + } // end of method 'averagePrice@115-6'::GetFreshEnumerator - } // end of class averagePrice@115 + } // end of class 'averagePrice@115-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'averagePrice@115-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'averagePrice@115-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -6795,7 +6795,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'averagePrice@115-1'::.ctor + } // end of method 'averagePrice@115-7'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product x) cil managed @@ -6807,11 +6807,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'averagePrice@115-1'::Invoke + } // end of method 'averagePrice@115-7'::Invoke - } // end of class 'averagePrice@115-1' + } // end of class 'averagePrice@115-7' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -6829,9 +6829,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@114-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@114-18'::builder@ IL_000d: ret - } // end of method 'categories6@114-3'::.ctor + } // end of method 'categories6@114-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -6863,13 +6863,13 @@ IL_000b: ldnull IL_000c: ldc.i4.0 IL_000d: ldnull - IL_000e: newobj instance void Linq101Aggregates01/averagePrice@115::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000e: newobj instance void Linq101Aggregates01/'averagePrice@115-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0013: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0018: stloc.s V_4 - IL_001a: newobj instance void Linq101Aggregates01/'averagePrice@115-1'::.ctor() + IL_001a: newobj instance void Linq101Aggregates01/'averagePrice@115-7'::.ctor() IL_001f: stloc.s V_5 IL_0021: ldloc.s V_4 IL_0023: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -6981,7 +6981,7 @@ IL_00d0: stloc.1 .line 116,116 : 9,37 '' IL_00d1: ldarg.0 - IL_00d2: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@114-3'::builder@ + IL_00d2: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@114-18'::builder@ IL_00d7: ldloc.0 IL_00d8: ldloc.1 IL_00d9: newobj instance void class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>::.ctor(!0, @@ -6989,11 +6989,11 @@ IL_00de: tail. IL_00e0: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal>,object>(!!0) IL_00e5: ret - } // end of method 'categories6@114-3'::Invoke + } // end of method 'categories6@114-18'::Invoke - } // end of class 'categories6@114-3' + } // end of class 'categories6@114-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@116-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@116-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -7006,7 +7006,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'categories6@116-4'::.ctor + } // end of method 'categories6@116-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal> tupledArg) cil managed @@ -7029,16 +7029,16 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'categories6@116-4'::Invoke + } // end of method 'categories6@116-19'::Invoke - } // end of class 'categories6@116-4' + } // end of class 'categories6@116-19' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_factorsOf300() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::factorsOf300@8 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'factorsOf300@8-12' IL_0005: ret } // end of method Linq101Aggregates01::get_factorsOf300 @@ -7047,7 +7047,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::uniqueFactors@10 + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'uniqueFactors@10-12' IL_0005: ret } // end of method Linq101Aggregates01::get_uniqueFactors @@ -7056,7 +7056,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::numbers@17 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'numbers@17-39' IL_0005: ret } // end of method Linq101Aggregates01::get_numbers @@ -7065,7 +7065,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::numSum@19 + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'numSum@19-6' IL_0005: ret } // end of method Linq101Aggregates01::get_numSum @@ -7074,7 +7074,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::words@26 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'words@26-30' IL_0005: ret } // end of method Linq101Aggregates01::get_words @@ -7083,7 +7083,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::totalChars@28 + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'totalChars@28-6' IL_0005: ret } // end of method Linq101Aggregates01::get_totalChars @@ -7092,7 +7092,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::products@35 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'products@35-54' IL_0005: ret } // end of method Linq101Aggregates01::get_products @@ -7101,7 +7101,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories@37 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories@37-12' IL_0005: ret } // end of method Linq101Aggregates01::get_categories @@ -7110,7 +7110,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::minNum@49 + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'minNum@49-6' IL_0005: ret } // end of method Linq101Aggregates01::get_minNum @@ -7119,7 +7119,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::shortestWord@52 + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'shortestWord@52-6' IL_0005: ret } // end of method Linq101Aggregates01::get_shortestWord @@ -7128,7 +7128,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories2@55 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories2@55-6' IL_0005: ret } // end of method Linq101Aggregates01::get_categories2 @@ -7137,7 +7137,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::categories3@64 + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::'categories3@64-6' IL_0005: ret } // end of method Linq101Aggregates01::get_categories3 @@ -7146,7 +7146,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::maxNum@74 + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'maxNum@74-6' IL_0005: ret } // end of method Linq101Aggregates01::get_maxNum @@ -7155,7 +7155,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::longestLength@77 + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'longestLength@77-6' IL_0005: ret } // end of method Linq101Aggregates01::get_longestLength @@ -7164,7 +7164,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories4@80 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories4@80-6' IL_0005: ret } // end of method Linq101Aggregates01::get_categories4 @@ -7173,7 +7173,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::categories5@89 + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::'categories5@89-6' IL_0005: ret } // end of method Linq101Aggregates01::get_categories5 @@ -7182,7 +7182,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::numbers2@99 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'numbers2@99-12' IL_0005: ret } // end of method Linq101Aggregates01::get_numbers2 @@ -7191,7 +7191,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld float64 ''.$Linq101Aggregates01::averageNum@100 + IL_0000: ldsfld float64 ''.$Linq101Aggregates01::'averageNum@100-6' IL_0005: ret } // end of method Linq101Aggregates01::get_averageNum @@ -7200,7 +7200,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld float64 ''.$Linq101Aggregates01::averageLength@103 + IL_0000: ldsfld float64 ''.$Linq101Aggregates01::'averageLength@103-6' IL_0005: ret } // end of method Linq101Aggregates01::get_averageLength @@ -7209,7 +7209,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories6@111 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories6@111-6' IL_0005: ret } // end of method Linq101Aggregates01::get_categories6 @@ -7329,45 +7329,45 @@ .class private abstract auto ansi sealed ''.$Linq101Aggregates01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 factorsOf300@8 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'factorsOf300@8-12' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 uniqueFactors@10 + .field static assembly int32 'uniqueFactors@10-12' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numbers@17 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@17-39' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 numSum@19 + .field static assembly int32 'numSum@19-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 words@26 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@26-30' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 totalChars@28 + .field static assembly int32 'totalChars@28-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 products@35 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@35-54' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] categories@37 + .field static assembly class [mscorlib]System.Tuple`2[] 'categories@37-12' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 minNum@49 + .field static assembly int32 'minNum@49-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 shortestWord@52 + .field static assembly int32 'shortestWord@52-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] categories2@55 + .field static assembly class [mscorlib]System.Tuple`2[] 'categories2@55-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] categories3@64 + .field static assembly class [mscorlib]System.Tuple`2>[] 'categories3@64-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 maxNum@74 + .field static assembly int32 'maxNum@74-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 longestLength@77 + .field static assembly int32 'longestLength@77-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] categories4@80 + .field static assembly class [mscorlib]System.Tuple`2[] 'categories4@80-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] categories5@89 + .field static assembly class [mscorlib]System.Tuple`2>[] 'categories5@89-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numbers2@99 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers2@99-12' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly float64 averageNum@100 + .field static assembly float64 'averageNum@100-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly float64 averageLength@103 + .field static assembly float64 'averageLength@103-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] categories6@111 + .field static assembly class [mscorlib]System.Tuple`2[] 'categories6@111-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -7465,7 +7465,7 @@ IL_001e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0023: dup - IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::factorsOf300@8 + IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'factorsOf300@8-12' IL_0029: stloc.0 .line 10,14 : 1,20 '' IL_002a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7474,15 +7474,15 @@ IL_0033: ldnull IL_0034: ldc.i4.0 IL_0035: ldc.i4.0 - IL_0036: newobj instance void Linq101Aggregates01/uniqueFactors@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0036: newobj instance void Linq101Aggregates01/'uniqueFactors@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_003b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0040: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Distinct(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_0045: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_004a: call int32 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Length(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_004f: dup - IL_0050: stsfld int32 ''.$Linq101Aggregates01::uniqueFactors@10 + IL_0050: stsfld int32 ''.$Linq101Aggregates01::'uniqueFactors@10-12' IL_0055: stloc.1 .line 17,17 : 1,47 '' IL_0056: ldc.i4.5 @@ -7517,7 +7517,7 @@ IL_0093: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0098: dup - IL_0099: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::numbers@17 + IL_0099: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'numbers@17-39' IL_009e: stloc.2 IL_009f: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00a4: stloc.s V_21 @@ -7526,12 +7526,12 @@ IL_00aa: ldnull IL_00ab: ldc.i4.0 IL_00ac: ldc.i4.0 - IL_00ad: newobj instance void Linq101Aggregates01/numSum@21::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_00ad: newobj instance void Linq101Aggregates01/'numSum@21-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_00b2: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00b7: stloc.s V_23 - IL_00b9: newobj instance void Linq101Aggregates01/'numSum@22-1'::.ctor() + IL_00b9: newobj instance void Linq101Aggregates01/'numSum@22-7'::.ctor() IL_00be: stloc.s V_24 IL_00c0: ldloc.s V_23 IL_00c2: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -7590,7 +7590,7 @@ } // end handler IL_0118: ldloc.s V_27 IL_011a: dup - IL_011b: stsfld int32 ''.$Linq101Aggregates01::numSum@19 + IL_011b: stsfld int32 ''.$Linq101Aggregates01::'numSum@19-6' IL_0120: stloc.3 .line 26,26 : 1,45 '' IL_0121: ldstr "cherry" @@ -7604,7 +7604,7 @@ IL_013f: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0144: dup - IL_0145: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::words@26 + IL_0145: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'words@26-30' IL_014a: stloc.s words IL_014c: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0151: stloc.s V_30 @@ -7613,12 +7613,12 @@ IL_0157: ldnull IL_0158: ldc.i4.0 IL_0159: ldnull - IL_015a: newobj instance void Linq101Aggregates01/totalChars@30::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_015a: newobj instance void Linq101Aggregates01/'totalChars@30-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_015f: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0164: stloc.s V_32 - IL_0166: newobj instance void Linq101Aggregates01/'totalChars@31-1'::.ctor() + IL_0166: newobj instance void Linq101Aggregates01/'totalChars@31-7'::.ctor() IL_016b: stloc.s V_33 IL_016d: ldloc.s V_32 IL_016f: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -7677,12 +7677,12 @@ } // end handler IL_01c5: ldloc.s V_36 IL_01c7: dup - IL_01c8: stsfld int32 ''.$Linq101Aggregates01::totalChars@28 + IL_01c8: stsfld int32 ''.$Linq101Aggregates01::'totalChars@28-6' IL_01cd: stloc.s totalChars .line 35,35 : 1,32 '' IL_01cf: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_01d4: dup - IL_01d5: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::products@35 + IL_01d5: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'products@35-54' IL_01da: stloc.s products .line 37,46 : 1,21 '' IL_01dc: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7695,53 +7695,53 @@ IL_01ed: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_01f2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01f7: ldloc.s V_39 - IL_01f9: newobj instance void Linq101Aggregates01/categories@39::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01f9: newobj instance void Linq101Aggregates01/'categories@39-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01fe: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0203: newobj instance void Linq101Aggregates01/'categories@40-1'::.ctor() - IL_0208: newobj instance void Linq101Aggregates01/'categories@40-2'::.ctor() + IL_0203: newobj instance void Linq101Aggregates01/'categories@40-16'::.ctor() + IL_0208: newobj instance void Linq101Aggregates01/'categories@40-17'::.ctor() IL_020d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0212: ldloc.s V_39 - IL_0214: newobj instance void Linq101Aggregates01/'categories@40-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0214: newobj instance void Linq101Aggregates01/'categories@40-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0219: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,int32>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_021e: newobj instance void Linq101Aggregates01/'categories@45-4'::.ctor() + IL_021e: newobj instance void Linq101Aggregates01/'categories@45-19'::.ctor() IL_0223: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,int32>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0228: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_022d: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0232: dup - IL_0233: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories@37 + IL_0233: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories@37-12' IL_0238: stloc.s categories IL_023a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_023f: ldnull IL_0240: ldc.i4.0 IL_0241: ldc.i4.0 - IL_0242: newobj instance void Linq101Aggregates01/minNum@49::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0242: newobj instance void Linq101Aggregates01/'minNum@49-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0247: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_024c: newobj instance void Linq101Aggregates01/'minNum@49-1'::.ctor() + IL_024c: newobj instance void Linq101Aggregates01/'minNum@49-7'::.ctor() IL_0251: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MinBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0256: dup - IL_0257: stsfld int32 ''.$Linq101Aggregates01::minNum@49 + IL_0257: stsfld int32 ''.$Linq101Aggregates01::'minNum@49-6' IL_025c: stloc.s minNum IL_025e: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0263: ldnull IL_0264: ldc.i4.0 IL_0265: ldnull - IL_0266: newobj instance void Linq101Aggregates01/shortestWord@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0266: newobj instance void Linq101Aggregates01/'shortestWord@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_026b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0270: newobj instance void Linq101Aggregates01/'shortestWord@52-1'::.ctor() + IL_0270: newobj instance void Linq101Aggregates01/'shortestWord@52-7'::.ctor() IL_0275: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MinBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_027a: dup - IL_027b: stsfld int32 ''.$Linq101Aggregates01::shortestWord@52 + IL_027b: stsfld int32 ''.$Linq101Aggregates01::'shortestWord@52-6' IL_0280: stloc.s shortestWord .line 55,61 : 1,21 '' IL_0282: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7754,25 +7754,25 @@ IL_0293: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_0298: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_029d: ldloc.s V_40 - IL_029f: newobj instance void Linq101Aggregates01/categories2@57::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_029f: newobj instance void Linq101Aggregates01/'categories2@57-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_02a4: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_02a9: newobj instance void Linq101Aggregates01/'categories2@58-1'::.ctor() - IL_02ae: newobj instance void Linq101Aggregates01/'categories2@58-2'::.ctor() + IL_02a9: newobj instance void Linq101Aggregates01/'categories2@58-16'::.ctor() + IL_02ae: newobj instance void Linq101Aggregates01/'categories2@58-17'::.ctor() IL_02b3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_02b8: ldloc.s V_40 - IL_02ba: newobj instance void Linq101Aggregates01/'categories2@58-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_02ba: newobj instance void Linq101Aggregates01/'categories2@58-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_02bf: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_02c4: newobj instance void Linq101Aggregates01/'categories2@60-4'::.ctor() + IL_02c4: newobj instance void Linq101Aggregates01/'categories2@60-19'::.ctor() IL_02c9: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_02ce: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_02d3: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_02d8: dup - IL_02d9: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories2@55 + IL_02d9: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories2@55-6' IL_02de: stloc.s categories2 .line 64,71 : 1,21 '' IL_02e0: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7785,53 +7785,53 @@ IL_02f1: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_02f6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_02fb: ldloc.s V_41 - IL_02fd: newobj instance void Linq101Aggregates01/categories3@66::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_02fd: newobj instance void Linq101Aggregates01/'categories3@66-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0302: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0307: newobj instance void Linq101Aggregates01/'categories3@67-1'::.ctor() - IL_030c: newobj instance void Linq101Aggregates01/'categories3@67-2'::.ctor() + IL_0307: newobj instance void Linq101Aggregates01/'categories3@67-16'::.ctor() + IL_030c: newobj instance void Linq101Aggregates01/'categories3@67-17'::.ctor() IL_0311: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0316: ldloc.s V_41 - IL_0318: newobj instance void Linq101Aggregates01/'categories3@67-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0318: newobj instance void Linq101Aggregates01/'categories3@67-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_031d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0322: newobj instance void Linq101Aggregates01/'categories3@70-4'::.ctor() + IL_0322: newobj instance void Linq101Aggregates01/'categories3@70-19'::.ctor() IL_0327: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_032c: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0331: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0336: dup - IL_0337: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::categories3@64 + IL_0337: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::'categories3@64-6' IL_033c: stloc.s categories3 IL_033e: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0343: ldnull IL_0344: ldc.i4.0 IL_0345: ldc.i4.0 - IL_0346: newobj instance void Linq101Aggregates01/maxNum@74::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0346: newobj instance void Linq101Aggregates01/'maxNum@74-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_034b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0350: newobj instance void Linq101Aggregates01/'maxNum@74-1'::.ctor() + IL_0350: newobj instance void Linq101Aggregates01/'maxNum@74-7'::.ctor() IL_0355: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MaxBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_035a: dup - IL_035b: stsfld int32 ''.$Linq101Aggregates01::maxNum@74 + IL_035b: stsfld int32 ''.$Linq101Aggregates01::'maxNum@74-6' IL_0360: stloc.s maxNum IL_0362: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0367: ldnull IL_0368: ldc.i4.0 IL_0369: ldnull - IL_036a: newobj instance void Linq101Aggregates01/longestLength@77::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_036a: newobj instance void Linq101Aggregates01/'longestLength@77-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_036f: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0374: newobj instance void Linq101Aggregates01/'longestLength@77-1'::.ctor() + IL_0374: newobj instance void Linq101Aggregates01/'longestLength@77-7'::.ctor() IL_0379: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MaxBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_037e: dup - IL_037f: stsfld int32 ''.$Linq101Aggregates01::longestLength@77 + IL_037f: stsfld int32 ''.$Linq101Aggregates01::'longestLength@77-6' IL_0384: stloc.s longestLength .line 80,86 : 1,21 '' IL_0386: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7844,25 +7844,25 @@ IL_0397: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_039c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03a1: ldloc.s V_42 - IL_03a3: newobj instance void Linq101Aggregates01/categories4@82::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_03a3: newobj instance void Linq101Aggregates01/'categories4@82-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_03a8: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_03ad: newobj instance void Linq101Aggregates01/'categories4@83-1'::.ctor() - IL_03b2: newobj instance void Linq101Aggregates01/'categories4@83-2'::.ctor() + IL_03ad: newobj instance void Linq101Aggregates01/'categories4@83-16'::.ctor() + IL_03b2: newobj instance void Linq101Aggregates01/'categories4@83-17'::.ctor() IL_03b7: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_03bc: ldloc.s V_42 - IL_03be: newobj instance void Linq101Aggregates01/'categories4@83-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_03be: newobj instance void Linq101Aggregates01/'categories4@83-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_03c3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_03c8: newobj instance void Linq101Aggregates01/'categories4@85-4'::.ctor() + IL_03c8: newobj instance void Linq101Aggregates01/'categories4@85-19'::.ctor() IL_03cd: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_03d2: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_03d7: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03dc: dup - IL_03dd: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories4@80 + IL_03dd: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories4@80-6' IL_03e2: stloc.s categories4 .line 89,96 : 1,21 '' IL_03e4: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7875,25 +7875,25 @@ IL_03f5: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_03fa: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03ff: ldloc.s V_43 - IL_0401: newobj instance void Linq101Aggregates01/categories5@91::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0401: newobj instance void Linq101Aggregates01/'categories5@91-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0406: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_040b: newobj instance void Linq101Aggregates01/'categories5@92-1'::.ctor() - IL_0410: newobj instance void Linq101Aggregates01/'categories5@92-2'::.ctor() + IL_040b: newobj instance void Linq101Aggregates01/'categories5@92-16'::.ctor() + IL_0410: newobj instance void Linq101Aggregates01/'categories5@92-17'::.ctor() IL_0415: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_041a: ldloc.s V_43 - IL_041c: newobj instance void Linq101Aggregates01/'categories5@92-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_041c: newobj instance void Linq101Aggregates01/'categories5@92-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0421: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0426: newobj instance void Linq101Aggregates01/'categories5@95-4'::.ctor() + IL_0426: newobj instance void Linq101Aggregates01/'categories5@95-19'::.ctor() IL_042b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0430: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0435: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_043a: dup - IL_043b: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::categories5@89 + IL_043b: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::'categories5@89-6' IL_0440: stloc.s categories5 .line 99,99 : 1,66 '' IL_0442: ldc.r8 5. @@ -7928,7 +7928,7 @@ IL_04ce: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_04d3: dup - IL_04d4: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::numbers2@99 + IL_04d4: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'numbers2@99-12' IL_04d9: stloc.s numbers2 IL_04db: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_04e0: stloc.s V_44 @@ -7937,12 +7937,12 @@ IL_04e6: ldnull IL_04e7: ldc.i4.0 IL_04e8: ldc.r8 0.0 - IL_04f1: newobj instance void Linq101Aggregates01/averageNum@100::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - float64) + IL_04f1: newobj instance void Linq101Aggregates01/'averageNum@100-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + float64) IL_04f6: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_04fb: stloc.s V_46 - IL_04fd: newobj instance void Linq101Aggregates01/'averageNum@100-1'::.ctor() + IL_04fd: newobj instance void Linq101Aggregates01/'averageNum@100-7'::.ctor() IL_0502: stloc.s V_47 IL_0504: ldloc.s V_46 IL_0506: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -8041,7 +8041,7 @@ } // end handler IL_05a4: ldloc.s V_50 IL_05a6: dup - IL_05a7: stsfld float64 ''.$Linq101Aggregates01::averageNum@100 + IL_05a7: stsfld float64 ''.$Linq101Aggregates01::'averageNum@100-6' IL_05ac: stloc.s averageNum IL_05ae: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_05b3: stloc.s V_56 @@ -8052,11 +8052,11 @@ IL_05bd: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_words() IL_05c2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_05c7: ldloc.s V_56 - IL_05c9: newobj instance void Linq101Aggregates01/averageLength@105::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_05c9: newobj instance void Linq101Aggregates01/'averageLength@105-6'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_05ce: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_05d3: stloc.s V_58 - IL_05d5: newobj instance void Linq101Aggregates01/'averageLength@107-1'::.ctor() + IL_05d5: newobj instance void Linq101Aggregates01/'averageLength@107-7'::.ctor() IL_05da: stloc.s V_59 IL_05dc: ldloc.s V_58 IL_05de: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() @@ -8155,7 +8155,7 @@ } // end handler IL_067c: ldloc.s V_62 IL_067e: dup - IL_067f: stsfld float64 ''.$Linq101Aggregates01::averageLength@103 + IL_067f: stsfld float64 ''.$Linq101Aggregates01::'averageLength@103-6' IL_0684: stloc.s averageLength .line 111,117 : 1,21 '' IL_0686: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -8168,25 +8168,25 @@ IL_0697: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_069c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_06a1: ldloc.s V_68 - IL_06a3: newobj instance void Linq101Aggregates01/categories6@113::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_06a3: newobj instance void Linq101Aggregates01/'categories6@113-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_06a8: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_06ad: newobj instance void Linq101Aggregates01/'categories6@114-1'::.ctor() - IL_06b2: newobj instance void Linq101Aggregates01/'categories6@114-2'::.ctor() + IL_06ad: newobj instance void Linq101Aggregates01/'categories6@114-16'::.ctor() + IL_06b2: newobj instance void Linq101Aggregates01/'categories6@114-17'::.ctor() IL_06b7: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_06bc: ldloc.s V_68 - IL_06be: newobj instance void Linq101Aggregates01/'categories6@114-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_06be: newobj instance void Linq101Aggregates01/'categories6@114-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_06c3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_06c8: newobj instance void Linq101Aggregates01/'categories6@116-4'::.ctor() + IL_06c8: newobj instance void Linq101Aggregates01/'categories6@116-19'::.ctor() IL_06cd: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_06d2: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_06d7: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_06dc: dup - IL_06dd: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories6@111 + IL_06dd: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories6@111-6' IL_06e2: stloc.s categories6 IL_06e4: ret } // end of method $Linq101Aggregates01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl index 4560207e6f7..55a365acbdf 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00660000 +// Image base: 0x01760000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname products12@12 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'products12@12-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -88,17 +88,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101ElementOperators01/products12@12::pc + IL_0009: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current + IL_0010: stfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method products12@12::.ctor + } // end of method 'products12@12-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -110,7 +110,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101ElementOperators01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/products12@12::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'products12@12-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_products() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101ElementOperators01/products12@12::pc + IL_003d: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc .line 12,12 : 9,29 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 12,12 : 9,29 '' @@ -162,11 +162,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101ElementOperators01/products12@12::pc + IL_005f: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc .line 13,13 : 9,33 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current + IL_0066: stfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -176,24 +176,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101ElementOperators01/products12@12::pc + IL_0072: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc .line 12,12 : 9,29 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101ElementOperators01/products12@12::pc + IL_008c: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current + IL_0093: stfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method products12@12::GenerateNext + } // end of method 'products12@12-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -205,7 +205,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/products12@12::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'products12@12-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -221,7 +221,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101ElementOperators01/products12@12::pc + IL_001b: ldfld int32 Linq101ElementOperators01/'products12@12-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -259,19 +259,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101ElementOperators01/products12@12::pc + IL_004f: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101ElementOperators01/products12@12::pc + IL_0063: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current + IL_006a: stfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -311,7 +311,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method products12@12::Close + } // end of method 'products12@12-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -320,7 +320,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/products12@12::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'products12@12-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -362,7 +362,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method products12@12::get_CheckClose + } // end of method 'products12@12-6'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -372,9 +372,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current + IL_0001: ldfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current IL_0006: ret - } // end of method products12@12::get_LastGenerated + } // end of method 'products12@12-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -386,15 +386,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101ElementOperators01/products12@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0003: newobj instance void Linq101ElementOperators01/'products12@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0008: ret - } // end of method products12@12::GetFreshEnumerator + } // end of method 'products12@12-6'::GetFreshEnumerator - } // end of class products12@12 + } // end of class 'products12@12-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'products12@13-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'products12@13-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -407,7 +407,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'products12@13-1'::.ctor + } // end of method 'products12@13-7'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product p) cil managed @@ -420,11 +420,11 @@ IL_0006: ldc.i4.s 12 IL_0008: ceq IL_000a: ret - } // end of method 'products12@13-1'::Invoke + } // end of method 'products12@13-7'::Invoke - } // end of class 'products12@13-1' + } // end of class 'products12@13-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname startsWithO@22 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'startsWithO@22-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -449,17 +449,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_0009: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101ElementOperators01/startsWithO@22::current + IL_0010: stfld string Linq101ElementOperators01/'startsWithO@22-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method startsWithO@22::.ctor + } // end of method 'startsWithO@22-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -470,7 +470,7 @@ [1] string s) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -503,18 +503,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_strings() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_003d: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc .line 22,22 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 22,22 : 9,28 '' @@ -522,11 +522,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_005f: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc .line 23,23 : 9,28 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101ElementOperators01/startsWithO@22::current + IL_0066: stfld string Linq101ElementOperators01/'startsWithO@22-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -536,24 +536,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_0072: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc .line 22,22 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_008c: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101ElementOperators01/startsWithO@22::current + IL_0093: stfld string Linq101ElementOperators01/'startsWithO@22-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method startsWithO@22::GenerateNext + } // end of method 'startsWithO@22-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -565,7 +565,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -581,7 +581,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_001b: ldfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -619,19 +619,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_004f: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_0063: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101ElementOperators01/startsWithO@22::current + IL_006a: stfld string Linq101ElementOperators01/'startsWithO@22-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -671,7 +671,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method startsWithO@22::Close + } // end of method 'startsWithO@22-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -680,7 +680,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/startsWithO@22::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -722,7 +722,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method startsWithO@22::get_CheckClose + } // end of method 'startsWithO@22-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -732,9 +732,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101ElementOperators01/startsWithO@22::current + IL_0001: ldfld string Linq101ElementOperators01/'startsWithO@22-6'::current IL_0006: ret - } // end of method startsWithO@22::get_LastGenerated + } // end of method 'startsWithO@22-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -746,15 +746,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101ElementOperators01/startsWithO@22::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101ElementOperators01/'startsWithO@22-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method startsWithO@22::GetFreshEnumerator + } // end of method 'startsWithO@22-6'::GetFreshEnumerator - } // end of class startsWithO@22 + } // end of class 'startsWithO@22-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'startsWithO@23-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'startsWithO@23-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -767,7 +767,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'startsWithO@23-1'::.ctor + } // end of method 'startsWithO@23-7'::.ctor .method public strict virtual instance bool Invoke(string s) cil managed @@ -781,11 +781,11 @@ IL_0007: ldc.i4.s 111 IL_0009: ceq IL_000b: ret - } // end of method 'startsWithO@23-1'::Invoke + } // end of method 'startsWithO@23-7'::Invoke - } // end of class 'startsWithO@23-1' + } // end of class 'startsWithO@23-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname firstNumOrDefault@31 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'firstNumOrDefault@31-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -810,17 +810,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_0009: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current + IL_0010: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method firstNumOrDefault@31::.ctor + } // end of method 'firstNumOrDefault@31-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -831,7 +831,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -864,18 +864,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_003d: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc .line 31,31 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 31,31 : 9,28 '' @@ -883,11 +883,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_005f: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc .line 32,32 : 9,22 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current + IL_0066: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -897,24 +897,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_0072: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc .line 31,31 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_008c: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current + IL_0093: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method firstNumOrDefault@31::GenerateNext + } // end of method 'firstNumOrDefault@31-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -926,7 +926,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -942,7 +942,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_001b: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -980,19 +980,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_004f: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_0063: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current + IL_006a: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1032,7 +1032,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method firstNumOrDefault@31::Close + } // end of method 'firstNumOrDefault@31-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1041,7 +1041,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1083,7 +1083,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method firstNumOrDefault@31::get_CheckClose + } // end of method 'firstNumOrDefault@31-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -1093,9 +1093,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current + IL_0001: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current IL_0006: ret - } // end of method firstNumOrDefault@31::get_LastGenerated + } // end of method 'firstNumOrDefault@31-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1107,15 +1107,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101ElementOperators01/firstNumOrDefault@31::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101ElementOperators01/'firstNumOrDefault@31-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method firstNumOrDefault@31::GetFreshEnumerator + } // end of method 'firstNumOrDefault@31-3'::GetFreshEnumerator - } // end of class firstNumOrDefault@31 + } // end of class 'firstNumOrDefault@31-3' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname fourthLowNum@52 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'fourthLowNum@52-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1140,17 +1140,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_0009: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101ElementOperators01/fourthLowNum@52::current + IL_0010: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method fourthLowNum@52::.ctor + } // end of method 'fourthLowNum@52-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1161,7 +1161,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1194,18 +1194,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_numbers2() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_003d: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc .line 52,52 : 9,29 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 52,52 : 9,29 '' @@ -1213,11 +1213,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_005f: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc .line 53,53 : 9,22 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101ElementOperators01/fourthLowNum@52::current + IL_0066: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1227,24 +1227,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_0072: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc .line 52,52 : 9,29 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_008c: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101ElementOperators01/fourthLowNum@52::current + IL_0093: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method fourthLowNum@52::GenerateNext + } // end of method 'fourthLowNum@52-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1256,7 +1256,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1272,7 +1272,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_001b: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1310,19 +1310,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_004f: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_0063: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101ElementOperators01/fourthLowNum@52::current + IL_006a: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1362,7 +1362,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method fourthLowNum@52::Close + } // end of method 'fourthLowNum@52-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1371,7 +1371,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::pc + IL_0001: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1413,7 +1413,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method fourthLowNum@52::get_CheckClose + } // end of method 'fourthLowNum@52-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -1423,9 +1423,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::current + IL_0001: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current IL_0006: ret - } // end of method fourthLowNum@52::get_LastGenerated + } // end of method 'fourthLowNum@52-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1437,15 +1437,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101ElementOperators01/fourthLowNum@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101ElementOperators01/'fourthLowNum@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method fourthLowNum@52::GetFreshEnumerator + } // end of method 'fourthLowNum@52-6'::GetFreshEnumerator - } // end of class fourthLowNum@52 + } // end of class 'fourthLowNum@52-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'fourthLowNum@53-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'fourthLowNum@53-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1458,7 +1458,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'fourthLowNum@53-1'::.ctor + } // end of method 'fourthLowNum@53-7'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -1470,16 +1470,16 @@ IL_0001: ldc.i4.5 IL_0002: cgt IL_0004: ret - } // end of method 'fourthLowNum@53-1'::Invoke + } // end of method 'fourthLowNum@53-7'::Invoke - } // end of class 'fourthLowNum@53-1' + } // end of class 'fourthLowNum@53-7' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_products() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'products@8-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'products@8-56' IL_0005: ret } // end of method Linq101ElementOperators01::get_products @@ -1488,7 +1488,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Product ''.$Linq101ElementOperators01::products12@10 + IL_0000: ldsfld class [Utils]Utils/Product ''.$Linq101ElementOperators01::'products12@10-6' IL_0005: ret } // end of method Linq101ElementOperators01::get_products12 @@ -1497,7 +1497,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::strings@18 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'strings@18-12' IL_0005: ret } // end of method Linq101ElementOperators01::get_strings @@ -1506,7 +1506,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld string ''.$Linq101ElementOperators01::startsWithO@20 + IL_0000: ldsfld string ''.$Linq101ElementOperators01::'startsWithO@20-6' IL_0005: ret } // end of method Linq101ElementOperators01::get_startsWithO @@ -1526,7 +1526,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101ElementOperators01::firstNumOrDefault@29 + IL_0000: ldsfld int32 ''.$Linq101ElementOperators01::'firstNumOrDefault@29-6' IL_0005: ret } // end of method Linq101ElementOperators01::get_firstNumOrDefault @@ -1535,7 +1535,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'numbers2@48-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'numbers2@48-14' IL_0005: ret } // end of method Linq101ElementOperators01::get_numbers2 @@ -1544,7 +1544,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101ElementOperators01::fourthLowNum@50 + IL_0000: ldsfld int32 ''.$Linq101ElementOperators01::'fourthLowNum@50-6' IL_0005: ret } // end of method Linq101ElementOperators01::get_fourthLowNum @@ -1596,19 +1596,19 @@ .class private abstract auto ansi sealed ''.$Linq101ElementOperators01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@8-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@8-56' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Product products12@10 + .field static assembly class [Utils]Utils/Product 'products12@10-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 strings@18 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'strings@18-12' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly string startsWithO@20 + .field static assembly string 'startsWithO@20-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 firstNumOrDefault@29 + .field static assembly int32 'firstNumOrDefault@29-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers2@48-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers2@48-14' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 fourthLowNum@50 + .field static assembly int32 'fourthLowNum@50-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1633,7 +1633,7 @@ .line 8,8 : 1,32 '' IL_0000: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0005: dup - IL_0006: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'products@8-2' + IL_0006: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'products@8-56' IL_000b: stloc.0 IL_000c: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0011: stloc.s V_8 @@ -1642,16 +1642,16 @@ IL_0017: ldnull IL_0018: ldc.i4.0 IL_0019: ldnull - IL_001a: newobj instance void Linq101ElementOperators01/products12@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_001a: newobj instance void Linq101ElementOperators01/'products12@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_001f: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0024: newobj instance void Linq101ElementOperators01/'products12@13-1'::.ctor() + IL_0024: newobj instance void Linq101ElementOperators01/'products12@13-7'::.ctor() IL_0029: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_002e: callvirt instance !!0 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Head(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_0033: dup - IL_0034: stsfld class [Utils]Utils/Product ''.$Linq101ElementOperators01::products12@10 + IL_0034: stsfld class [Utils]Utils/Product ''.$Linq101ElementOperators01::'products12@10-6' IL_0039: stloc.1 .line 18,18 : 1,97 '' IL_003a: ldstr "zero" @@ -1686,7 +1686,7 @@ IL_009e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_00a3: dup - IL_00a4: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::strings@18 + IL_00a4: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'strings@18-12' IL_00a9: stloc.2 IL_00aa: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00af: stloc.s V_9 @@ -1695,16 +1695,16 @@ IL_00b5: ldnull IL_00b6: ldc.i4.0 IL_00b7: ldnull - IL_00b8: newobj instance void Linq101ElementOperators01/startsWithO@22::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_00b8: newobj instance void Linq101ElementOperators01/'startsWithO@22-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_00bd: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_00c2: newobj instance void Linq101ElementOperators01/'startsWithO@23-1'::.ctor() + IL_00c2: newobj instance void Linq101ElementOperators01/'startsWithO@23-7'::.ctor() IL_00c7: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00cc: callvirt instance !!0 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Head(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_00d1: dup - IL_00d2: stsfld string ''.$Linq101ElementOperators01::startsWithO@20 + IL_00d2: stsfld string ''.$Linq101ElementOperators01::'startsWithO@20-6' IL_00d7: stloc.3 .line 28,28 : 1,28 '' IL_00d8: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_numbers() @@ -1713,13 +1713,13 @@ IL_00e4: ldnull IL_00e5: ldc.i4.0 IL_00e6: ldc.i4.0 - IL_00e7: newobj instance void Linq101ElementOperators01/firstNumOrDefault@31::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_00e7: newobj instance void Linq101ElementOperators01/'firstNumOrDefault@31-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_00ec: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00f1: callvirt instance !!0 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::HeadOrDefault(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_00f6: dup - IL_00f7: stsfld int32 ''.$Linq101ElementOperators01::firstNumOrDefault@29 + IL_00f7: stsfld int32 ''.$Linq101ElementOperators01::'firstNumOrDefault@29-6' IL_00fc: stloc.s firstNumOrDefault .line 48,48 : 1,48 '' IL_00fe: ldc.i4.5 @@ -1754,7 +1754,7 @@ IL_013b: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0140: dup - IL_0141: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'numbers2@48-2' + IL_0141: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'numbers2@48-14' IL_0146: stloc.s numbers2 IL_0148: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_014d: stloc.s V_10 @@ -1763,18 +1763,18 @@ IL_0153: ldnull IL_0154: ldc.i4.0 IL_0155: ldc.i4.0 - IL_0156: newobj instance void Linq101ElementOperators01/fourthLowNum@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0156: newobj instance void Linq101ElementOperators01/'fourthLowNum@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_015b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0160: newobj instance void Linq101ElementOperators01/'fourthLowNum@53-1'::.ctor() + IL_0160: newobj instance void Linq101ElementOperators01/'fourthLowNum@53-7'::.ctor() IL_0165: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_016a: ldc.i4.1 IL_016b: callvirt instance !!0 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Nth(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, int32) IL_0170: dup - IL_0171: stsfld int32 ''.$Linq101ElementOperators01::fourthLowNum@50 + IL_0171: stsfld int32 ''.$Linq101ElementOperators01::'fourthLowNum@50-6' IL_0176: stloc.s fourthLowNum IL_0178: ret } // end of method $Linq101ElementOperators01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl index 84629ce59fe..6967bf7a455 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl @@ -59,7 +59,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x001F0000 +// Image base: 0x00570000 // =============== CLASS MEMBERS DECLARATION =================== @@ -68,7 +68,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit numberGroups@14 + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@14-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -86,9 +86,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/numberGroups@14::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@14-15'::builder@ IL_000d: ret - } // end of method numberGroups@14::.ctor + } // end of method 'numberGroups@14-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(int32 _arg1) cil managed @@ -102,16 +102,16 @@ IL_0001: stloc.0 .line 15,15 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/numberGroups@14::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@14-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method numberGroups@14::Invoke + } // end of method 'numberGroups@14-15'::Invoke - } // end of class numberGroups@14 + } // end of class 'numberGroups@14-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -124,7 +124,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'numberGroups@15-1'::.ctor + } // end of method 'numberGroups@15-16'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -134,11 +134,11 @@ .line 15,15 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'numberGroups@15-1'::Invoke + } // end of method 'numberGroups@15-16'::Invoke - } // end of class 'numberGroups@15-1' + } // end of class 'numberGroups@15-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -151,7 +151,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'numberGroups@15-2'::.ctor + } // end of method 'numberGroups@15-17'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -163,11 +163,11 @@ IL_0001: ldc.i4.5 IL_0002: rem IL_0003: ret - } // end of method 'numberGroups@15-2'::Invoke + } // end of method 'numberGroups@15-17'::Invoke - } // end of class 'numberGroups@15-2' + } // end of class 'numberGroups@15-17' - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -185,9 +185,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@15-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@15-18'::builder@ IL_000d: ret - } // end of method 'numberGroups@15-3'::.ctor + } // end of method 'numberGroups@15-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -199,16 +199,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@15-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@15-18'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'numberGroups@15-3'::Invoke + } // end of method 'numberGroups@15-18'::Invoke - } // end of class 'numberGroups@15-3' + } // end of class 'numberGroups@15-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@16-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@16-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -221,7 +221,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'numberGroups@16-4'::.ctor + } // end of method 'numberGroups@16-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -236,11 +236,11 @@ IL_000c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0011: ret - } // end of method 'numberGroups@16-4'::Invoke + } // end of method 'numberGroups@16-19'::Invoke - } // end of class 'numberGroups@16-4' + } // end of class 'numberGroups@16-19' - .class auto ansi serializable sealed nested assembly beforefieldinit wordGroups@24 + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@24-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -258,9 +258,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/wordGroups@24::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@24-15'::builder@ IL_000d: ret - } // end of method wordGroups@24::.ctor + } // end of method 'wordGroups@24-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(string _arg1) cil managed @@ -273,16 +273,16 @@ IL_0001: stloc.0 .line 25,25 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/wordGroups@24::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@24-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method wordGroups@24::Invoke + } // end of method 'wordGroups@24-15'::Invoke - } // end of class wordGroups@24 + } // end of class 'wordGroups@24-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -295,7 +295,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'wordGroups@25-1'::.ctor + } // end of method 'wordGroups@25-16'::.ctor .method public strict virtual instance string Invoke(string w) cil managed @@ -305,11 +305,11 @@ .line 25,25 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'wordGroups@25-1'::Invoke + } // end of method 'wordGroups@25-16'::Invoke - } // end of class 'wordGroups@25-1' + } // end of class 'wordGroups@25-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -322,7 +322,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'wordGroups@25-2'::.ctor + } // end of method 'wordGroups@25-17'::.ctor .method public strict virtual instance char Invoke(string w) cil managed @@ -334,11 +334,11 @@ IL_0001: ldc.i4.0 IL_0002: callvirt instance char [mscorlib]System.String::get_Chars(int32) IL_0007: ret - } // end of method 'wordGroups@25-2'::Invoke + } // end of method 'wordGroups@25-17'::Invoke - } // end of class 'wordGroups@25-2' + } // end of class 'wordGroups@25-17' - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -356,9 +356,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@25-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@25-18'::builder@ IL_000d: ret - } // end of method 'wordGroups@25-3'::.ctor + } // end of method 'wordGroups@25-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -370,16 +370,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@25-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@25-18'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'wordGroups@25-3'::Invoke + } // end of method 'wordGroups@25-18'::Invoke - } // end of class 'wordGroups@25-3' + } // end of class 'wordGroups@25-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@26-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@26-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -392,7 +392,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'wordGroups@26-4'::.ctor + } // end of method 'wordGroups@26-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -407,11 +407,11 @@ IL_000c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0011: ret - } // end of method 'wordGroups@26-4'::Invoke + } // end of method 'wordGroups@26-19'::Invoke - } // end of class 'wordGroups@26-4' + } // end of class 'wordGroups@26-19' - .class auto ansi serializable sealed nested assembly beforefieldinit orderGroups@34 + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@34-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -429,9 +429,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/orderGroups@34::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@34-15'::builder@ IL_000d: ret - } // end of method orderGroups@34::.ctor + } // end of method 'orderGroups@34-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -444,16 +444,16 @@ IL_0001: stloc.0 .line 35,35 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/orderGroups@34::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@34-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method orderGroups@34::Invoke + } // end of method 'orderGroups@34-15'::Invoke - } // end of class orderGroups@34 + } // end of class 'orderGroups@34-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -466,7 +466,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'orderGroups@35-1'::.ctor + } // end of method 'orderGroups@35-16'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -476,11 +476,11 @@ .line 35,35 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'orderGroups@35-1'::Invoke + } // end of method 'orderGroups@35-16'::Invoke - } // end of class 'orderGroups@35-1' + } // end of class 'orderGroups@35-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -493,7 +493,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'orderGroups@35-2'::.ctor + } // end of method 'orderGroups@35-17'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -505,11 +505,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'orderGroups@35-2'::Invoke + } // end of method 'orderGroups@35-17'::Invoke - } // end of class 'orderGroups@35-2' + } // end of class 'orderGroups@35-17' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -527,9 +527,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@35-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@35-18'::builder@ IL_000d: ret - } // end of method 'orderGroups@35-3'::.ctor + } // end of method 'orderGroups@35-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -541,16 +541,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@35-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@35-18'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'orderGroups@35-3'::Invoke + } // end of method 'orderGroups@35-18'::Invoke - } // end of class 'orderGroups@35-3' + } // end of class 'orderGroups@35-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@36-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@36-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -563,7 +563,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'orderGroups@36-4'::.ctor + } // end of method 'orderGroups@36-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -578,11 +578,11 @@ IL_000c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0011: ret - } // end of method 'orderGroups@36-4'::Invoke + } // end of method 'orderGroups@36-19'::Invoke - } // end of class 'orderGroups@36-4' + } // end of class 'orderGroups@36-19' - .class auto ansi serializable sealed nested assembly beforefieldinit yearGroups@47 + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@47-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -600,9 +600,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/yearGroups@47::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@47-15'::builder@ IL_000d: ret - } // end of method yearGroups@47::.ctor + } // end of method 'yearGroups@47-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -615,16 +615,16 @@ IL_0001: stloc.0 .line 48,48 : 17,48 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/yearGroups@47::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@47-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method yearGroups@47::Invoke + } // end of method 'yearGroups@47-15'::Invoke - } // end of class yearGroups@47 + } // end of class 'yearGroups@47-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -637,7 +637,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'yearGroups@48-1'::.ctor + } // end of method 'yearGroups@48-16'::.ctor .method public strict virtual instance class [Utils]Utils/Order Invoke(class [Utils]Utils/Order o) cil managed @@ -647,11 +647,11 @@ .line 48,48 : 28,29 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'yearGroups@48-1'::Invoke + } // end of method 'yearGroups@48-16'::Invoke - } // end of class 'yearGroups@48-1' + } // end of class 'yearGroups@48-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -664,7 +664,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'yearGroups@48-2'::.ctor + } // end of method 'yearGroups@48-17'::.ctor .method public strict virtual instance int32 Invoke(class [Utils]Utils/Order o) cil managed @@ -679,11 +679,11 @@ IL_0007: ldloca.s V_0 IL_0009: call instance int32 [mscorlib]System.DateTime::get_Year() IL_000e: ret - } // end of method 'yearGroups@48-2'::Invoke + } // end of method 'yearGroups@48-17'::Invoke - } // end of class 'yearGroups@48-2' + } // end of class 'yearGroups@48-17' - .class auto ansi serializable sealed nested assembly beforefieldinit monthGroups@51 + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@51-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -701,9 +701,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/monthGroups@51::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@51-15'::builder@ IL_000d: ret - } // end of method monthGroups@51::.ctor + } // end of method 'monthGroups@51-15'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Order _arg4) cil managed @@ -716,16 +716,16 @@ IL_0001: stloc.0 .line 52,52 : 25,57 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/monthGroups@51::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@51-15'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method monthGroups@51::Invoke + } // end of method 'monthGroups@51-15'::Invoke - } // end of class monthGroups@51 + } // end of class 'monthGroups@51-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -738,7 +738,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'monthGroups@52-1'::.ctor + } // end of method 'monthGroups@52-16'::.ctor .method public strict virtual instance class [Utils]Utils/Order Invoke(class [Utils]Utils/Order o) cil managed @@ -748,11 +748,11 @@ .line 52,52 : 36,37 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'monthGroups@52-1'::Invoke + } // end of method 'monthGroups@52-16'::Invoke - } // end of class 'monthGroups@52-1' + } // end of class 'monthGroups@52-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-17' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -765,7 +765,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'monthGroups@52-2'::.ctor + } // end of method 'monthGroups@52-17'::.ctor .method public strict virtual instance int32 Invoke(class [Utils]Utils/Order o) cil managed @@ -780,11 +780,11 @@ IL_0007: ldloca.s V_0 IL_0009: call instance int32 [mscorlib]System.DateTime::get_Month() IL_000e: ret - } // end of method 'monthGroups@52-2'::Invoke + } // end of method 'monthGroups@52-17'::Invoke - } // end of class 'monthGroups@52-2' + } // end of class 'monthGroups@52-17' - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -802,9 +802,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@52-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@52-18'::builder@ IL_000d: ret - } // end of method 'monthGroups@52-3'::.ctor + } // end of method 'monthGroups@52-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg5) cil managed @@ -816,16 +816,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@52-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@52-18'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'monthGroups@52-3'::Invoke + } // end of method 'monthGroups@52-18'::Invoke - } // end of class 'monthGroups@52-3' + } // end of class 'monthGroups@52-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@53-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@53-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -838,7 +838,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'monthGroups@53-4'::.ctor + } // end of method 'monthGroups@53-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [System.Core]System.Linq.IGrouping`2 mg) cil managed @@ -853,11 +853,11 @@ IL_000c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0011: ret - } // end of method 'monthGroups@53-4'::Invoke + } // end of method 'monthGroups@53-19'::Invoke - } // end of class 'monthGroups@53-4' + } // end of class 'monthGroups@53-19' - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -875,9 +875,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@48-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@48-18'::builder@ IL_000d: ret - } // end of method 'yearGroups@48-3'::.ctor + } // end of method 'yearGroups@48-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg3) cil managed @@ -900,26 +900,26 @@ IL_000d: ldloc.0 IL_000e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0013: ldloc.2 - IL_0014: newobj instance void Linq101Grouping01/monthGroups@51::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0014: newobj instance void Linq101Grouping01/'monthGroups@51-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0019: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_001e: newobj instance void Linq101Grouping01/'monthGroups@52-1'::.ctor() - IL_0023: newobj instance void Linq101Grouping01/'monthGroups@52-2'::.ctor() + IL_001e: newobj instance void Linq101Grouping01/'monthGroups@52-16'::.ctor() + IL_0023: newobj instance void Linq101Grouping01/'monthGroups@52-17'::.ctor() IL_0028: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_002d: ldloc.2 - IL_002e: newobj instance void Linq101Grouping01/'monthGroups@52-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_002e: newobj instance void Linq101Grouping01/'monthGroups@52-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0033: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0038: newobj instance void Linq101Grouping01/'monthGroups@53-4'::.ctor() + IL_0038: newobj instance void Linq101Grouping01/'monthGroups@53-19'::.ctor() IL_003d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0042: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0047: stloc.1 .line 55,55 : 17,55 '' IL_0048: ldarg.0 - IL_0049: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@48-3'::builder@ + IL_0049: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@48-18'::builder@ IL_004e: ldloc.0 IL_004f: ldloc.1 IL_0050: newobj instance void class [mscorlib]System.Tuple`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>::.ctor(!0, @@ -927,11 +927,11 @@ IL_0055: tail. IL_0057: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object>(!!0) IL_005c: ret - } // end of method 'yearGroups@48-3'::Invoke + } // end of method 'yearGroups@48-18'::Invoke - } // end of class 'yearGroups@48-3' + } // end of class 'yearGroups@48-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@55-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@55-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,class [mscorlib]System.Tuple`2[]>> { .method assembly specialname rtspecialname @@ -944,7 +944,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,class [mscorlib]System.Tuple`2[]>>::.ctor() IL_0006: ret - } // end of method 'yearGroups@55-4'::.ctor + } // end of method 'yearGroups@55-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2[]> Invoke(class [mscorlib]System.Tuple`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>> tupledArg) cil managed @@ -968,11 +968,11 @@ IL_001a: newobj instance void class [mscorlib]System.Tuple`2[]>::.ctor(!0, !1) IL_001f: ret - } // end of method 'yearGroups@55-4'::Invoke + } // end of method 'yearGroups@55-19'::Invoke - } // end of class 'yearGroups@55-4' + } // end of class 'yearGroups@55-19' - .class auto ansi serializable sealed nested assembly beforefieldinit customerOrderGroups@44 + .class auto ansi serializable sealed nested assembly beforefieldinit 'customerOrderGroups@44-6' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2[]>>>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -990,9 +990,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2[]>>>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/customerOrderGroups@44::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'customerOrderGroups@44-6'::builder@ IL_000d: ret - } // end of method customerOrderGroups@44::.ctor + } // end of method 'customerOrderGroups@44-6'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2[]>>>,object> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -1017,26 +1017,26 @@ IL_000e: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0013: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0018: ldloc.2 - IL_0019: newobj instance void Linq101Grouping01/yearGroups@47::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0019: newobj instance void Linq101Grouping01/'yearGroups@47-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_001e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0023: newobj instance void Linq101Grouping01/'yearGroups@48-1'::.ctor() - IL_0028: newobj instance void Linq101Grouping01/'yearGroups@48-2'::.ctor() + IL_0023: newobj instance void Linq101Grouping01/'yearGroups@48-16'::.ctor() + IL_0028: newobj instance void Linq101Grouping01/'yearGroups@48-17'::.ctor() IL_002d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0032: ldloc.2 - IL_0033: newobj instance void Linq101Grouping01/'yearGroups@48-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0033: newobj instance void Linq101Grouping01/'yearGroups@48-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0038: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_003d: newobj instance void Linq101Grouping01/'yearGroups@55-4'::.ctor() + IL_003d: newobj instance void Linq101Grouping01/'yearGroups@55-19'::.ctor() IL_0042: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2[]>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0047: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2[]>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_004c: stloc.1 .line 57,57 : 9,53 '' IL_004d: ldarg.0 - IL_004e: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/customerOrderGroups@44::builder@ + IL_004e: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'customerOrderGroups@44-6'::builder@ IL_0053: ldloc.0 IL_0054: ldloc.1 IL_0055: newobj instance void class [mscorlib]System.Tuple`2[]>>>::.ctor(!0, @@ -1044,11 +1044,11 @@ IL_005a: tail. IL_005c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield[]>>>,object>(!!0) IL_0061: ret - } // end of method customerOrderGroups@44::Invoke + } // end of method 'customerOrderGroups@44-6'::Invoke - } // end of class customerOrderGroups@44 + } // end of class 'customerOrderGroups@44-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'customerOrderGroups@57-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'customerOrderGroups@57-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2[]>>>,class [mscorlib]System.Tuple`2[]>[]>> { .method assembly specialname rtspecialname @@ -1061,7 +1061,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2[]>>>,class [mscorlib]System.Tuple`2[]>[]>>::.ctor() IL_0006: ret - } // end of method 'customerOrderGroups@57-1'::.ctor + } // end of method 'customerOrderGroups@57-7'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2[]>[]> Invoke(class [mscorlib]System.Tuple`2[]>>> tupledArg) cil managed @@ -1085,16 +1085,16 @@ IL_001a: newobj instance void class [mscorlib]System.Tuple`2[]>[]>::.ctor(!0, !1) IL_001f: ret - } // end of method 'customerOrderGroups@57-1'::Invoke + } // end of method 'customerOrderGroups@57-7'::Invoke - } // end of class 'customerOrderGroups@57-1' + } // end of class 'customerOrderGroups@57-7' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_digits() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::digits@7 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'digits@7-24' IL_0005: ret } // end of method Linq101Grouping01::get_digits @@ -1103,7 +1103,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'numbers@10-3' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'numbers@10-42' IL_0005: ret } // end of method Linq101Grouping01::get_numbers @@ -1112,7 +1112,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::numberGroups@12 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'numberGroups@12-6' IL_0005: ret } // end of method Linq101Grouping01::get_numberGroups @@ -1121,7 +1121,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'words@20-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'words@20-32' IL_0005: ret } // end of method Linq101Grouping01::get_words @@ -1130,7 +1130,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::wordGroups@22 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'wordGroups@22-6' IL_0005: ret } // end of method Linq101Grouping01::get_wordGroups @@ -1139,7 +1139,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'products@30-4' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'products@30-58' IL_0005: ret } // end of method Linq101Grouping01::get_products @@ -1148,7 +1148,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::orderGroups@32 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'orderGroups@32-6' IL_0005: ret } // end of method Linq101Grouping01::get_orderGroups @@ -1157,7 +1157,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::customers@40 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'customers@40-30' IL_0005: ret } // end of method Linq101Grouping01::get_customers @@ -1166,7 +1166,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[]>[]>[] ''.$Linq101Grouping01::customerOrderGroups@42 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[]>[]>[] ''.$Linq101Grouping01::'customerOrderGroups@42-6' IL_0005: ret } // end of method Linq101Grouping01::get_customerOrderGroups @@ -1229,23 +1229,23 @@ .class private abstract auto ansi sealed ''.$Linq101Grouping01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 digits@7 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@7-24' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@10-3' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@10-42' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] numberGroups@12 + .field static assembly class [mscorlib]System.Tuple`2[] 'numberGroups@12-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@20-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@20-32' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] wordGroups@22 + .field static assembly class [mscorlib]System.Tuple`2[] 'wordGroups@22-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@30-4' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@30-58' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] orderGroups@32 + .field static assembly class [mscorlib]System.Tuple`2[] 'orderGroups@32-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 customers@40 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@40-30' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[]>[]>[] customerOrderGroups@42 + .field static assembly class [mscorlib]System.Tuple`2[]>[]>[] 'customerOrderGroups@42-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1302,7 +1302,7 @@ IL_0064: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0069: dup - IL_006a: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::digits@7 + IL_006a: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'digits@7-24' IL_006f: stloc.0 .line 10,10 : 1,47 '' IL_0070: ldc.i4.5 @@ -1337,7 +1337,7 @@ IL_00ad: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_00b2: dup - IL_00b3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'numbers@10-3' + IL_00b3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'numbers@10-42' IL_00b8: stloc.1 .line 12,17 : 1,21 '' IL_00b9: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1350,25 +1350,25 @@ IL_00ca: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Grouping01::get_numbers() IL_00cf: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00d4: ldloc.s V_9 - IL_00d6: newobj instance void Linq101Grouping01/numberGroups@14::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00d6: newobj instance void Linq101Grouping01/'numberGroups@14-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00db: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00e0: newobj instance void Linq101Grouping01/'numberGroups@15-1'::.ctor() - IL_00e5: newobj instance void Linq101Grouping01/'numberGroups@15-2'::.ctor() + IL_00e0: newobj instance void Linq101Grouping01/'numberGroups@15-16'::.ctor() + IL_00e5: newobj instance void Linq101Grouping01/'numberGroups@15-17'::.ctor() IL_00ea: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00ef: ldloc.s V_9 - IL_00f1: newobj instance void Linq101Grouping01/'numberGroups@15-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00f1: newobj instance void Linq101Grouping01/'numberGroups@15-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00f6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00fb: newobj instance void Linq101Grouping01/'numberGroups@16-4'::.ctor() + IL_00fb: newobj instance void Linq101Grouping01/'numberGroups@16-19'::.ctor() IL_0100: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0105: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_010a: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_010f: dup - IL_0110: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::numberGroups@12 + IL_0110: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'numberGroups@12-6' IL_0115: stloc.2 .line 20,20 : 1,80 '' IL_0116: ldstr "blueberry" @@ -1391,7 +1391,7 @@ IL_0152: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0157: dup - IL_0158: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'words@20-2' + IL_0158: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'words@20-32' IL_015d: stloc.3 .line 22,27 : 1,21 '' IL_015e: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1404,30 +1404,30 @@ IL_016f: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Grouping01::get_words() IL_0174: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0179: ldloc.s V_10 - IL_017b: newobj instance void Linq101Grouping01/wordGroups@24::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_017b: newobj instance void Linq101Grouping01/'wordGroups@24-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0180: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0185: newobj instance void Linq101Grouping01/'wordGroups@25-1'::.ctor() - IL_018a: newobj instance void Linq101Grouping01/'wordGroups@25-2'::.ctor() + IL_0185: newobj instance void Linq101Grouping01/'wordGroups@25-16'::.ctor() + IL_018a: newobj instance void Linq101Grouping01/'wordGroups@25-17'::.ctor() IL_018f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0194: ldloc.s V_10 - IL_0196: newobj instance void Linq101Grouping01/'wordGroups@25-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0196: newobj instance void Linq101Grouping01/'wordGroups@25-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_019b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01a0: newobj instance void Linq101Grouping01/'wordGroups@26-4'::.ctor() + IL_01a0: newobj instance void Linq101Grouping01/'wordGroups@26-19'::.ctor() IL_01a5: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01aa: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_01af: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01b4: dup - IL_01b5: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::wordGroups@22 + IL_01b5: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'wordGroups@22-6' IL_01ba: stloc.s wordGroups .line 30,30 : 1,32 '' IL_01bc: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_01c1: dup - IL_01c2: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'products@30-4' + IL_01c2: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'products@30-58' IL_01c7: stloc.s products .line 32,37 : 1,21 '' IL_01c9: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1440,30 +1440,30 @@ IL_01da: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Grouping01::get_products() IL_01df: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01e4: ldloc.s V_11 - IL_01e6: newobj instance void Linq101Grouping01/orderGroups@34::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01e6: newobj instance void Linq101Grouping01/'orderGroups@34-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01eb: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01f0: newobj instance void Linq101Grouping01/'orderGroups@35-1'::.ctor() - IL_01f5: newobj instance void Linq101Grouping01/'orderGroups@35-2'::.ctor() + IL_01f0: newobj instance void Linq101Grouping01/'orderGroups@35-16'::.ctor() + IL_01f5: newobj instance void Linq101Grouping01/'orderGroups@35-17'::.ctor() IL_01fa: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01ff: ldloc.s V_11 - IL_0201: newobj instance void Linq101Grouping01/'orderGroups@35-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0201: newobj instance void Linq101Grouping01/'orderGroups@35-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0206: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_020b: newobj instance void Linq101Grouping01/'orderGroups@36-4'::.ctor() + IL_020b: newobj instance void Linq101Grouping01/'orderGroups@36-19'::.ctor() IL_0210: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0215: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_021a: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_021f: dup - IL_0220: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::orderGroups@32 + IL_0220: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'orderGroups@32-6' IL_0225: stloc.s orderGroups .line 40,40 : 1,34 '' IL_0227: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_022c: dup - IL_022d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::customers@40 + IL_022d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'customers@40-30' IL_0232: stloc.s customers .line 42,58 : 1,21 '' IL_0234: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1474,16 +1474,16 @@ IL_0241: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Grouping01::get_customers() IL_0246: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_024b: ldloc.s V_12 - IL_024d: newobj instance void Linq101Grouping01/customerOrderGroups@44::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_024d: newobj instance void Linq101Grouping01/'customerOrderGroups@44-6'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0252: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For[]>>>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0257: newobj instance void Linq101Grouping01/'customerOrderGroups@57-1'::.ctor() + IL_0257: newobj instance void Linq101Grouping01/'customerOrderGroups@57-7'::.ctor() IL_025c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select[]>>>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2[]>[]>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0261: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2[]>[]>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0266: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray[]>[]>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_026b: dup - IL_026c: stsfld class [mscorlib]System.Tuple`2[]>[]>[] ''.$Linq101Grouping01::customerOrderGroups@42 + IL_026c: stsfld class [mscorlib]System.Tuple`2[]>[]>[] ''.$Linq101Grouping01::'customerOrderGroups@42-6' IL_0271: stloc.s customerOrderGroups IL_0273: ret } // end of method $Linq101Grouping01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl index aec28d14dcc..3ded8452a38 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl @@ -59,7 +59,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00350000 +// Image base: 0x00730000 // =============== CLASS MEMBERS DECLARATION =================== @@ -68,7 +68,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit q@14 + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -81,7 +81,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method q@14::.ctor + } // end of method 'q@14-15'::.ctor .method public strict virtual instance string Invoke(string c) cil managed @@ -92,11 +92,11 @@ .line 14,14 : 32,33 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Joins01.fs' IL_0000: ldarg.1 IL_0001: ret - } // end of method q@14::Invoke + } // end of method 'q@14-15'::Invoke - } // end of class q@14 + } // end of class 'q@14-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -109,7 +109,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q@14-1'::.ctor + } // end of method 'q@14-16'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -121,11 +121,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'q@14-1'::Invoke + } // end of method 'q@14-16'::Invoke - } // end of class 'q@14-1' + } // end of class 'q@14-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-17' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3> { .method assembly specialname rtspecialname @@ -138,7 +138,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3>::.ctor() IL_0006: ret - } // end of method 'q@14-2'::.ctor + } // end of method 'q@14-17'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(string c, @@ -152,11 +152,11 @@ IL_0002: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0007: ret - } // end of method 'q@14-2'::Invoke + } // end of method 'q@14-17'::Invoke - } // end of class 'q@14-2' + } // end of class 'q@14-17' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -174,9 +174,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q@14-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q@14-18'::builder@ IL_000d: ret - } // end of method 'q@14-3'::.ctor + } // end of method 'q@14-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [mscorlib]System.Tuple`2 _arg1) cil managed @@ -196,7 +196,7 @@ IL_000a: call instance !0 class [mscorlib]System.Tuple`2::get_Item1() IL_000f: stloc.2 IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q@14-3'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q@14-18'::builder@ IL_0016: ldloc.2 IL_0017: ldloc.1 IL_0018: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, @@ -204,11 +204,11 @@ IL_001d: tail. IL_001f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0024: ret - } // end of method 'q@14-3'::Invoke + } // end of method 'q@14-18'::Invoke - } // end of class 'q@14-3' + } // end of class 'q@14-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@15-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@15-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -221,7 +221,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'q@15-4'::.ctor + } // end of method 'q@15-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -244,11 +244,11 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'q@15-4'::Invoke + } // end of method 'q@15-19'::Invoke - } // end of class 'q@15-4' + } // end of class 'q@15-19' - .class auto ansi serializable sealed nested assembly beforefieldinit q2@22 + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -261,7 +261,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method q2@22::.ctor + } // end of method 'q2@22-15'::.ctor .method public strict virtual instance string Invoke(string c) cil managed @@ -271,11 +271,11 @@ .line 22,22 : 37,38 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method q2@22::Invoke + } // end of method 'q2@22-15'::Invoke - } // end of class q2@22 + } // end of class 'q2@22-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-16' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -288,7 +288,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q2@22-1'::.ctor + } // end of method 'q2@22-16'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -300,11 +300,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'q2@22-1'::Invoke + } // end of method 'q2@22-16'::Invoke - } // end of class 'q2@22-1' + } // end of class 'q2@22-16' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-17' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -317,7 +317,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'q2@22-2'::.ctor + } // end of method 'q2@22-17'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(string c, @@ -331,11 +331,11 @@ IL_0002: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0007: ret - } // end of method 'q2@22-2'::Invoke + } // end of method 'q2@22-17'::Invoke - } // end of class 'q2@22-2' + } // end of class 'q2@22-17' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -353,9 +353,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q2@22-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q2@22-18'::builder@ IL_000d: ret - } // end of method 'q2@22-3'::.ctor + } // end of method 'q2@22-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,object> Invoke(class [mscorlib]System.Tuple`2> _arg1) cil managed @@ -375,7 +375,7 @@ IL_000a: call instance !0 class [mscorlib]System.Tuple`2>::get_Item1() IL_000f: stloc.2 IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q2@22-3'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q2@22-18'::builder@ IL_0016: ldloc.2 IL_0017: ldloc.1 IL_0018: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, @@ -383,11 +383,11 @@ IL_001d: tail. IL_001f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield>,object>(!!0) IL_0024: ret - } // end of method 'q2@22-3'::Invoke + } // end of method 'q2@22-18'::Invoke - } // end of class 'q2@22-3' + } // end of class 'q2@22-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@23-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@23-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -400,7 +400,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'q2@23-4'::.ctor + } // end of method 'q2@23-19'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [mscorlib]System.Tuple`2> tupledArg) cil managed @@ -422,11 +422,11 @@ IL_0010: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0015: ret - } // end of method 'q2@23-4'::Invoke + } // end of method 'q2@23-19'::Invoke - } // end of class 'q2@23-4' + } // end of class 'q2@23-19' - .class auto ansi serializable sealed nested assembly beforefieldinit q3@30 + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -439,7 +439,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method q3@30::.ctor + } // end of method 'q3@30-18'::.ctor .method public strict virtual instance string Invoke(string c) cil managed @@ -449,11 +449,11 @@ .line 30,30 : 37,38 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method q3@30::Invoke + } // end of method 'q3@30-18'::Invoke - } // end of class q3@30 + } // end of class 'q3@30-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -466,7 +466,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q3@30-1'::.ctor + } // end of method 'q3@30-19'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -478,11 +478,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'q3@30-1'::Invoke + } // end of method 'q3@30-19'::Invoke - } // end of class 'q3@30-1' + } // end of class 'q3@30-19' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-20' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -495,7 +495,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'q3@30-2'::.ctor + } // end of method 'q3@30-20'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(string c, @@ -509,11 +509,11 @@ IL_0002: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0007: ret - } // end of method 'q3@30-2'::Invoke + } // end of method 'q3@30-20'::Invoke - } // end of class 'q3@30-2' + } // end of class 'q3@30-20' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@31-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@31-22' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -535,15 +535,15 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@31-4'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@31-22'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q3@31-4'::ps + IL_000f: stfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q3@31-22'::ps IL_0014: ldarg.0 IL_0015: ldarg.3 - IL_0016: stfld string Linq101Joins01/'q3@31-4'::c + IL_0016: stfld string Linq101Joins01/'q3@31-22'::c IL_001b: ret - } // end of method 'q3@31-4'::.ctor + } // end of method 'q3@31-22'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product>,object> Invoke(class [Utils]Utils/Product _arg2) cil managed @@ -556,11 +556,11 @@ IL_0001: stloc.0 .line 32,32 : 9,34 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@31-4'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@31-22'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld string Linq101Joins01/'q3@31-4'::c + IL_0009: ldfld string Linq101Joins01/'q3@31-22'::c IL_000e: ldarg.0 - IL_000f: ldfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q3@31-4'::ps + IL_000f: ldfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q3@31-22'::ps IL_0014: ldloc.0 IL_0015: newobj instance void class [mscorlib]System.Tuple`3,class [Utils]Utils/Product>::.ctor(!0, !1, @@ -568,11 +568,11 @@ IL_001a: tail. IL_001c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,class [Utils]Utils/Product>,object>(!!0) IL_0021: ret - } // end of method 'q3@31-4'::Invoke + } // end of method 'q3@31-22'::Invoke - } // end of class 'q3@31-4' + } // end of class 'q3@31-22' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-21' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -590,9 +590,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-21'::builder@ IL_000d: ret - } // end of method 'q3@30-3'::.ctor + } // end of method 'q3@30-21'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable> Invoke(class [mscorlib]System.Tuple`2> _arg1) cil managed @@ -612,27 +612,27 @@ IL_000a: call instance !0 class [mscorlib]System.Tuple`2>::get_Item1() IL_000f: stloc.2 IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-3'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-21'::builder@ IL_0016: ldarg.0 - IL_0017: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-3'::builder@ + IL_0017: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-21'::builder@ IL_001c: ldloc.1 IL_001d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0022: ldarg.0 - IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-3'::builder@ + IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-21'::builder@ IL_0028: ldloc.1 IL_0029: ldloc.2 - IL_002a: newobj instance void Linq101Joins01/'q3@31-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [mscorlib]System.Collections.Generic.IEnumerable`1, - string) + IL_002a: newobj instance void Linq101Joins01/'q3@31-22'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [mscorlib]System.Collections.Generic.IEnumerable`1, + string) IL_002f: tail. IL_0031: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [Utils]Utils/Product>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0036: ret - } // end of method 'q3@30-3'::Invoke + } // end of method 'q3@30-21'::Invoke - } // end of class 'q3@30-3' + } // end of class 'q3@30-21' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@32-5' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@32-23' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -645,7 +645,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'q3@32-5'::.ctor + } // end of method 'q3@32-23'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`3,class [Utils]Utils/Product> tupledArg) cil managed @@ -672,11 +672,11 @@ IL_001c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0021: ret - } // end of method 'q3@32-5'::Invoke + } // end of method 'q3@32-23'::Invoke - } // end of class 'q3@32-5' + } // end of class 'q3@32-23' - .class auto ansi serializable sealed nested assembly beforefieldinit q4@39 + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -689,7 +689,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method q4@39::.ctor + } // end of method 'q4@39-18'::.ctor .method public strict virtual instance string Invoke(string c) cil managed @@ -699,11 +699,11 @@ .line 39,39 : 37,38 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method q4@39::Invoke + } // end of method 'q4@39-18'::Invoke - } // end of class q4@39 + } // end of class 'q4@39-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -716,7 +716,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q4@39-1'::.ctor + } // end of method 'q4@39-19'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -728,11 +728,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'q4@39-1'::Invoke + } // end of method 'q4@39-19'::Invoke - } // end of class 'q4@39-1' + } // end of class 'q4@39-19' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-20' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -745,7 +745,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'q4@39-2'::.ctor + } // end of method 'q4@39-20'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(string c, @@ -759,11 +759,11 @@ IL_0002: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0007: ret - } // end of method 'q4@39-2'::Invoke + } // end of method 'q4@39-20'::Invoke - } // end of class 'q4@39-2' + } // end of class 'q4@39-20' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@40-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@40-22' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product,string>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -785,15 +785,15 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product,string>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@40-4'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@40-22'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q4@40-4'::ps + IL_000f: stfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q4@40-22'::ps IL_0014: ldarg.0 IL_0015: ldarg.3 - IL_0016: stfld string Linq101Joins01/'q4@40-4'::c + IL_0016: stfld string Linq101Joins01/'q4@40-22'::c IL_001b: ret - } // end of method 'q4@40-4'::.ctor + } // end of method 'q4@40-22'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product,string>,object> Invoke(class [Utils]Utils/Product _arg2) cil managed @@ -832,11 +832,11 @@ IL_0023: stloc.1 .line 42,42 : 9,22 '' IL_0024: ldarg.0 - IL_0025: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@40-4'::builder@ + IL_0025: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@40-22'::builder@ IL_002a: ldarg.0 - IL_002b: ldfld string Linq101Joins01/'q4@40-4'::c + IL_002b: ldfld string Linq101Joins01/'q4@40-22'::c IL_0030: ldarg.0 - IL_0031: ldfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q4@40-4'::ps + IL_0031: ldfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q4@40-22'::ps IL_0036: ldloc.0 IL_0037: ldloc.1 IL_0038: newobj instance void class [mscorlib]System.Tuple`4,class [Utils]Utils/Product,string>::.ctor(!0, @@ -846,11 +846,11 @@ IL_003d: tail. IL_003f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,class [Utils]Utils/Product,string>,object>(!!0) IL_0044: ret - } // end of method 'q4@40-4'::Invoke + } // end of method 'q4@40-22'::Invoke - } // end of class 'q4@40-4' + } // end of class 'q4@40-22' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-21' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -868,9 +868,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-21'::builder@ IL_000d: ret - } // end of method 'q4@39-3'::.ctor + } // end of method 'q4@39-21'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable> Invoke(class [mscorlib]System.Tuple`2> _arg1) cil managed @@ -890,28 +890,28 @@ IL_000a: call instance !0 class [mscorlib]System.Tuple`2>::get_Item1() IL_000f: stloc.2 IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-3'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-21'::builder@ IL_0016: ldarg.0 - IL_0017: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-3'::builder@ + IL_0017: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-21'::builder@ IL_001c: ldloc.1 IL_001d: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [System.Core]System.Linq.Enumerable::DefaultIfEmpty(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0022: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0027: ldarg.0 - IL_0028: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-3'::builder@ + IL_0028: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-21'::builder@ IL_002d: ldloc.1 IL_002e: ldloc.2 - IL_002f: newobj instance void Linq101Joins01/'q4@40-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [mscorlib]System.Collections.Generic.IEnumerable`1, - string) + IL_002f: newobj instance void Linq101Joins01/'q4@40-22'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [mscorlib]System.Collections.Generic.IEnumerable`1, + string) IL_0034: tail. IL_0036: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [Utils]Utils/Product,string>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_003b: ret - } // end of method 'q4@39-3'::Invoke + } // end of method 'q4@39-21'::Invoke - } // end of class 'q4@39-3' + } // end of class 'q4@39-21' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@42-5' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@42-23' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -924,7 +924,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'q4@42-5'::.ctor + } // end of method 'q4@42-23'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`4,class [Utils]Utils/Product,string> tupledArg) cil managed @@ -954,16 +954,16 @@ IL_001e: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0023: ret - } // end of method 'q4@42-5'::Invoke + } // end of method 'q4@42-23'::Invoke - } // end of class 'q4@42-5' + } // end of class 'q4@42-23' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_categories() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'categories@8-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'categories@8-14' IL_0005: ret } // end of method Linq101Joins01::get_categories @@ -972,7 +972,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'products@9-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'products@9-60' IL_0005: ret } // end of method Linq101Joins01::get_products @@ -981,7 +981,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q@11 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q@11-28' IL_0005: ret } // end of method Linq101Joins01::get_q @@ -990,7 +990,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Joins01::q2@19 + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Joins01::'q2@19-6' IL_0005: ret } // end of method Linq101Joins01::get_q2 @@ -999,7 +999,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q3@27 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q3@27-6' IL_0005: ret } // end of method Linq101Joins01::get_q3 @@ -1008,7 +1008,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q4@36 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q4@36-6' IL_0005: ret } // end of method Linq101Joins01::get_q4 @@ -1053,17 +1053,17 @@ .class private abstract auto ansi sealed ''.$Linq101Joins01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'categories@8-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'categories@8-14' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@9-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@9-60' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] q@11 + .field static assembly class [mscorlib]System.Tuple`2[] 'q@11-28' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] q2@19 + .field static assembly class [mscorlib]System.Tuple`2>[] 'q2@19-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] q3@27 + .field static assembly class [mscorlib]System.Tuple`2[] 'q3@27-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] q4@36 + .field static assembly class [mscorlib]System.Tuple`2[] 'q4@36-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1102,12 +1102,12 @@ IL_0032: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0037: dup - IL_0038: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'categories@8-2' + IL_0038: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'categories@8-14' IL_003d: stloc.0 .line 9,9 : 1,32 '' IL_003e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0043: dup - IL_0044: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'products@9-6' + IL_0044: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'products@9-60' IL_0049: stloc.1 .line 11,16 : 1,21 '' IL_004a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1121,25 +1121,25 @@ IL_0063: ldloc.s V_6 IL_0065: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Joins01::get_products() IL_006a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_006f: newobj instance void Linq101Joins01/q@14::.ctor() - IL_0074: newobj instance void Linq101Joins01/'q@14-1'::.ctor() - IL_0079: newobj instance void Linq101Joins01/'q@14-2'::.ctor() + IL_006f: newobj instance void Linq101Joins01/'q@14-15'::.ctor() + IL_0074: newobj instance void Linq101Joins01/'q@14-16'::.ctor() + IL_0079: newobj instance void Linq101Joins01/'q@14-17'::.ctor() IL_007e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Join>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0083: ldloc.s V_6 - IL_0085: newobj instance void Linq101Joins01/'q@14-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0085: newobj instance void Linq101Joins01/'q@14-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_008a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_008f: newobj instance void Linq101Joins01/'q@15-4'::.ctor() + IL_008f: newobj instance void Linq101Joins01/'q@15-19'::.ctor() IL_0094: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0099: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_009e: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00a3: dup - IL_00a4: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q@11 + IL_00a4: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q@11-28' IL_00a9: stloc.2 .line 19,24 : 1,21 '' IL_00aa: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1153,25 +1153,25 @@ IL_00c3: ldloc.s V_7 IL_00c5: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Joins01::get_products() IL_00ca: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_00cf: newobj instance void Linq101Joins01/q2@22::.ctor() - IL_00d4: newobj instance void Linq101Joins01/'q2@22-1'::.ctor() - IL_00d9: newobj instance void Linq101Joins01/'q2@22-2'::.ctor() + IL_00cf: newobj instance void Linq101Joins01/'q2@22-15'::.ctor() + IL_00d4: newobj instance void Linq101Joins01/'q2@22-16'::.ctor() + IL_00d9: newobj instance void Linq101Joins01/'q2@22-17'::.ctor() IL_00de: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupJoin>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,!!4>>) IL_00e3: ldloc.s V_7 - IL_00e5: newobj instance void Linq101Joins01/'q2@22-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00e5: newobj instance void Linq101Joins01/'q2@22-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00ea: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00ef: newobj instance void Linq101Joins01/'q2@23-4'::.ctor() + IL_00ef: newobj instance void Linq101Joins01/'q2@23-19'::.ctor() IL_00f4: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00f9: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_00fe: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0103: dup - IL_0104: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Joins01::q2@19 + IL_0104: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Joins01::'q2@19-6' IL_0109: stloc.3 .line 27,33 : 1,21 '' IL_010a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1185,25 +1185,25 @@ IL_0123: ldloc.s V_8 IL_0125: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Joins01::get_products() IL_012a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_012f: newobj instance void Linq101Joins01/q3@30::.ctor() - IL_0134: newobj instance void Linq101Joins01/'q3@30-1'::.ctor() - IL_0139: newobj instance void Linq101Joins01/'q3@30-2'::.ctor() + IL_012f: newobj instance void Linq101Joins01/'q3@30-18'::.ctor() + IL_0134: newobj instance void Linq101Joins01/'q3@30-19'::.ctor() + IL_0139: newobj instance void Linq101Joins01/'q3@30-20'::.ctor() IL_013e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupJoin>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,!!4>>) IL_0143: ldloc.s V_8 - IL_0145: newobj instance void Linq101Joins01/'q3@30-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0145: newobj instance void Linq101Joins01/'q3@30-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_014a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_014f: newobj instance void Linq101Joins01/'q3@32-5'::.ctor() + IL_014f: newobj instance void Linq101Joins01/'q3@32-23'::.ctor() IL_0154: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0159: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_015e: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0163: dup - IL_0164: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q3@27 + IL_0164: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q3@27-6' IL_0169: stloc.s q3 .line 36,43 : 1,21 '' IL_016b: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1217,25 +1217,25 @@ IL_0184: ldloc.s V_9 IL_0186: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Joins01::get_products() IL_018b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0190: newobj instance void Linq101Joins01/q4@39::.ctor() - IL_0195: newobj instance void Linq101Joins01/'q4@39-1'::.ctor() - IL_019a: newobj instance void Linq101Joins01/'q4@39-2'::.ctor() + IL_0190: newobj instance void Linq101Joins01/'q4@39-18'::.ctor() + IL_0195: newobj instance void Linq101Joins01/'q4@39-19'::.ctor() + IL_019a: newobj instance void Linq101Joins01/'q4@39-20'::.ctor() IL_019f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupJoin>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,!!4>>) IL_01a4: ldloc.s V_9 - IL_01a6: newobj instance void Linq101Joins01/'q4@39-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01a6: newobj instance void Linq101Joins01/'q4@39-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01ab: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`4,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01b0: newobj instance void Linq101Joins01/'q4@42-5'::.ctor() + IL_01b0: newobj instance void Linq101Joins01/'q4@42-23'::.ctor() IL_01b5: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01ba: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_01bf: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01c4: dup - IL_01c5: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q4@36 + IL_01c5: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q4@36-6' IL_01ca: stloc.s q4 IL_01cc: ret } // end of method $Linq101Joins01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl index 22088641a28..8c678c5b4ed 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02AF0000 +// Image base: 0x01000000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname sortedWords@11 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sortedWords@11-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -88,17 +88,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Ordering01/sortedWords@11::pc + IL_0009: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Ordering01/sortedWords@11::current + IL_0010: stfld string Linq101Ordering01/'sortedWords@11-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method sortedWords@11::.ctor + } // end of method 'sortedWords@11-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -110,7 +110,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Ordering01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedWords@11::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedWords@11-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Ordering01/sortedWords@11::pc + IL_003d: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc .line 11,11 : 9,26 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 11,11 : 9,26 '' @@ -162,11 +162,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Ordering01/sortedWords@11::pc + IL_005f: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc .line 12,12 : 9,17 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Ordering01/sortedWords@11::current + IL_0066: stfld string Linq101Ordering01/'sortedWords@11-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -176,24 +176,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Ordering01/sortedWords@11::pc + IL_0072: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc .line 11,11 : 9,26 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Ordering01/sortedWords@11::pc + IL_008c: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Ordering01/sortedWords@11::current + IL_0093: stfld string Linq101Ordering01/'sortedWords@11-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method sortedWords@11::GenerateNext + } // end of method 'sortedWords@11-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -205,7 +205,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedWords@11::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedWords@11-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -221,7 +221,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Ordering01/sortedWords@11::pc + IL_001b: ldfld int32 Linq101Ordering01/'sortedWords@11-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -259,19 +259,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Ordering01/sortedWords@11::pc + IL_004f: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Ordering01/sortedWords@11::pc + IL_0063: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Ordering01/sortedWords@11::current + IL_006a: stfld string Linq101Ordering01/'sortedWords@11-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -311,7 +311,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method sortedWords@11::Close + } // end of method 'sortedWords@11-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -320,7 +320,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedWords@11::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedWords@11-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -362,7 +362,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method sortedWords@11::get_CheckClose + } // end of method 'sortedWords@11-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -372,9 +372,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Ordering01/sortedWords@11::current + IL_0001: ldfld string Linq101Ordering01/'sortedWords@11-6'::current IL_0006: ret - } // end of method sortedWords@11::get_LastGenerated + } // end of method 'sortedWords@11-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -386,15 +386,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Ordering01/sortedWords@11::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Ordering01/'sortedWords@11-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method sortedWords@11::GetFreshEnumerator + } // end of method 'sortedWords@11-6'::GetFreshEnumerator - } // end of class sortedWords@11 + } // end of class 'sortedWords@11-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedWords@12-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedWords@12-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -407,7 +407,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedWords@12-1'::.ctor + } // end of method 'sortedWords@12-7'::.ctor .method public strict virtual instance string Invoke(string w) cil managed @@ -417,11 +417,11 @@ .line 12,12 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'sortedWords@12-1'::Invoke + } // end of method 'sortedWords@12-7'::Invoke - } // end of class 'sortedWords@12-1' + } // end of class 'sortedWords@12-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname sortedWords2@18 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sortedWords2@18-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -446,17 +446,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_0009: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Ordering01/sortedWords2@18::current + IL_0010: stfld string Linq101Ordering01/'sortedWords2@18-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method sortedWords2@18::.ctor + } // end of method 'sortedWords2@18-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -467,7 +467,7 @@ [1] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -500,18 +500,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_003d: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc .line 18,18 : 9,26 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 18,18 : 9,26 '' @@ -519,11 +519,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_005f: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc .line 19,19 : 9,26 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Ordering01/sortedWords2@18::current + IL_0066: stfld string Linq101Ordering01/'sortedWords2@18-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -533,24 +533,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_0072: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc .line 18,18 : 9,26 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_008c: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Ordering01/sortedWords2@18::current + IL_0093: stfld string Linq101Ordering01/'sortedWords2@18-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method sortedWords2@18::GenerateNext + } // end of method 'sortedWords2@18-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -562,7 +562,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -578,7 +578,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_001b: ldfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -616,19 +616,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_004f: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_0063: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Ordering01/sortedWords2@18::current + IL_006a: stfld string Linq101Ordering01/'sortedWords2@18-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -668,7 +668,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method sortedWords2@18::Close + } // end of method 'sortedWords2@18-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -677,7 +677,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedWords2@18::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -719,7 +719,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method sortedWords2@18::get_CheckClose + } // end of method 'sortedWords2@18-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -729,9 +729,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Ordering01/sortedWords2@18::current + IL_0001: ldfld string Linq101Ordering01/'sortedWords2@18-6'::current IL_0006: ret - } // end of method sortedWords2@18::get_LastGenerated + } // end of method 'sortedWords2@18-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -743,15 +743,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Ordering01/sortedWords2@18::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Ordering01/'sortedWords2@18-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method sortedWords2@18::GetFreshEnumerator + } // end of method 'sortedWords2@18-6'::GetFreshEnumerator - } // end of class sortedWords2@18 + } // end of class 'sortedWords2@18-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedWords2@19-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedWords2@19-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -764,7 +764,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedWords2@19-1'::.ctor + } // end of method 'sortedWords2@19-7'::.ctor .method public strict virtual instance int32 Invoke(string w) cil managed @@ -775,11 +775,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'sortedWords2@19-1'::Invoke + } // end of method 'sortedWords2@19-7'::Invoke - } // end of class 'sortedWords2@19-1' + } // end of class 'sortedWords2@19-7' - .class auto ansi serializable sealed nested assembly beforefieldinit sortedProducts@26 + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@26-9' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -797,9 +797,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/sortedProducts@26::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/'sortedProducts@26-9'::builder@ IL_000d: ret - } // end of method sortedProducts@26::.ctor + } // end of method 'sortedProducts@26-9'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -812,16 +812,16 @@ IL_0001: stloc.0 .line 27,27 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/sortedProducts@26::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/'sortedProducts@26-9'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method sortedProducts@26::Invoke + } // end of method 'sortedProducts@26-9'::Invoke - } // end of class sortedProducts@26 + } // end of class 'sortedProducts@26-9' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@27-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@27-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -834,7 +834,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts@27-1'::.ctor + } // end of method 'sortedProducts@27-10'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -846,11 +846,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_ProductName() IL_0008: ret - } // end of method 'sortedProducts@27-1'::Invoke + } // end of method 'sortedProducts@27-10'::Invoke - } // end of class 'sortedProducts@27-1' + } // end of class 'sortedProducts@27-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@28-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@28-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -863,7 +863,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts@28-2'::.ctor + } // end of method 'sortedProducts@28-11'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -873,11 +873,11 @@ .line 28,28 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'sortedProducts@28-2'::Invoke + } // end of method 'sortedProducts@28-11'::Invoke - } // end of class 'sortedProducts@28-2' + } // end of class 'sortedProducts@28-11' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname sortedProducts2@44 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sortedProducts2@44-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -902,17 +902,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_0009: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current + IL_0010: stfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method sortedProducts2@44::.ctor + } // end of method 'sortedProducts2@44-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -923,7 +923,7 @@ [1] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -956,18 +956,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_products() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_003d: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc .line 44,44 : 9,29 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 44,44 : 9,29 '' @@ -975,11 +975,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_005f: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc .line 45,45 : 9,40 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current + IL_0066: stfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -989,24 +989,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_0072: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc .line 44,44 : 9,29 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_008c: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current + IL_0093: stfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method sortedProducts2@44::GenerateNext + } // end of method 'sortedProducts2@44-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1018,7 +1018,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1034,7 +1034,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_001b: ldfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1072,19 +1072,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_004f: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_0063: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current + IL_006a: stfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1124,7 +1124,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method sortedProducts2@44::Close + } // end of method 'sortedProducts2@44-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1133,7 +1133,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedProducts2@44::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1175,7 +1175,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method sortedProducts2@44::get_CheckClose + } // end of method 'sortedProducts2@44-6'::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -1185,9 +1185,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current IL_0006: ret - } // end of method sortedProducts2@44::get_LastGenerated + } // end of method 'sortedProducts2@44-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1199,15 +1199,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Ordering01/sortedProducts2@44::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0003: newobj instance void Linq101Ordering01/'sortedProducts2@44-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0008: ret - } // end of method sortedProducts2@44::GetFreshEnumerator + } // end of method 'sortedProducts2@44-6'::GetFreshEnumerator - } // end of class sortedProducts2@44 + } // end of class 'sortedProducts2@44-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts2@45-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts2@45-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1220,7 +1220,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts2@45-1'::.ctor + } // end of method 'sortedProducts2@45-7'::.ctor .method public strict virtual instance int32 Invoke(class [Utils]Utils/Product p) cil managed @@ -1232,11 +1232,11 @@ IL_0001: tail. IL_0003: callvirt instance int32 [Utils]Utils/Product::get_UnitsInStock() IL_0008: ret - } // end of method 'sortedProducts2@45-1'::Invoke + } // end of method 'sortedProducts2@45-7'::Invoke - } // end of class 'sortedProducts2@45-1' + } // end of class 'sortedProducts2@45-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname sortedDigits@52 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sortedDigits@52-9' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1261,17 +1261,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_0009: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Ordering01/sortedDigits@52::current + IL_0010: stfld string Linq101Ordering01/'sortedDigits@52-9'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method sortedDigits@52::.ctor + } // end of method 'sortedDigits@52-9'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1282,7 +1282,7 @@ [1] string d) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1315,18 +1315,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_digits() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_003d: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc .line 52,52 : 9,27 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 52,52 : 9,27 '' @@ -1334,11 +1334,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_005f: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc .line 53,53 : 9,24 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Ordering01/sortedDigits@52::current + IL_0066: stfld string Linq101Ordering01/'sortedDigits@52-9'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1348,24 +1348,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_0072: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc .line 52,52 : 9,27 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_008c: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Ordering01/sortedDigits@52::current + IL_0093: stfld string Linq101Ordering01/'sortedDigits@52-9'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method sortedDigits@52::GenerateNext + } // end of method 'sortedDigits@52-9'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1377,7 +1377,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1393,7 +1393,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_001b: ldfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1431,19 +1431,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_004f: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_0063: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Ordering01/sortedDigits@52::current + IL_006a: stfld string Linq101Ordering01/'sortedDigits@52-9'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1483,7 +1483,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method sortedDigits@52::Close + } // end of method 'sortedDigits@52-9'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1492,7 +1492,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/sortedDigits@52::pc + IL_0001: ldfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1534,7 +1534,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method sortedDigits@52::get_CheckClose + } // end of method 'sortedDigits@52-9'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -1544,9 +1544,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Ordering01/sortedDigits@52::current + IL_0001: ldfld string Linq101Ordering01/'sortedDigits@52-9'::current IL_0006: ret - } // end of method sortedDigits@52::get_LastGenerated + } // end of method 'sortedDigits@52-9'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1558,15 +1558,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Ordering01/sortedDigits@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Ordering01/'sortedDigits@52-9'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method sortedDigits@52::GetFreshEnumerator + } // end of method 'sortedDigits@52-9'::GetFreshEnumerator - } // end of class sortedDigits@52 + } // end of class 'sortedDigits@52-9' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedDigits@53-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedDigits@53-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1579,7 +1579,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedDigits@53-1'::.ctor + } // end of method 'sortedDigits@53-10'::.ctor .method public strict virtual instance int32 Invoke(string d) cil managed @@ -1590,11 +1590,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'sortedDigits@53-1'::Invoke + } // end of method 'sortedDigits@53-10'::Invoke - } // end of class 'sortedDigits@53-1' + } // end of class 'sortedDigits@53-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedDigits@54-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedDigits@54-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1607,7 +1607,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedDigits@54-2'::.ctor + } // end of method 'sortedDigits@54-11'::.ctor .method public strict virtual instance string Invoke(string d) cil managed @@ -1617,11 +1617,11 @@ .line 54,54 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'sortedDigits@54-2'::Invoke + } // end of method 'sortedDigits@54-11'::Invoke - } // end of class 'sortedDigits@54-2' + } // end of class 'sortedDigits@54-11' - .class auto ansi serializable sealed nested assembly beforefieldinit sortedProducts3@60 + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@60-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1639,9 +1639,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/sortedProducts3@60::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/'sortedProducts3@60-12'::builder@ IL_000d: ret - } // end of method sortedProducts3@60::.ctor + } // end of method 'sortedProducts3@60-12'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -1654,16 +1654,16 @@ IL_0001: stloc.0 .line 61,61 : 9,26 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/sortedProducts3@60::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/'sortedProducts3@60-12'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method sortedProducts3@60::Invoke + } // end of method 'sortedProducts3@60-12'::Invoke - } // end of class sortedProducts3@60 + } // end of class 'sortedProducts3@60-12' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@61-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@61-13' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1676,7 +1676,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts3@61-1'::.ctor + } // end of method 'sortedProducts3@61-13'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -1688,11 +1688,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'sortedProducts3@61-1'::Invoke + } // end of method 'sortedProducts3@61-13'::Invoke - } // end of class 'sortedProducts3@61-1' + } // end of class 'sortedProducts3@61-13' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@62-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@62-14' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1705,7 +1705,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts3@62-2'::.ctor + } // end of method 'sortedProducts3@62-14'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product p) cil managed @@ -1717,11 +1717,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'sortedProducts3@62-2'::Invoke + } // end of method 'sortedProducts3@62-14'::Invoke - } // end of class 'sortedProducts3@62-2' + } // end of class 'sortedProducts3@62-14' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@63-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@63-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1734,7 +1734,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts3@63-3'::.ctor + } // end of method 'sortedProducts3@63-15'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -1744,16 +1744,16 @@ .line 63,63 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'sortedProducts3@63-3'::Invoke + } // end of method 'sortedProducts3@63-15'::Invoke - } // end of class 'sortedProducts3@63-3' + } // end of class 'sortedProducts3@63-15' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_words() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'words@8-4' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'words@8-34' IL_0005: ret } // end of method Linq101Ordering01::get_words @@ -1762,7 +1762,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedWords@9 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedWords@9-6' IL_0005: ret } // end of method Linq101Ordering01::get_sortedWords @@ -1771,7 +1771,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedWords2@16 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedWords2@16-6' IL_0005: ret } // end of method Linq101Ordering01::get_sortedWords2 @@ -1780,7 +1780,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'products@23-8' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'products@23-62' IL_0005: ret } // end of method Linq101Ordering01::get_products @@ -1789,7 +1789,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts@24 + IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts@24-6' IL_0005: ret } // end of method Linq101Ordering01::get_sortedProducts @@ -1798,7 +1798,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts2@42 + IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts2@42-6' IL_0005: ret } // end of method Linq101Ordering01::get_sortedProducts2 @@ -1807,7 +1807,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'digits@49-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'digits@49-26' IL_0005: ret } // end of method Linq101Ordering01::get_digits @@ -1816,7 +1816,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedDigits@50 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedDigits@50-6' IL_0005: ret } // end of method Linq101Ordering01::get_sortedDigits @@ -1825,7 +1825,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts3@58 + IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts3@58-6' IL_0005: ret } // end of method Linq101Ordering01::get_sortedProducts3 @@ -1885,23 +1885,23 @@ .class private abstract auto ansi sealed ''.$Linq101Ordering01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@8-4' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@8-34' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 sortedWords@9 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'sortedWords@9-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 sortedWords2@16 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'sortedWords2@16-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@23-8' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@23-62' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Product[] sortedProducts@24 + .field static assembly class [Utils]Utils/Product[] 'sortedProducts@24-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Product[] sortedProducts2@42 + .field static assembly class [Utils]Utils/Product[] 'sortedProducts2@42-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@49-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@49-26' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 sortedDigits@50 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'sortedDigits@50-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Product[] sortedProducts3@58 + .field static assembly class [Utils]Utils/Product[] 'sortedProducts3@58-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1939,7 +1939,7 @@ IL_001e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0023: dup - IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'words@8-4' + IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'words@8-34' IL_0029: stloc.0 .line 9,13 : 1,20 '' IL_002a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1948,17 +1948,17 @@ IL_0033: ldnull IL_0034: ldc.i4.0 IL_0035: ldnull - IL_0036: newobj instance void Linq101Ordering01/sortedWords@11::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0036: newobj instance void Linq101Ordering01/'sortedWords@11-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_003b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0040: newobj instance void Linq101Ordering01/'sortedWords@12-1'::.ctor() + IL_0040: newobj instance void Linq101Ordering01/'sortedWords@12-7'::.ctor() IL_0045: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_004a: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_004f: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0054: dup - IL_0055: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedWords@9 + IL_0055: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedWords@9-6' IL_005a: stloc.1 .line 16,20 : 1,20 '' IL_005b: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1967,22 +1967,22 @@ IL_0064: ldnull IL_0065: ldc.i4.0 IL_0066: ldnull - IL_0067: newobj instance void Linq101Ordering01/sortedWords2@18::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0067: newobj instance void Linq101Ordering01/'sortedWords2@18-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_006c: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0071: newobj instance void Linq101Ordering01/'sortedWords2@19-1'::.ctor() + IL_0071: newobj instance void Linq101Ordering01/'sortedWords2@19-7'::.ctor() IL_0076: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_007b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0080: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0085: dup - IL_0086: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedWords2@16 + IL_0086: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedWords2@16-6' IL_008b: stloc.2 .line 23,23 : 1,32 '' IL_008c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0091: dup - IL_0092: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'products@23-8' + IL_0092: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'products@23-62' IL_0097: stloc.3 .line 24,29 : 1,21 '' IL_0098: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1994,19 +1994,19 @@ IL_00a7: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_products() IL_00ac: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00b1: ldloc.s V_11 - IL_00b3: newobj instance void Linq101Ordering01/sortedProducts@26::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00b3: newobj instance void Linq101Ordering01/'sortedProducts@26-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00b8: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00bd: newobj instance void Linq101Ordering01/'sortedProducts@27-1'::.ctor() + IL_00bd: newobj instance void Linq101Ordering01/'sortedProducts@27-10'::.ctor() IL_00c2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_00c7: newobj instance void Linq101Ordering01/'sortedProducts@28-2'::.ctor() + IL_00c7: newobj instance void Linq101Ordering01/'sortedProducts@28-11'::.ctor() IL_00cc: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00d1: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_00d6: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00db: dup - IL_00dc: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts@24 + IL_00dc: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts@24-6' IL_00e1: stloc.s sortedProducts .line 42,46 : 1,21 '' IL_00e3: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2015,17 +2015,17 @@ IL_00ec: ldnull IL_00ed: ldc.i4.0 IL_00ee: ldnull - IL_00ef: newobj instance void Linq101Ordering01/sortedProducts2@44::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_00ef: newobj instance void Linq101Ordering01/'sortedProducts2@44-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_00f4: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_00f9: newobj instance void Linq101Ordering01/'sortedProducts2@45-1'::.ctor() + IL_00f9: newobj instance void Linq101Ordering01/'sortedProducts2@45-7'::.ctor() IL_00fe: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortByDescending(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0103: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0108: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_010d: dup - IL_010e: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts2@42 + IL_010e: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts2@42-6' IL_0113: stloc.s sortedProducts2 .line 49,49 : 1,96 '' IL_0115: ldstr "zero" @@ -2060,7 +2060,7 @@ IL_0179: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_017e: dup - IL_017f: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'digits@49-2' + IL_017f: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'digits@49-26' IL_0184: stloc.s digits .line 50,55 : 1,20 '' IL_0186: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2070,20 +2070,20 @@ IL_0191: ldnull IL_0192: ldc.i4.0 IL_0193: ldnull - IL_0194: newobj instance void Linq101Ordering01/sortedDigits@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0194: newobj instance void Linq101Ordering01/'sortedDigits@52-9'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0199: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_019e: newobj instance void Linq101Ordering01/'sortedDigits@53-1'::.ctor() + IL_019e: newobj instance void Linq101Ordering01/'sortedDigits@53-10'::.ctor() IL_01a3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_01a8: newobj instance void Linq101Ordering01/'sortedDigits@54-2'::.ctor() + IL_01a8: newobj instance void Linq101Ordering01/'sortedDigits@54-11'::.ctor() IL_01ad: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::ThenBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01b2: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_01b7: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01bc: dup - IL_01bd: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedDigits@50 + IL_01bd: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedDigits@50-6' IL_01c2: stloc.s sortedDigits .line 58,64 : 1,21 '' IL_01c4: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2096,22 +2096,22 @@ IL_01d5: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_products() IL_01da: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01df: ldloc.s V_14 - IL_01e1: newobj instance void Linq101Ordering01/sortedProducts3@60::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01e1: newobj instance void Linq101Ordering01/'sortedProducts3@60-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01e6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01eb: newobj instance void Linq101Ordering01/'sortedProducts3@61-1'::.ctor() + IL_01eb: newobj instance void Linq101Ordering01/'sortedProducts3@61-13'::.ctor() IL_01f0: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_01f5: newobj instance void Linq101Ordering01/'sortedProducts3@62-2'::.ctor() + IL_01f5: newobj instance void Linq101Ordering01/'sortedProducts3@62-14'::.ctor() IL_01fa: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::ThenByDescending(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_01ff: newobj instance void Linq101Ordering01/'sortedProducts3@63-3'::.ctor() + IL_01ff: newobj instance void Linq101Ordering01/'sortedProducts3@63-15'::.ctor() IL_0204: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0209: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_020e: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0213: dup - IL_0214: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts3@58 + IL_0214: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts3@58-6' IL_0219: stloc.s sortedProducts3 IL_021b: ret } // end of method $Linq101Ordering01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl index 60eee9f4acb..f100f7ded91 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013D0000 +// Image base: 0x01410000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname first3Numbers@12 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'first3Numbers@12-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -88,17 +88,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_0009: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Partitioning01/first3Numbers@12::current + IL_0010: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method first3Numbers@12::.ctor + } // end of method 'first3Numbers@12-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -110,7 +110,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Partitioning01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_0001: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_003d: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc .line 12,12 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 12,12 : 9,28 '' @@ -162,11 +162,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_005f: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc .line 13,13 : 9,15 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Partitioning01/first3Numbers@12::current + IL_0066: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -176,24 +176,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_0072: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc .line 12,12 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_008c: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Partitioning01/first3Numbers@12::current + IL_0093: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method first3Numbers@12::GenerateNext + } // end of method 'first3Numbers@12-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -205,7 +205,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_0001: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -221,7 +221,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_001b: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -259,19 +259,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_004f: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_0063: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Partitioning01/first3Numbers@12::current + IL_006a: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -311,7 +311,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method first3Numbers@12::Close + } // end of method 'first3Numbers@12-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -320,7 +320,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/first3Numbers@12::pc + IL_0001: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -362,7 +362,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method first3Numbers@12::get_CheckClose + } // end of method 'first3Numbers@12-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -372,9 +372,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/first3Numbers@12::current + IL_0001: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current IL_0006: ret - } // end of method first3Numbers@12::get_LastGenerated + } // end of method 'first3Numbers@12-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -386,15 +386,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Partitioning01/first3Numbers@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Partitioning01/'first3Numbers@12-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method first3Numbers@12::GetFreshEnumerator + } // end of method 'first3Numbers@12-3'::GetFreshEnumerator - } // end of class first3Numbers@12 + } // end of class 'first3Numbers@12-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@21-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@21-13' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -414,12 +414,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@21-1'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@21-13'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders@21-1'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders@21-13'::c IL_0014: ret - } // end of method 'WAOrders@21-1'::.ctor + } // end of method 'WAOrders@21-13'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -432,20 +432,20 @@ IL_0001: stloc.0 .line 22,22 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@21-1'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@21-13'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders@21-1'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders@21-13'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'WAOrders@21-1'::Invoke + } // end of method 'WAOrders@21-13'::Invoke - } // end of class 'WAOrders@21-1' + } // end of class 'WAOrders@21-13' - .class auto ansi serializable sealed nested assembly beforefieldinit WAOrders@20 + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@20-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -463,9 +463,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders@20::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@20-12'::builder@ IL_000d: ret - } // end of method WAOrders@20::.ctor + } // end of method 'WAOrders@20-12'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -478,26 +478,26 @@ IL_0001: stloc.0 .line 21,21 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders@20::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@20-12'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders@20::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@20-12'::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders@20::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@20-12'::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Partitioning01/'WAOrders@21-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Partitioning01/'WAOrders@21-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method WAOrders@20::Invoke + } // end of method 'WAOrders@20-12'::Invoke - } // end of class WAOrders@20 + } // end of class 'WAOrders@20-12' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@22-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@22-14' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -510,7 +510,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'WAOrders@22-2'::.ctor + } // end of method 'WAOrders@22-14'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -533,11 +533,11 @@ IL_0019: call bool [mscorlib]System.String::Equals(string, string) IL_001e: ret - } // end of method 'WAOrders@22-2'::Invoke + } // end of method 'WAOrders@22-14'::Invoke - } // end of class 'WAOrders@22-2' + } // end of class 'WAOrders@22-14' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@23-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@23-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -550,7 +550,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'WAOrders@23-3'::.ctor + } // end of method 'WAOrders@23-15'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -577,11 +577,11 @@ !1, !2) IL_0025: ret - } // end of method 'WAOrders@23-3'::Invoke + } // end of method 'WAOrders@23-15'::Invoke - } // end of class 'WAOrders@23-3' + } // end of class 'WAOrders@23-15' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname allButFirst4Numbers@29 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'allButFirst4Numbers@29-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -606,17 +606,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_0009: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current + IL_0010: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method allButFirst4Numbers@29::.ctor + } // end of method 'allButFirst4Numbers@29-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -627,7 +627,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -660,18 +660,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_003d: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc .line 29,29 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 29,29 : 9,28 '' @@ -679,11 +679,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_005f: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc .line 30,30 : 9,15 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current + IL_0066: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -693,24 +693,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_0072: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc .line 29,29 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_008c: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current + IL_0093: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method allButFirst4Numbers@29::GenerateNext + } // end of method 'allButFirst4Numbers@29-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -722,7 +722,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -738,7 +738,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_001b: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -776,19 +776,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_004f: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_0063: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current + IL_006a: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -828,7 +828,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method allButFirst4Numbers@29::Close + } // end of method 'allButFirst4Numbers@29-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -837,7 +837,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc + IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -879,7 +879,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method allButFirst4Numbers@29::get_CheckClose + } // end of method 'allButFirst4Numbers@29-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -889,9 +889,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current + IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current IL_0006: ret - } // end of method allButFirst4Numbers@29::get_LastGenerated + } // end of method 'allButFirst4Numbers@29-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -903,15 +903,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Partitioning01/allButFirst4Numbers@29::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Partitioning01/'allButFirst4Numbers@29-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method allButFirst4Numbers@29::GetFreshEnumerator + } // end of method 'allButFirst4Numbers@29-3'::GetFreshEnumerator - } // end of class allButFirst4Numbers@29 + } // end of class 'allButFirst4Numbers@29-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@37-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@37-13' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -931,12 +931,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@37-1'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@37-13'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders2@37-1'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders2@37-13'::c IL_0014: ret - } // end of method 'WAOrders2@37-1'::.ctor + } // end of method 'WAOrders2@37-13'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -949,20 +949,20 @@ IL_0001: stloc.0 .line 38,38 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@37-1'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@37-13'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders2@37-1'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders2@37-13'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'WAOrders2@37-1'::Invoke + } // end of method 'WAOrders2@37-13'::Invoke - } // end of class 'WAOrders2@37-1' + } // end of class 'WAOrders2@37-13' - .class auto ansi serializable sealed nested assembly beforefieldinit WAOrders2@36 + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@36-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -980,9 +980,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders2@36::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@36-12'::builder@ IL_000d: ret - } // end of method WAOrders2@36::.ctor + } // end of method 'WAOrders2@36-12'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -995,26 +995,26 @@ IL_0001: stloc.0 .line 37,37 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders2@36::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@36-12'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders2@36::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@36-12'::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders2@36::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@36-12'::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Partitioning01/'WAOrders2@37-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Partitioning01/'WAOrders2@37-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method WAOrders2@36::Invoke + } // end of method 'WAOrders2@36-12'::Invoke - } // end of class WAOrders2@36 + } // end of class 'WAOrders2@36-12' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@38-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@38-14' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -1027,7 +1027,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'WAOrders2@38-2'::.ctor + } // end of method 'WAOrders2@38-14'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -1050,11 +1050,11 @@ IL_0019: call bool [mscorlib]System.String::Equals(string, string) IL_001e: ret - } // end of method 'WAOrders2@38-2'::Invoke + } // end of method 'WAOrders2@38-14'::Invoke - } // end of class 'WAOrders2@38-2' + } // end of class 'WAOrders2@38-14' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@39-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@39-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -1067,7 +1067,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'WAOrders2@39-3'::.ctor + } // end of method 'WAOrders2@39-15'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -1094,11 +1094,11 @@ !1, !2) IL_0025: ret - } // end of method 'WAOrders2@39-3'::Invoke + } // end of method 'WAOrders2@39-15'::Invoke - } // end of class 'WAOrders2@39-3' + } // end of class 'WAOrders2@39-15' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname firstNumbersLessThan6@45 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'firstNumbersLessThan6@45-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1123,17 +1123,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_0009: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current + IL_0010: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method firstNumbersLessThan6@45::.ctor + } // end of method 'firstNumbersLessThan6@45-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1144,7 +1144,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_0001: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1177,18 +1177,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_003d: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc .line 45,45 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 45,45 : 9,28 '' @@ -1196,11 +1196,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_005f: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc .line 46,46 : 9,26 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current + IL_0066: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1210,24 +1210,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_0072: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc .line 45,45 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_008c: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current + IL_0093: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method firstNumbersLessThan6@45::GenerateNext + } // end of method 'firstNumbersLessThan6@45-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1239,7 +1239,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_0001: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1255,7 +1255,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_001b: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1293,19 +1293,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_004f: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_0063: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current + IL_006a: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1345,7 +1345,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method firstNumbersLessThan6@45::Close + } // end of method 'firstNumbersLessThan6@45-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1354,7 +1354,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc + IL_0001: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1396,7 +1396,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method firstNumbersLessThan6@45::get_CheckClose + } // end of method 'firstNumbersLessThan6@45-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -1406,9 +1406,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current + IL_0001: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current IL_0006: ret - } // end of method firstNumbersLessThan6@45::get_LastGenerated + } // end of method 'firstNumbersLessThan6@45-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1420,15 +1420,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Partitioning01/firstNumbersLessThan6@45::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Partitioning01/'firstNumbersLessThan6@45-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method firstNumbersLessThan6@45::GetFreshEnumerator + } // end of method 'firstNumbersLessThan6@45-6'::GetFreshEnumerator - } // end of class firstNumbersLessThan6@45 + } // end of class 'firstNumbersLessThan6@45-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'firstNumbersLessThan6@46-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'firstNumbersLessThan6@46-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1441,7 +1441,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'firstNumbersLessThan6@46-1'::.ctor + } // end of method 'firstNumbersLessThan6@46-7'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -1453,11 +1453,11 @@ IL_0001: ldc.i4.6 IL_0002: clt IL_0004: ret - } // end of method 'firstNumbersLessThan6@46-1'::Invoke + } // end of method 'firstNumbersLessThan6@46-7'::Invoke - } // end of class 'firstNumbersLessThan6@46-1' + } // end of class 'firstNumbersLessThan6@46-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname allButFirst3Numbers@52 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'allButFirst3Numbers@52-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1482,17 +1482,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_0009: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current + IL_0010: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method allButFirst3Numbers@52::.ctor + } // end of method 'allButFirst3Numbers@52-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1503,7 +1503,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1536,18 +1536,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_003d: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc .line 52,52 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 52,52 : 9,28 '' @@ -1555,11 +1555,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_005f: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc .line 53,53 : 9,31 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current + IL_0066: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1569,24 +1569,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_0072: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc .line 52,52 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_008c: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current + IL_0093: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method allButFirst3Numbers@52::GenerateNext + } // end of method 'allButFirst3Numbers@52-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1598,7 +1598,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1614,7 +1614,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_001b: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1652,19 +1652,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_004f: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_0063: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current + IL_006a: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1704,7 +1704,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method allButFirst3Numbers@52::Close + } // end of method 'allButFirst3Numbers@52-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1713,7 +1713,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc + IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1755,7 +1755,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method allButFirst3Numbers@52::get_CheckClose + } // end of method 'allButFirst3Numbers@52-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -1765,9 +1765,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current + IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current IL_0006: ret - } // end of method allButFirst3Numbers@52::get_LastGenerated + } // end of method 'allButFirst3Numbers@52-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1779,15 +1779,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Partitioning01/allButFirst3Numbers@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Partitioning01/'allButFirst3Numbers@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method allButFirst3Numbers@52::GetFreshEnumerator + } // end of method 'allButFirst3Numbers@52-6'::GetFreshEnumerator - } // end of class allButFirst3Numbers@52 + } // end of class 'allButFirst3Numbers@52-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'allButFirst3Numbers@53-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'allButFirst3Numbers@53-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1800,7 +1800,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'allButFirst3Numbers@53-1'::.ctor + } // end of method 'allButFirst3Numbers@53-7'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -1816,16 +1816,16 @@ IL_0006: ldc.i4.0 IL_0007: ceq IL_0009: ret - } // end of method 'allButFirst3Numbers@53-1'::Invoke + } // end of method 'allButFirst3Numbers@53-7'::Invoke - } // end of class 'allButFirst3Numbers@53-1' + } // end of class 'allButFirst3Numbers@53-7' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_numbers() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'numbers@7-5' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'numbers@7-44' IL_0005: ret } // end of method Linq101Partitioning01::get_numbers @@ -1834,7 +1834,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::first3Numbers@10 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'first3Numbers@10-6' IL_0005: ret } // end of method Linq101Partitioning01::get_first3Numbers @@ -1843,7 +1843,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'customers@17-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'customers@17-32' IL_0005: ret } // end of method Linq101Partitioning01::get_customers @@ -1852,7 +1852,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Partitioning01::WAOrders@18 + IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Partitioning01::'WAOrders@18-6' IL_0005: ret } // end of method Linq101Partitioning01::get_WAOrders @@ -1861,7 +1861,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::allButFirst4Numbers@27 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'allButFirst4Numbers@27-6' IL_0005: ret } // end of method Linq101Partitioning01::get_allButFirst4Numbers @@ -1870,7 +1870,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Partitioning01::WAOrders2@34 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Partitioning01::'WAOrders2@34-6' IL_0005: ret } // end of method Linq101Partitioning01::get_WAOrders2 @@ -1879,7 +1879,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::firstNumbersLessThan6@43 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'firstNumbersLessThan6@43-6' IL_0005: ret } // end of method Linq101Partitioning01::get_firstNumbersLessThan6 @@ -1888,7 +1888,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::allButFirst3Numbers@50 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'allButFirst3Numbers@50-6' IL_0005: ret } // end of method Linq101Partitioning01::get_allButFirst3Numbers @@ -1945,21 +1945,21 @@ .class private abstract auto ansi sealed ''.$Linq101Partitioning01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@7-5' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@7-44' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 first3Numbers@10 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'first3Numbers@10-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@17-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@17-32' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`3[] WAOrders@18 + .field static assembly class [mscorlib]System.Tuple`3[] 'WAOrders@18-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 allButFirst4Numbers@27 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'allButFirst4Numbers@27-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> WAOrders2@34 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> 'WAOrders2@34-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 firstNumbersLessThan6@43 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'firstNumbersLessThan6@43-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 allButFirst3Numbers@50 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'allButFirst3Numbers@50-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -2017,7 +2017,7 @@ IL_003d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0042: dup - IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'numbers@7-5' + IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'numbers@7-44' IL_0048: stloc.0 .line 10,14 : 1,20 '' IL_0049: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2026,9 +2026,9 @@ IL_0052: ldnull IL_0053: ldc.i4.0 IL_0054: ldc.i4.0 - IL_0055: newobj instance void Linq101Partitioning01/first3Numbers@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0055: newobj instance void Linq101Partitioning01/'first3Numbers@12-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_005a: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_005f: ldc.i4.3 IL_0060: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Take(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, @@ -2036,12 +2036,12 @@ IL_0065: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_006a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_006f: dup - IL_0070: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::first3Numbers@10 + IL_0070: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'first3Numbers@10-6' IL_0075: stloc.1 .line 17,17 : 1,34 '' IL_0076: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_007b: dup - IL_007c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'customers@17-2' + IL_007c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'customers@17-32' IL_0081: stloc.2 .line 18,24 : 1,21 '' IL_0082: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2053,19 +2053,19 @@ IL_0091: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_customers() IL_0096: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_009b: ldloc.s V_9 - IL_009d: newobj instance void Linq101Partitioning01/WAOrders@20::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_009d: newobj instance void Linq101Partitioning01/'WAOrders@20-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00a2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00a7: newobj instance void Linq101Partitioning01/'WAOrders@22-2'::.ctor() + IL_00a7: newobj instance void Linq101Partitioning01/'WAOrders@22-14'::.ctor() IL_00ac: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_00b1: newobj instance void Linq101Partitioning01/'WAOrders@23-3'::.ctor() + IL_00b1: newobj instance void Linq101Partitioning01/'WAOrders@23-15'::.ctor() IL_00b6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00bb: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_00c0: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00c5: dup - IL_00c6: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Partitioning01::WAOrders@18 + IL_00c6: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Partitioning01::'WAOrders@18-6' IL_00cb: stloc.3 .line 27,31 : 1,20 '' IL_00cc: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2074,9 +2074,9 @@ IL_00d5: ldnull IL_00d6: ldc.i4.0 IL_00d7: ldc.i4.0 - IL_00d8: newobj instance void Linq101Partitioning01/allButFirst4Numbers@29::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_00d8: newobj instance void Linq101Partitioning01/'allButFirst4Numbers@29-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_00dd: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00e2: ldc.i4.4 IL_00e3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Skip(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, @@ -2084,7 +2084,7 @@ IL_00e8: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_00ed: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00f2: dup - IL_00f3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::allButFirst4Numbers@27 + IL_00f3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'allButFirst4Numbers@27-6' IL_00f8: stloc.s allButFirst4Numbers .line 34,40 : 1,34 '' IL_00fa: ldc.i4.2 @@ -2097,13 +2097,13 @@ IL_010a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_customers() IL_010f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0114: ldloc.s V_11 - IL_0116: newobj instance void Linq101Partitioning01/WAOrders2@36::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0116: newobj instance void Linq101Partitioning01/'WAOrders2@36-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_011b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0120: newobj instance void Linq101Partitioning01/'WAOrders2@38-2'::.ctor() + IL_0120: newobj instance void Linq101Partitioning01/'WAOrders2@38-14'::.ctor() IL_0125: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_012a: newobj instance void Linq101Partitioning01/'WAOrders2@39-3'::.ctor() + IL_012a: newobj instance void Linq101Partitioning01/'WAOrders2@39-15'::.ctor() IL_012f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0134: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() @@ -2111,7 +2111,7 @@ class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_013e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0143: dup - IL_0144: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Partitioning01::WAOrders2@34 + IL_0144: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Partitioning01::'WAOrders2@34-6' IL_0149: stloc.s WAOrders2 .line 43,47 : 1,20 '' IL_014b: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2120,17 +2120,17 @@ IL_0154: ldnull IL_0155: ldc.i4.0 IL_0156: ldc.i4.0 - IL_0157: newobj instance void Linq101Partitioning01/firstNumbersLessThan6@45::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0157: newobj instance void Linq101Partitioning01/'firstNumbersLessThan6@45-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_015c: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0161: newobj instance void Linq101Partitioning01/'firstNumbersLessThan6@46-1'::.ctor() + IL_0161: newobj instance void Linq101Partitioning01/'firstNumbersLessThan6@46-7'::.ctor() IL_0166: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::TakeWhile(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_016b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0170: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0175: dup - IL_0176: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::firstNumbersLessThan6@43 + IL_0176: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'firstNumbersLessThan6@43-6' IL_017b: stloc.s firstNumbersLessThan6 .line 50,54 : 1,20 '' IL_017d: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2139,17 +2139,17 @@ IL_0186: ldnull IL_0187: ldc.i4.0 IL_0188: ldc.i4.0 - IL_0189: newobj instance void Linq101Partitioning01/allButFirst3Numbers@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0189: newobj instance void Linq101Partitioning01/'allButFirst3Numbers@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_018e: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0193: newobj instance void Linq101Partitioning01/'allButFirst3Numbers@53-1'::.ctor() + IL_0193: newobj instance void Linq101Partitioning01/'allButFirst3Numbers@53-7'::.ctor() IL_0198: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SkipWhile(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_019d: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_01a2: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01a7: dup - IL_01a8: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::allButFirst3Numbers@50 + IL_01a8: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'allButFirst3Numbers@50-6' IL_01ad: stloc.s allButFirst3Numbers IL_01af: ret } // end of method $Linq101Partitioning01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl index 84406c42ae6..0652274c2bf 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl @@ -59,7 +59,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02C50000 +// Image base: 0x00380000 // =============== CLASS MEMBERS DECLARATION =================== @@ -68,7 +68,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname iAfterE@12 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'iAfterE@12-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -93,17 +93,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_0009: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Quantifiers01/iAfterE@12::current + IL_0010: stfld string Linq101Quantifiers01/'iAfterE@12-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method iAfterE@12::.ctor + } // end of method 'iAfterE@12-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -115,7 +115,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Quantifiers01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_0001: ldfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -148,18 +148,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Quantifiers01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_003d: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc .line 12,12 : 9,26 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 12,12 : 9,26 '' @@ -167,11 +167,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_005f: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc .line 13,13 : 9,34 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Quantifiers01/iAfterE@12::current + IL_0066: stfld string Linq101Quantifiers01/'iAfterE@12-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -181,24 +181,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_0072: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc .line 12,12 : 9,26 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_008c: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Quantifiers01/iAfterE@12::current + IL_0093: stfld string Linq101Quantifiers01/'iAfterE@12-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method iAfterE@12::GenerateNext + } // end of method 'iAfterE@12-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -210,7 +210,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_0001: ldfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -226,7 +226,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_001b: ldfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -264,19 +264,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_004f: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_0063: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Quantifiers01/iAfterE@12::current + IL_006a: stfld string Linq101Quantifiers01/'iAfterE@12-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -316,7 +316,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method iAfterE@12::Close + } // end of method 'iAfterE@12-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -325,7 +325,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/iAfterE@12::pc + IL_0001: ldfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -367,7 +367,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method iAfterE@12::get_CheckClose + } // end of method 'iAfterE@12-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -377,9 +377,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Quantifiers01/iAfterE@12::current + IL_0001: ldfld string Linq101Quantifiers01/'iAfterE@12-6'::current IL_0006: ret - } // end of method iAfterE@12::get_LastGenerated + } // end of method 'iAfterE@12-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -391,15 +391,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Quantifiers01/iAfterE@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Quantifiers01/'iAfterE@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method iAfterE@12::GetFreshEnumerator + } // end of method 'iAfterE@12-6'::GetFreshEnumerator - } // end of class iAfterE@12 + } // end of class 'iAfterE@12-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'iAfterE@13-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'iAfterE@13-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -412,7 +412,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'iAfterE@13-1'::.ctor + } // end of method 'iAfterE@13-7'::.ctor .method public strict virtual instance bool Invoke(string w) cil managed @@ -424,11 +424,11 @@ IL_0001: ldstr "ei" IL_0006: callvirt instance bool [mscorlib]System.String::Contains(string) IL_000b: ret - } // end of method 'iAfterE@13-1'::Invoke + } // end of method 'iAfterE@13-7'::Invoke - } // end of class 'iAfterE@13-1' + } // end of class 'iAfterE@13-7' - .class auto ansi serializable sealed nested assembly beforefieldinit productGroups@21 + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@21-21' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -446,9 +446,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/productGroups@21::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@21-21'::builder@ IL_000d: ret - } // end of method productGroups@21::.ctor + } // end of method 'productGroups@21-21'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -461,16 +461,16 @@ IL_0001: stloc.0 .line 22,22 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/productGroups@21::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@21-21'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method productGroups@21::Invoke + } // end of method 'productGroups@21-21'::Invoke - } // end of class productGroups@21 + } // end of class 'productGroups@21-21' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-22' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -483,7 +483,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'productGroups@22-1'::.ctor + } // end of method 'productGroups@22-22'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -493,11 +493,11 @@ .line 22,22 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'productGroups@22-1'::Invoke + } // end of method 'productGroups@22-22'::Invoke - } // end of class 'productGroups@22-1' + } // end of class 'productGroups@22-22' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-23' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -510,7 +510,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'productGroups@22-2'::.ctor + } // end of method 'productGroups@22-23'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -522,11 +522,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'productGroups@22-2'::Invoke + } // end of method 'productGroups@22-23'::Invoke - } // end of class 'productGroups@22-2' + } // end of class 'productGroups@22-23' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-24' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -544,9 +544,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@22-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@22-24'::builder@ IL_000d: ret - } // end of method 'productGroups@22-3'::.ctor + } // end of method 'productGroups@22-24'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -558,16 +558,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@22-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@22-24'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'productGroups@22-3'::Invoke + } // end of method 'productGroups@22-24'::Invoke - } // end of class 'productGroups@22-3' + } // end of class 'productGroups@22-24' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productGroups@23-5' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productGroups@23-26' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -579,7 +579,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'productGroups@23-5'::.ctor + } // end of method 'productGroups@23-26'::.ctor .method assembly hidebysig instance bool Invoke(class [Utils]Utils/Product x) cil managed @@ -592,11 +592,11 @@ IL_0006: ldc.i4.0 IL_0007: ceq IL_0009: ret - } // end of method 'productGroups@23-5'::Invoke + } // end of method 'productGroups@23-26'::Invoke - } // end of class 'productGroups@23-5' + } // end of class 'productGroups@23-26' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@23-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@23-25' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -609,7 +609,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'productGroups@23-4'::.ctor + } // end of method 'productGroups@23-25'::.ctor .method public strict virtual instance bool Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -618,18 +618,18 @@ .maxstack 8 .line 23,23 : 16,50 '' IL_0000: ldarg.1 - IL_0001: newobj instance void Linq101Quantifiers01/'productGroups@23-5'::.ctor() - IL_0006: ldftn instance bool Linq101Quantifiers01/'productGroups@23-5'::Invoke(class [Utils]Utils/Product) + IL_0001: newobj instance void Linq101Quantifiers01/'productGroups@23-26'::.ctor() + IL_0006: ldftn instance bool Linq101Quantifiers01/'productGroups@23-26'::Invoke(class [Utils]Utils/Product) IL_000c: newobj instance void class [mscorlib]System.Func`2::.ctor(object, native int) IL_0011: call bool [System.Core]System.Linq.Enumerable::Any(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [mscorlib]System.Func`2) IL_0016: ret - } // end of method 'productGroups@23-4'::Invoke + } // end of method 'productGroups@23-25'::Invoke - } // end of class 'productGroups@23-4' + } // end of class 'productGroups@23-25' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@24-6' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@24-27' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -642,7 +642,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'productGroups@24-6'::.ctor + } // end of method 'productGroups@24-27'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -656,11 +656,11 @@ IL_0007: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_000c: ret - } // end of method 'productGroups@24-6'::Invoke + } // end of method 'productGroups@24-27'::Invoke - } // end of class 'productGroups@24-6' + } // end of class 'productGroups@24-27' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname onlyOdd@32 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'onlyOdd@32-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -685,17 +685,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_0009: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Quantifiers01/onlyOdd@32::current + IL_0010: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method onlyOdd@32::.ctor + } // end of method 'onlyOdd@32-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -706,7 +706,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_0001: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -739,18 +739,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Quantifiers01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_003d: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc .line 32,32 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 32,32 : 9,28 '' @@ -758,11 +758,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_005f: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc .line 33,33 : 9,24 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Quantifiers01/onlyOdd@32::current + IL_0066: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -772,24 +772,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_0072: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc .line 32,32 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_008c: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Quantifiers01/onlyOdd@32::current + IL_0093: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method onlyOdd@32::GenerateNext + } // end of method 'onlyOdd@32-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -801,7 +801,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_0001: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -817,7 +817,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_001b: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -855,19 +855,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_004f: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_0063: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Quantifiers01/onlyOdd@32::current + IL_006a: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -907,7 +907,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method onlyOdd@32::Close + } // end of method 'onlyOdd@32-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -916,7 +916,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/onlyOdd@32::pc + IL_0001: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -958,7 +958,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method onlyOdd@32::get_CheckClose + } // end of method 'onlyOdd@32-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -968,9 +968,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/onlyOdd@32::current + IL_0001: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current IL_0006: ret - } // end of method onlyOdd@32::get_LastGenerated + } // end of method 'onlyOdd@32-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -982,15 +982,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Quantifiers01/onlyOdd@32::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Quantifiers01/'onlyOdd@32-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method onlyOdd@32::GetFreshEnumerator + } // end of method 'onlyOdd@32-6'::GetFreshEnumerator - } // end of class onlyOdd@32 + } // end of class 'onlyOdd@32-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'onlyOdd@33-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'onlyOdd@33-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1003,7 +1003,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'onlyOdd@33-1'::.ctor + } // end of method 'onlyOdd@33-7'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -1017,11 +1017,11 @@ IL_0003: ldc.i4.1 IL_0004: ceq IL_0006: ret - } // end of method 'onlyOdd@33-1'::Invoke + } // end of method 'onlyOdd@33-7'::Invoke - } // end of class 'onlyOdd@33-1' + } // end of class 'onlyOdd@33-7' - .class auto ansi serializable sealed nested assembly beforefieldinit productGroups2@39 + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@39-21' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1039,9 +1039,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/productGroups2@39::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@39-21'::builder@ IL_000d: ret - } // end of method productGroups2@39::.ctor + } // end of method 'productGroups2@39-21'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -1054,16 +1054,16 @@ IL_0001: stloc.0 .line 40,40 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/productGroups2@39::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@39-21'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method productGroups2@39::Invoke + } // end of method 'productGroups2@39-21'::Invoke - } // end of class productGroups2@39 + } // end of class 'productGroups2@39-21' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-22' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1076,7 +1076,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'productGroups2@40-1'::.ctor + } // end of method 'productGroups2@40-22'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -1086,11 +1086,11 @@ .line 40,40 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'productGroups2@40-1'::Invoke + } // end of method 'productGroups2@40-22'::Invoke - } // end of class 'productGroups2@40-1' + } // end of class 'productGroups2@40-22' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-23' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1103,7 +1103,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'productGroups2@40-2'::.ctor + } // end of method 'productGroups2@40-23'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -1115,11 +1115,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'productGroups2@40-2'::Invoke + } // end of method 'productGroups2@40-23'::Invoke - } // end of class 'productGroups2@40-2' + } // end of class 'productGroups2@40-23' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-24' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1137,9 +1137,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@40-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@40-24'::builder@ IL_000d: ret - } // end of method 'productGroups2@40-3'::.ctor + } // end of method 'productGroups2@40-24'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -1151,16 +1151,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@40-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@40-24'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'productGroups2@40-3'::Invoke + } // end of method 'productGroups2@40-24'::Invoke - } // end of class 'productGroups2@40-3' + } // end of class 'productGroups2@40-24' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productGroups2@41-5' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productGroups2@41-26' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1172,7 +1172,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'productGroups2@41-5'::.ctor + } // end of method 'productGroups2@41-26'::.ctor .method assembly hidebysig instance bool Invoke(class [Utils]Utils/Product x) cil managed @@ -1185,11 +1185,11 @@ IL_0006: ldc.i4.0 IL_0007: cgt IL_0009: ret - } // end of method 'productGroups2@41-5'::Invoke + } // end of method 'productGroups2@41-26'::Invoke - } // end of class 'productGroups2@41-5' + } // end of class 'productGroups2@41-26' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@41-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@41-25' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -1202,7 +1202,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'productGroups2@41-4'::.ctor + } // end of method 'productGroups2@41-25'::.ctor .method public strict virtual instance bool Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -1211,18 +1211,18 @@ .maxstack 8 .line 41,41 : 16,50 '' IL_0000: ldarg.1 - IL_0001: newobj instance void Linq101Quantifiers01/'productGroups2@41-5'::.ctor() - IL_0006: ldftn instance bool Linq101Quantifiers01/'productGroups2@41-5'::Invoke(class [Utils]Utils/Product) + IL_0001: newobj instance void Linq101Quantifiers01/'productGroups2@41-26'::.ctor() + IL_0006: ldftn instance bool Linq101Quantifiers01/'productGroups2@41-26'::Invoke(class [Utils]Utils/Product) IL_000c: newobj instance void class [mscorlib]System.Func`2::.ctor(object, native int) IL_0011: call bool [System.Core]System.Linq.Enumerable::All(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [mscorlib]System.Func`2) IL_0016: ret - } // end of method 'productGroups2@41-4'::Invoke + } // end of method 'productGroups2@41-25'::Invoke - } // end of class 'productGroups2@41-4' + } // end of class 'productGroups2@41-25' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@42-6' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@42-27' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -1235,7 +1235,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'productGroups2@42-6'::.ctor + } // end of method 'productGroups2@42-27'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -1249,16 +1249,16 @@ IL_0007: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_000c: ret - } // end of method 'productGroups2@42-6'::Invoke + } // end of method 'productGroups2@42-27'::Invoke - } // end of class 'productGroups2@42-6' + } // end of class 'productGroups2@42-27' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_words() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'words@8-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'words@8-36' IL_0005: ret } // end of method Linq101Quantifiers01::get_words @@ -1267,7 +1267,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld bool ''.$Linq101Quantifiers01::iAfterE@10 + IL_0000: ldsfld bool ''.$Linq101Quantifiers01::'iAfterE@10-6' IL_0005: ret } // end of method Linq101Quantifiers01::get_iAfterE @@ -1276,7 +1276,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'products@17-10' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'products@17-64' IL_0005: ret } // end of method Linq101Quantifiers01::get_products @@ -1285,7 +1285,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::productGroups@19 + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::'productGroups@19-6' IL_0005: ret } // end of method Linq101Quantifiers01::get_productGroups @@ -1294,7 +1294,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'numbers@28-7' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'numbers@28-46' IL_0005: ret } // end of method Linq101Quantifiers01::get_numbers @@ -1303,7 +1303,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld bool ''.$Linq101Quantifiers01::onlyOdd@30 + IL_0000: ldsfld bool ''.$Linq101Quantifiers01::'onlyOdd@30-6' IL_0005: ret } // end of method Linq101Quantifiers01::get_onlyOdd @@ -1312,7 +1312,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::productGroups2@37 + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::'productGroups2@37-6' IL_0005: ret } // end of method Linq101Quantifiers01::get_productGroups2 @@ -1361,19 +1361,19 @@ .class private abstract auto ansi sealed ''.$Linq101Quantifiers01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@8-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@8-36' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly bool iAfterE@10 + .field static assembly bool 'iAfterE@10-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@17-10' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@17-64' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] productGroups@19 + .field static assembly class [mscorlib]System.Tuple`2>[] 'productGroups@19-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@28-7' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@28-46' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly bool onlyOdd@30 + .field static assembly bool 'onlyOdd@30-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] productGroups2@37 + .field static assembly class [mscorlib]System.Tuple`2>[] 'productGroups2@37-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1408,26 +1408,26 @@ IL_0028: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_002d: dup - IL_002e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'words@8-6' + IL_002e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'words@8-36' IL_0033: stloc.0 IL_0034: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0039: ldnull IL_003a: ldc.i4.0 IL_003b: ldnull - IL_003c: newobj instance void Linq101Quantifiers01/iAfterE@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_003c: newobj instance void Linq101Quantifiers01/'iAfterE@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0041: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0046: newobj instance void Linq101Quantifiers01/'iAfterE@13-1'::.ctor() + IL_0046: newobj instance void Linq101Quantifiers01/'iAfterE@13-7'::.ctor() IL_004b: callvirt instance bool [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Exists(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0050: dup - IL_0051: stsfld bool ''.$Linq101Quantifiers01::iAfterE@10 + IL_0051: stsfld bool ''.$Linq101Quantifiers01::'iAfterE@10-6' IL_0056: stloc.1 .line 17,17 : 1,32 '' IL_0057: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_005c: dup - IL_005d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'products@17-10' + IL_005d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'products@17-64' IL_0062: stloc.2 .line 19,25 : 1,21 '' IL_0063: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1441,28 +1441,28 @@ IL_0076: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Quantifiers01::get_products() IL_007b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0080: ldloc.s V_7 - IL_0082: newobj instance void Linq101Quantifiers01/productGroups@21::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0082: newobj instance void Linq101Quantifiers01/'productGroups@21-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0087: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_008c: newobj instance void Linq101Quantifiers01/'productGroups@22-1'::.ctor() - IL_0091: newobj instance void Linq101Quantifiers01/'productGroups@22-2'::.ctor() + IL_008c: newobj instance void Linq101Quantifiers01/'productGroups@22-22'::.ctor() + IL_0091: newobj instance void Linq101Quantifiers01/'productGroups@22-23'::.ctor() IL_0096: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_009b: ldloc.s V_7 - IL_009d: newobj instance void Linq101Quantifiers01/'productGroups@22-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_009d: newobj instance void Linq101Quantifiers01/'productGroups@22-24'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00a2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00a7: newobj instance void Linq101Quantifiers01/'productGroups@23-4'::.ctor() + IL_00a7: newobj instance void Linq101Quantifiers01/'productGroups@23-25'::.ctor() IL_00ac: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_00b1: newobj instance void Linq101Quantifiers01/'productGroups@24-6'::.ctor() + IL_00b1: newobj instance void Linq101Quantifiers01/'productGroups@24-27'::.ctor() IL_00b6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00bb: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_00c0: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00c5: dup - IL_00c6: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::productGroups@19 + IL_00c6: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::'productGroups@19-6' IL_00cb: stloc.3 .line 28,28 : 1,35 '' IL_00cc: ldc.i4.1 @@ -1488,21 +1488,21 @@ IL_00fb: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0100: dup - IL_0101: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'numbers@28-7' + IL_0101: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'numbers@28-46' IL_0106: stloc.s numbers IL_0108: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_010d: ldnull IL_010e: ldc.i4.0 IL_010f: ldc.i4.0 - IL_0110: newobj instance void Linq101Quantifiers01/onlyOdd@32::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0110: newobj instance void Linq101Quantifiers01/'onlyOdd@32-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0115: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_011a: newobj instance void Linq101Quantifiers01/'onlyOdd@33-1'::.ctor() + IL_011a: newobj instance void Linq101Quantifiers01/'onlyOdd@33-7'::.ctor() IL_011f: callvirt instance bool [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::All(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0124: dup - IL_0125: stsfld bool ''.$Linq101Quantifiers01::onlyOdd@30 + IL_0125: stsfld bool ''.$Linq101Quantifiers01::'onlyOdd@30-6' IL_012a: stloc.s onlyOdd .line 37,43 : 1,21 '' IL_012c: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1516,28 +1516,28 @@ IL_013f: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Quantifiers01::get_products() IL_0144: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0149: ldloc.s V_8 - IL_014b: newobj instance void Linq101Quantifiers01/productGroups2@39::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_014b: newobj instance void Linq101Quantifiers01/'productGroups2@39-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0150: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0155: newobj instance void Linq101Quantifiers01/'productGroups2@40-1'::.ctor() - IL_015a: newobj instance void Linq101Quantifiers01/'productGroups2@40-2'::.ctor() + IL_0155: newobj instance void Linq101Quantifiers01/'productGroups2@40-22'::.ctor() + IL_015a: newobj instance void Linq101Quantifiers01/'productGroups2@40-23'::.ctor() IL_015f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0164: ldloc.s V_8 - IL_0166: newobj instance void Linq101Quantifiers01/'productGroups2@40-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0166: newobj instance void Linq101Quantifiers01/'productGroups2@40-24'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_016b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0170: newobj instance void Linq101Quantifiers01/'productGroups2@41-4'::.ctor() + IL_0170: newobj instance void Linq101Quantifiers01/'productGroups2@41-25'::.ctor() IL_0175: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_017a: newobj instance void Linq101Quantifiers01/'productGroups2@42-6'::.ctor() + IL_017a: newobj instance void Linq101Quantifiers01/'productGroups2@42-27'::.ctor() IL_017f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0184: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0189: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_018e: dup - IL_018f: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::productGroups2@37 + IL_018f: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::'productGroups2@37-6' IL_0194: stloc.s productGroups2 IL_0196: ret } // end of method $Linq101Quantifiers01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl index 8ac26b84fca..c48df9a0f4c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00360000 +// Image base: 0x007A0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'numsPlusOne@12-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numsPlusOne@12-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -76,7 +76,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'numsPlusOne@12-1'::.ctor + } // end of method 'numsPlusOne@12-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(int32 _arg1) cil managed @@ -93,11 +93,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'numsPlusOne@12-1'::Invoke + } // end of method 'numsPlusOne@12-7'::Invoke - } // end of class 'numsPlusOne@12-1' + } // end of class 'numsPlusOne@12-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname numsPlusOne@13 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'numsPlusOne@13-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -122,17 +122,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/numsPlusOne@13::pc + IL_0009: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Select01/numsPlusOne@13::current + IL_0010: stfld int32 Linq101Select01/'numsPlusOne@13-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method numsPlusOne@13::.ctor + } // end of method 'numsPlusOne@13-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -142,7 +142,7 @@ .locals init ([0] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/numsPlusOne@13::pc + IL_0001: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -173,34 +173,34 @@ IL_002a: nop .line 13,13 : 9,23 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101Select01/'numsPlusOne@12-1'::.ctor() + IL_002c: newobj instance void Linq101Select01/'numsPlusOne@12-7'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbers() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,int32>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101Select01/numsPlusOne@13::pc + IL_0047: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc .line 13,13 : 9,23 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_007a IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101Select01/numsPlusOne@13::pc + IL_0067: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc .line 13,13 : 17,22 '' IL_006c: ldarg.0 IL_006d: ldloc.0 IL_006e: ldc.i4.1 IL_006f: add - IL_0070: stfld int32 Linq101Select01/numsPlusOne@13::current + IL_0070: stfld int32 Linq101Select01/'numsPlusOne@13-6'::current IL_0075: ldc.i4.1 IL_0076: ret @@ -210,24 +210,24 @@ IL_007a: ldarg.0 IL_007b: ldc.i4.3 - IL_007c: stfld int32 Linq101Select01/numsPlusOne@13::pc + IL_007c: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc .line 13,13 : 9,23 '' IL_0081: ldarg.0 - IL_0082: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' + IL_0082: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' IL_0087: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_008c: nop IL_008d: ldarg.0 IL_008e: ldnull - IL_008f: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' + IL_008f: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' IL_0094: ldarg.0 IL_0095: ldc.i4.3 - IL_0096: stfld int32 Linq101Select01/numsPlusOne@13::pc + IL_0096: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc IL_009b: ldarg.0 IL_009c: ldc.i4.0 - IL_009d: stfld int32 Linq101Select01/numsPlusOne@13::current + IL_009d: stfld int32 Linq101Select01/'numsPlusOne@13-6'::current IL_00a2: ldc.i4.0 IL_00a3: ret - } // end of method numsPlusOne@13::GenerateNext + } // end of method 'numsPlusOne@13-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -239,7 +239,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/numsPlusOne@13::pc + IL_0001: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -255,7 +255,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/numsPlusOne@13::pc + IL_001b: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -293,19 +293,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/numsPlusOne@13::pc + IL_004f: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/numsPlusOne@13::pc + IL_0063: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Select01/numsPlusOne@13::current + IL_006a: stfld int32 Linq101Select01/'numsPlusOne@13-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -345,7 +345,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method numsPlusOne@13::Close + } // end of method 'numsPlusOne@13-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -354,7 +354,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/numsPlusOne@13::pc + IL_0001: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -396,7 +396,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method numsPlusOne@13::get_CheckClose + } // end of method 'numsPlusOne@13-6'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -406,9 +406,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/numsPlusOne@13::current + IL_0001: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::current IL_0006: ret - } // end of method numsPlusOne@13::get_LastGenerated + } // end of method 'numsPlusOne@13-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -420,15 +420,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Select01/numsPlusOne@13::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Select01/'numsPlusOne@13-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method numsPlusOne@13::GetFreshEnumerator + } // end of method 'numsPlusOne@13-6'::GetFreshEnumerator - } // end of class numsPlusOne@13 + } // end of class 'numsPlusOne@13-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productNames@21-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productNames@21-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -441,7 +441,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'productNames@21-1'::.ctor + } // end of method 'productNames@21-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -457,11 +457,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'productNames@21-1'::Invoke + } // end of method 'productNames@21-7'::Invoke - } // end of class 'productNames@21-1' + } // end of class 'productNames@21-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname productNames@22 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productNames@22-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -486,17 +486,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/productNames@22::pc + IL_0009: stfld int32 Linq101Select01/'productNames@22-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Select01/productNames@22::current + IL_0010: stfld string Linq101Select01/'productNames@22-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method productNames@22::.ctor + } // end of method 'productNames@22-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -506,7 +506,7 @@ .locals init ([0] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/productNames@22::pc + IL_0001: ldfld int32 Linq101Select01/'productNames@22-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -537,33 +537,33 @@ IL_002a: nop .line 22,22 : 9,31 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101Select01/'productNames@21-1'::.ctor() + IL_002c: newobj instance void Linq101Select01/'productNames@21-7'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_products() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Product>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101Select01/productNames@22::pc + IL_0047: stfld int32 Linq101Select01/'productNames@22-6'::pc .line 22,22 : 9,31 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_007d IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101Select01/productNames@22::pc + IL_0067: stfld int32 Linq101Select01/'productNames@22-6'::pc .line 22,22 : 17,30 '' IL_006c: ldarg.0 IL_006d: ldloc.0 IL_006e: callvirt instance string [Utils]Utils/Product::get_ProductName() - IL_0073: stfld string Linq101Select01/productNames@22::current + IL_0073: stfld string Linq101Select01/'productNames@22-6'::current IL_0078: ldc.i4.1 IL_0079: ret @@ -573,24 +573,24 @@ IL_007d: ldarg.0 IL_007e: ldc.i4.3 - IL_007f: stfld int32 Linq101Select01/productNames@22::pc + IL_007f: stfld int32 Linq101Select01/'productNames@22-6'::pc .line 22,22 : 9,31 '' IL_0084: ldarg.0 - IL_0085: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' + IL_0085: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' IL_008a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_008f: nop IL_0090: ldarg.0 IL_0091: ldnull - IL_0092: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' + IL_0092: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' IL_0097: ldarg.0 IL_0098: ldc.i4.3 - IL_0099: stfld int32 Linq101Select01/productNames@22::pc + IL_0099: stfld int32 Linq101Select01/'productNames@22-6'::pc IL_009e: ldarg.0 IL_009f: ldnull - IL_00a0: stfld string Linq101Select01/productNames@22::current + IL_00a0: stfld string Linq101Select01/'productNames@22-6'::current IL_00a5: ldc.i4.0 IL_00a6: ret - } // end of method productNames@22::GenerateNext + } // end of method 'productNames@22-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -602,7 +602,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/productNames@22::pc + IL_0001: ldfld int32 Linq101Select01/'productNames@22-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -618,7 +618,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/productNames@22::pc + IL_001b: ldfld int32 Linq101Select01/'productNames@22-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -656,19 +656,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/productNames@22::pc + IL_004f: stfld int32 Linq101Select01/'productNames@22-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/productNames@22::pc + IL_0063: stfld int32 Linq101Select01/'productNames@22-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Select01/productNames@22::current + IL_006a: stfld string Linq101Select01/'productNames@22-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -708,7 +708,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method productNames@22::Close + } // end of method 'productNames@22-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -717,7 +717,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/productNames@22::pc + IL_0001: ldfld int32 Linq101Select01/'productNames@22-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -759,7 +759,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method productNames@22::get_CheckClose + } // end of method 'productNames@22-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -769,9 +769,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Select01/productNames@22::current + IL_0001: ldfld string Linq101Select01/'productNames@22-6'::current IL_0006: ret - } // end of method productNames@22::get_LastGenerated + } // end of method 'productNames@22-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -783,15 +783,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/productNames@22::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Select01/'productNames@22-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method productNames@22::GetFreshEnumerator + } // end of method 'productNames@22-6'::GetFreshEnumerator - } // end of class productNames@22 + } // end of class 'productNames@22-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'textNums@29-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'textNums@29-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -804,7 +804,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'textNums@29-1'::.ctor + } // end of method 'textNums@29-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(int32 _arg1) cil managed @@ -820,11 +820,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'textNums@29-1'::Invoke + } // end of method 'textNums@29-7'::Invoke - } // end of class 'textNums@29-1' + } // end of class 'textNums@29-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname textNums@30 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'textNums@30-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -849,17 +849,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/textNums@30::pc + IL_0009: stfld int32 Linq101Select01/'textNums@30-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Select01/textNums@30::current + IL_0010: stfld string Linq101Select01/'textNums@30-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method textNums@30::.ctor + } // end of method 'textNums@30-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -869,7 +869,7 @@ .locals init ([0] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/textNums@30::pc + IL_0001: ldfld int32 Linq101Select01/'textNums@30-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -900,34 +900,34 @@ IL_002a: nop .line 30,30 : 9,29 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101Select01/'textNums@29-1'::.ctor() + IL_002c: newobj instance void Linq101Select01/'textNums@29-7'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbers() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,int32>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101Select01/textNums@30::pc + IL_0047: stfld int32 Linq101Select01/'textNums@30-6'::pc .line 30,30 : 9,29 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_0082 IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101Select01/textNums@30::pc + IL_0067: stfld int32 Linq101Select01/'textNums@30-6'::pc .line 30,30 : 17,28 '' IL_006c: ldarg.0 IL_006d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_strings() IL_0072: ldloc.0 IL_0073: callvirt instance !0 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::get_Item(int32) - IL_0078: stfld string Linq101Select01/textNums@30::current + IL_0078: stfld string Linq101Select01/'textNums@30-6'::current IL_007d: ldc.i4.1 IL_007e: ret @@ -937,24 +937,24 @@ IL_0082: ldarg.0 IL_0083: ldc.i4.3 - IL_0084: stfld int32 Linq101Select01/textNums@30::pc + IL_0084: stfld int32 Linq101Select01/'textNums@30-6'::pc .line 30,30 : 9,29 '' IL_0089: ldarg.0 - IL_008a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' + IL_008a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' IL_008f: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0094: nop IL_0095: ldarg.0 IL_0096: ldnull - IL_0097: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' + IL_0097: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' IL_009c: ldarg.0 IL_009d: ldc.i4.3 - IL_009e: stfld int32 Linq101Select01/textNums@30::pc + IL_009e: stfld int32 Linq101Select01/'textNums@30-6'::pc IL_00a3: ldarg.0 IL_00a4: ldnull - IL_00a5: stfld string Linq101Select01/textNums@30::current + IL_00a5: stfld string Linq101Select01/'textNums@30-6'::current IL_00aa: ldc.i4.0 IL_00ab: ret - } // end of method textNums@30::GenerateNext + } // end of method 'textNums@30-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -966,7 +966,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/textNums@30::pc + IL_0001: ldfld int32 Linq101Select01/'textNums@30-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -982,7 +982,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/textNums@30::pc + IL_001b: ldfld int32 Linq101Select01/'textNums@30-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1020,19 +1020,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/textNums@30::pc + IL_004f: stfld int32 Linq101Select01/'textNums@30-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/textNums@30::pc + IL_0063: stfld int32 Linq101Select01/'textNums@30-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Select01/textNums@30::current + IL_006a: stfld string Linq101Select01/'textNums@30-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1072,7 +1072,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method textNums@30::Close + } // end of method 'textNums@30-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1081,7 +1081,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/textNums@30::pc + IL_0001: ldfld int32 Linq101Select01/'textNums@30-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1123,7 +1123,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method textNums@30::get_CheckClose + } // end of method 'textNums@30-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -1133,9 +1133,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Select01/textNums@30::current + IL_0001: ldfld string Linq101Select01/'textNums@30-6'::current IL_0006: ret - } // end of method textNums@30::get_LastGenerated + } // end of method 'textNums@30-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1147,15 +1147,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/textNums@30::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Select01/'textNums@30-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method textNums@30::GetFreshEnumerator + } // end of method 'textNums@30-6'::GetFreshEnumerator - } // end of class textNums@30 + } // end of class 'textNums@30-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'upperLowerWords@38-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'upperLowerWords@38-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -1168,7 +1168,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'upperLowerWords@38-1'::.ctor + } // end of method 'upperLowerWords@38-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(string _arg1) cil managed @@ -1184,11 +1184,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'upperLowerWords@38-1'::Invoke + } // end of method 'upperLowerWords@38-7'::Invoke - } // end of class 'upperLowerWords@38-1' + } // end of class 'upperLowerWords@38-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname upperLowerWords@39 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'upperLowerWords@39-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1> { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1213,17 +1213,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/upperLowerWords@39::pc + IL_0009: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current + IL_0010: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1>::.ctor() IL_001b: ret - } // end of method upperLowerWords@39::.ctor + } // end of method 'upperLowerWords@39-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1>& next) cil managed @@ -1233,7 +1233,7 @@ .locals init ([0] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/upperLowerWords@39::pc + IL_0001: ldfld int32 Linq101Select01/'upperLowerWords@39-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1264,28 +1264,28 @@ IL_002d: nop .line 39,39 : 8,41 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101Select01/'upperLowerWords@38-1'::.ctor() + IL_002f: newobj instance void Linq101Select01/'upperLowerWords@38-7'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_words() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,string>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101Select01/upperLowerWords@39::pc + IL_004a: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc .line 39,39 : 8,41 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_008b IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101Select01/upperLowerWords@39::pc + IL_006a: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc .line 39,39 : 16,40 '' IL_006f: ldarg.0 IL_0070: ldloc.0 @@ -1294,7 +1294,7 @@ IL_0077: callvirt instance string [mscorlib]System.String::ToLower() IL_007c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) - IL_0081: stfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current + IL_0081: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current IL_0086: ldc.i4.1 IL_0087: ret @@ -1304,24 +1304,24 @@ IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Select01/upperLowerWords@39::pc + IL_008d: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc .line 39,39 : 8,41 '' IL_0092: ldarg.0 - IL_0093: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' + IL_0093: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' IL_0098: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_009d: nop IL_009e: ldarg.0 IL_009f: ldnull - IL_00a0: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' + IL_00a0: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' IL_00a5: ldarg.0 IL_00a6: ldc.i4.3 - IL_00a7: stfld int32 Linq101Select01/upperLowerWords@39::pc + IL_00a7: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc IL_00ac: ldarg.0 IL_00ad: ldnull - IL_00ae: stfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current + IL_00ae: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current IL_00b3: ldc.i4.0 IL_00b4: ret - } // end of method upperLowerWords@39::GenerateNext + } // end of method 'upperLowerWords@39-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1333,7 +1333,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/upperLowerWords@39::pc + IL_0001: ldfld int32 Linq101Select01/'upperLowerWords@39-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1349,7 +1349,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/upperLowerWords@39::pc + IL_001b: ldfld int32 Linq101Select01/'upperLowerWords@39-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1387,19 +1387,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/upperLowerWords@39::pc + IL_004f: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/upperLowerWords@39::pc + IL_0063: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current + IL_006a: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1439,7 +1439,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method upperLowerWords@39::Close + } // end of method 'upperLowerWords@39-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1448,7 +1448,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/upperLowerWords@39::pc + IL_0001: ldfld int32 Linq101Select01/'upperLowerWords@39-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1490,7 +1490,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method upperLowerWords@39::get_CheckClose + } // end of method 'upperLowerWords@39-6'::get_CheckClose .method public strict virtual instance class [mscorlib]System.Tuple`2 get_LastGenerated() cil managed @@ -1500,9 +1500,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current + IL_0001: ldfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current IL_0006: ret - } // end of method upperLowerWords@39::get_LastGenerated + } // end of method 'upperLowerWords@39-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1> GetFreshEnumerator() cil managed @@ -1514,15 +1514,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/upperLowerWords@39::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`2) + IL_0003: newobj instance void Linq101Select01/'upperLowerWords@39-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`2) IL_0008: ret - } // end of method upperLowerWords@39::GetFreshEnumerator + } // end of method 'upperLowerWords@39-6'::GetFreshEnumerator - } // end of class upperLowerWords@39 + } // end of class 'upperLowerWords@39-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'digitOddEvens@45-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'digitOddEvens@45-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -1535,7 +1535,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'digitOddEvens@45-1'::.ctor + } // end of method 'digitOddEvens@45-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(int32 _arg1) cil managed @@ -1551,11 +1551,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'digitOddEvens@45-1'::Invoke + } // end of method 'digitOddEvens@45-7'::Invoke - } // end of class 'digitOddEvens@45-1' + } // end of class 'digitOddEvens@45-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname digitOddEvens@46 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'digitOddEvens@46-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1> { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1580,17 +1580,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/digitOddEvens@46::pc + IL_0009: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current + IL_0010: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1>::.ctor() IL_001b: ret - } // end of method digitOddEvens@46::.ctor + } // end of method 'digitOddEvens@46-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1>& next) cil managed @@ -1600,7 +1600,7 @@ .locals init ([0] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/digitOddEvens@46::pc + IL_0001: ldfld int32 Linq101Select01/'digitOddEvens@46-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1631,28 +1631,28 @@ IL_002d: nop .line 46,46 : 9,42 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101Select01/'digitOddEvens@45-1'::.ctor() + IL_002f: newobj instance void Linq101Select01/'digitOddEvens@45-7'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbers() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,int32>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101Select01/digitOddEvens@46::pc + IL_004a: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc .line 46,46 : 9,42 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_0090 IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101Select01/digitOddEvens@46::pc + IL_006a: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc .line 46,46 : 17,41 '' IL_006f: ldarg.0 IL_0070: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_strings() @@ -1665,7 +1665,7 @@ IL_007f: ceq IL_0081: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) - IL_0086: stfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current + IL_0086: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current IL_008b: ldc.i4.1 IL_008c: ret @@ -1675,24 +1675,24 @@ IL_0090: ldarg.0 IL_0091: ldc.i4.3 - IL_0092: stfld int32 Linq101Select01/digitOddEvens@46::pc + IL_0092: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc .line 46,46 : 9,42 '' IL_0097: ldarg.0 - IL_0098: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' + IL_0098: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' IL_009d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_00a2: nop IL_00a3: ldarg.0 IL_00a4: ldnull - IL_00a5: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' + IL_00a5: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' IL_00aa: ldarg.0 IL_00ab: ldc.i4.3 - IL_00ac: stfld int32 Linq101Select01/digitOddEvens@46::pc + IL_00ac: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc IL_00b1: ldarg.0 IL_00b2: ldnull - IL_00b3: stfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current + IL_00b3: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current IL_00b8: ldc.i4.0 IL_00b9: ret - } // end of method digitOddEvens@46::GenerateNext + } // end of method 'digitOddEvens@46-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1704,7 +1704,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/digitOddEvens@46::pc + IL_0001: ldfld int32 Linq101Select01/'digitOddEvens@46-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1720,7 +1720,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/digitOddEvens@46::pc + IL_001b: ldfld int32 Linq101Select01/'digitOddEvens@46-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1758,19 +1758,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/digitOddEvens@46::pc + IL_004f: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/digitOddEvens@46::pc + IL_0063: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current + IL_006a: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1810,7 +1810,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method digitOddEvens@46::Close + } // end of method 'digitOddEvens@46-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1819,7 +1819,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/digitOddEvens@46::pc + IL_0001: ldfld int32 Linq101Select01/'digitOddEvens@46-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1861,7 +1861,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method digitOddEvens@46::get_CheckClose + } // end of method 'digitOddEvens@46-6'::get_CheckClose .method public strict virtual instance class [mscorlib]System.Tuple`2 get_LastGenerated() cil managed @@ -1871,9 +1871,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current + IL_0001: ldfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current IL_0006: ret - } // end of method digitOddEvens@46::get_LastGenerated + } // end of method 'digitOddEvens@46-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1> GetFreshEnumerator() cil managed @@ -1885,15 +1885,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/digitOddEvens@46::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`2) + IL_0003: newobj instance void Linq101Select01/'digitOddEvens@46-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`2) IL_0008: ret - } // end of method digitOddEvens@46::GetFreshEnumerator + } // end of method 'digitOddEvens@46-6'::GetFreshEnumerator - } // end of class digitOddEvens@46 + } // end of class 'digitOddEvens@46-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productInfos@52-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productInfos@52-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -1906,7 +1906,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'productInfos@52-1'::.ctor + } // end of method 'productInfos@52-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -1922,11 +1922,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'productInfos@52-1'::Invoke + } // end of method 'productInfos@52-7'::Invoke - } // end of class 'productInfos@52-1' + } // end of class 'productInfos@52-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname productInfos@53 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productInfos@53-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1> { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1951,17 +1951,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/productInfos@53::pc + IL_0009: stfld int32 Linq101Select01/'productInfos@53-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current + IL_0010: stfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1>::.ctor() IL_001b: ret - } // end of method productInfos@53::.ctor + } // end of method 'productInfos@53-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1>& next) cil managed @@ -1971,7 +1971,7 @@ .locals init ([0] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/productInfos@53::pc + IL_0001: ldfld int32 Linq101Select01/'productInfos@53-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -2002,28 +2002,28 @@ IL_002d: nop .line 53,53 : 9,56 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101Select01/'productInfos@52-1'::.ctor() + IL_002f: newobj instance void Linq101Select01/'productInfos@52-7'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_products() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Product>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101Select01/productInfos@53::pc + IL_004a: stfld int32 Linq101Select01/'productInfos@53-6'::pc .line 53,53 : 9,56 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_0091 IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101Select01/productInfos@53::pc + IL_006a: stfld int32 Linq101Select01/'productInfos@53-6'::pc .line 53,53 : 17,55 '' IL_006f: ldarg.0 IL_0070: ldloc.0 @@ -2035,7 +2035,7 @@ IL_0082: newobj instance void class [mscorlib]System.Tuple`3::.ctor(!0, !1, !2) - IL_0087: stfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current + IL_0087: stfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current IL_008c: ldc.i4.1 IL_008d: ret @@ -2045,24 +2045,24 @@ IL_0091: ldarg.0 IL_0092: ldc.i4.3 - IL_0093: stfld int32 Linq101Select01/productInfos@53::pc + IL_0093: stfld int32 Linq101Select01/'productInfos@53-6'::pc .line 53,53 : 9,56 '' IL_0098: ldarg.0 - IL_0099: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' + IL_0099: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' IL_009e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_00a3: nop IL_00a4: ldarg.0 IL_00a5: ldnull - IL_00a6: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' + IL_00a6: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' IL_00ab: ldarg.0 IL_00ac: ldc.i4.3 - IL_00ad: stfld int32 Linq101Select01/productInfos@53::pc + IL_00ad: stfld int32 Linq101Select01/'productInfos@53-6'::pc IL_00b2: ldarg.0 IL_00b3: ldnull - IL_00b4: stfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current + IL_00b4: stfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current IL_00b9: ldc.i4.0 IL_00ba: ret - } // end of method productInfos@53::GenerateNext + } // end of method 'productInfos@53-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -2074,7 +2074,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/productInfos@53::pc + IL_0001: ldfld int32 Linq101Select01/'productInfos@53-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -2090,7 +2090,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/productInfos@53::pc + IL_001b: ldfld int32 Linq101Select01/'productInfos@53-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -2128,19 +2128,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/productInfos@53::pc + IL_004f: stfld int32 Linq101Select01/'productInfos@53-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/productInfos@53::pc + IL_0063: stfld int32 Linq101Select01/'productInfos@53-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current + IL_006a: stfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -2180,7 +2180,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method productInfos@53::Close + } // end of method 'productInfos@53-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -2189,7 +2189,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/productInfos@53::pc + IL_0001: ldfld int32 Linq101Select01/'productInfos@53-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -2231,7 +2231,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method productInfos@53::get_CheckClose + } // end of method 'productInfos@53-6'::get_CheckClose .method public strict virtual instance class [mscorlib]System.Tuple`3 get_LastGenerated() cil managed @@ -2241,9 +2241,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current + IL_0001: ldfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current IL_0006: ret - } // end of method productInfos@53::get_LastGenerated + } // end of method 'productInfos@53-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1> GetFreshEnumerator() cil managed @@ -2255,15 +2255,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/productInfos@53::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`3) + IL_0003: newobj instance void Linq101Select01/'productInfos@53-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`3) IL_0008: ret - } // end of method productInfos@53::GetFreshEnumerator + } // end of method 'productInfos@53-6'::GetFreshEnumerator - } // end of class productInfos@53 + } // end of class 'productInfos@53-6' - .class auto ansi serializable sealed nested assembly beforefieldinit lowNums@60 + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@60-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2281,9 +2281,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/lowNums@60::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'lowNums@60-18'::builder@ IL_000d: ret - } // end of method lowNums@60::.ctor + } // end of method 'lowNums@60-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(int32 _arg1) cil managed @@ -2296,16 +2296,16 @@ IL_0001: stloc.0 .line 61,61 : 9,22 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/lowNums@60::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'lowNums@60-18'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method lowNums@60::Invoke + } // end of method 'lowNums@60-18'::Invoke - } // end of class lowNums@60 + } // end of class 'lowNums@60-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@61-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@61-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2318,7 +2318,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'lowNums@61-1'::.ctor + } // end of method 'lowNums@61-19'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -2330,11 +2330,11 @@ IL_0001: ldc.i4.5 IL_0002: clt IL_0004: ret - } // end of method 'lowNums@61-1'::Invoke + } // end of method 'lowNums@61-19'::Invoke - } // end of class 'lowNums@61-1' + } // end of class 'lowNums@61-19' - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@62-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@62-20' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2347,7 +2347,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'lowNums@62-2'::.ctor + } // end of method 'lowNums@62-20'::.ctor .method public strict virtual instance string Invoke(int32 n) cil managed @@ -2360,11 +2360,11 @@ IL_0006: tail. IL_0008: callvirt instance !0 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::get_Item(int32) IL_000d: ret - } // end of method 'lowNums@62-2'::Invoke + } // end of method 'lowNums@62-20'::Invoke - } // end of class 'lowNums@62-2' + } // end of class 'lowNums@62-20' - .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@73-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@73-13' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2384,12 +2384,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@73-1'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@73-13'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld int32 Linq101Select01/'pairs@73-1'::a + IL_000f: stfld int32 Linq101Select01/'pairs@73-13'::a IL_0014: ret - } // end of method 'pairs@73-1'::.ctor + } // end of method 'pairs@73-13'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(int32 _arg2) cil managed @@ -2402,20 +2402,20 @@ IL_0001: stloc.0 .line 74,74 : 9,22 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@73-1'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@73-13'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld int32 Linq101Select01/'pairs@73-1'::a + IL_0009: ldfld int32 Linq101Select01/'pairs@73-13'::a IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'pairs@73-1'::Invoke + } // end of method 'pairs@73-13'::Invoke - } // end of class 'pairs@73-1' + } // end of class 'pairs@73-13' - .class auto ansi serializable sealed nested assembly beforefieldinit pairs@72 + .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@72-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2433,9 +2433,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/pairs@72::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@72-12'::builder@ IL_000d: ret - } // end of method pairs@72::.ctor + } // end of method 'pairs@72-12'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(int32 _arg1) cil managed @@ -2448,25 +2448,25 @@ IL_0001: stloc.0 .line 73,73 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/pairs@72::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@72-12'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/pairs@72::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@72-12'::builder@ IL_000e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbersB() IL_0013: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0018: ldarg.0 - IL_0019: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/pairs@72::builder@ + IL_0019: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@72-12'::builder@ IL_001e: ldloc.0 - IL_001f: newobj instance void Linq101Select01/'pairs@73-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - int32) + IL_001f: newobj instance void Linq101Select01/'pairs@73-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + int32) IL_0024: tail. IL_0026: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002b: ret - } // end of method pairs@72::Invoke + } // end of method 'pairs@72-12'::Invoke - } // end of class pairs@72 + } // end of class 'pairs@72-12' - .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@74-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@74-14' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -2479,7 +2479,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'pairs@74-2'::.ctor + } // end of method 'pairs@74-14'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2500,11 +2500,11 @@ IL_000f: ldloc.1 IL_0010: clt IL_0012: ret - } // end of method 'pairs@74-2'::Invoke + } // end of method 'pairs@74-14'::Invoke - } // end of class 'pairs@74-2' + } // end of class 'pairs@74-14' - .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@75-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@75-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -2517,7 +2517,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'pairs@75-3'::.ctor + } // end of method 'pairs@75-15'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2539,11 +2539,11 @@ IL_0010: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0015: ret - } // end of method 'pairs@75-3'::Invoke + } // end of method 'pairs@75-15'::Invoke - } // end of class 'pairs@75-3' + } // end of class 'pairs@75-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@83-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@83-21' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2563,12 +2563,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@83-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@83-21'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders@83-3'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders@83-21'::c IL_0014: ret - } // end of method 'orders@83-3'::.ctor + } // end of method 'orders@83-21'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -2581,20 +2581,20 @@ IL_0001: stloc.0 .line 84,84 : 9,34 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@83-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@83-21'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders@83-3'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders@83-21'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'orders@83-3'::Invoke + } // end of method 'orders@83-21'::Invoke - } // end of class 'orders@83-3' + } // end of class 'orders@83-21' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@82-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@82-20' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2612,9 +2612,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-2'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-20'::builder@ IL_000d: ret - } // end of method 'orders@82-2'::.ctor + } // end of method 'orders@82-20'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -2627,26 +2627,26 @@ IL_0001: stloc.0 .line 83,83 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-2'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-20'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-2'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-20'::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-2'::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-20'::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Select01/'orders@83-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Select01/'orders@83-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'orders@82-2'::Invoke + } // end of method 'orders@82-20'::Invoke - } // end of class 'orders@82-2' + } // end of class 'orders@82-20' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@84-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@84-22' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -2659,7 +2659,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'orders@84-4'::.ctor + } // end of method 'orders@84-22'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2691,11 +2691,11 @@ IL_0022: call bool [mscorlib]System.Decimal::op_LessThan(valuetype [mscorlib]System.Decimal, valuetype [mscorlib]System.Decimal) IL_0027: ret - } // end of method 'orders@84-4'::Invoke + } // end of method 'orders@84-22'::Invoke - } // end of class 'orders@84-4' + } // end of class 'orders@84-22' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@85-5' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@85-23' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -2708,7 +2708,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'orders@85-5'::.ctor + } // end of method 'orders@85-23'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2735,11 +2735,11 @@ !1, !2) IL_0025: ret - } // end of method 'orders@85-5'::Invoke + } // end of method 'orders@85-23'::Invoke - } // end of class 'orders@85-5' + } // end of class 'orders@85-23' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@92-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@92-13' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2759,12 +2759,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@92-1'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@92-13'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders2@92-1'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders2@92-13'::c IL_0014: ret - } // end of method 'orders2@92-1'::.ctor + } // end of method 'orders2@92-13'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -2777,20 +2777,20 @@ IL_0001: stloc.0 .line 93,93 : 9,51 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@92-1'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@92-13'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders2@92-1'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders2@92-13'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'orders2@92-1'::Invoke + } // end of method 'orders2@92-13'::Invoke - } // end of class 'orders2@92-1' + } // end of class 'orders2@92-13' - .class auto ansi serializable sealed nested assembly beforefieldinit orders2@91 + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@91-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2808,9 +2808,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders2@91::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@91-12'::builder@ IL_000d: ret - } // end of method orders2@91::.ctor + } // end of method 'orders2@91-12'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -2823,26 +2823,26 @@ IL_0001: stloc.0 .line 92,92 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders2@91::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@91-12'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders2@91::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@91-12'::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders2@91::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@91-12'::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Select01/'orders2@92-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Select01/'orders2@92-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method orders2@91::Invoke + } // end of method 'orders2@91-12'::Invoke - } // end of class orders2@91 + } // end of class 'orders2@91-12' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@93-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@93-14' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -2855,7 +2855,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'orders2@93-2'::.ctor + } // end of method 'orders2@93-14'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2884,11 +2884,11 @@ IL_0022: call bool [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/HashCompare::GenericGreaterOrEqualIntrinsic(!!0, !!0) IL_0027: ret - } // end of method 'orders2@93-2'::Invoke + } // end of method 'orders2@93-14'::Invoke - } // end of class 'orders2@93-2' + } // end of class 'orders2@93-14' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@94-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@94-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -2901,7 +2901,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'orders2@94-3'::.ctor + } // end of method 'orders2@94-15'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2928,11 +2928,11 @@ !1, !2) IL_0025: ret - } // end of method 'orders2@94-3'::Invoke + } // end of method 'orders2@94-15'::Invoke - } // end of class 'orders2@94-3' + } // end of class 'orders2@94-15' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@101-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@101-13' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2952,12 +2952,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@101-1'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@101-13'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders3@101-1'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders3@101-13'::c IL_0014: ret - } // end of method 'orders3@101-1'::.ctor + } // end of method 'orders3@101-13'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -2970,20 +2970,20 @@ IL_0001: stloc.0 .line 102,102 : 9,35 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@101-1'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@101-13'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders3@101-1'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders3@101-13'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'orders3@101-1'::Invoke + } // end of method 'orders3@101-13'::Invoke - } // end of class 'orders3@101-1' + } // end of class 'orders3@101-13' - .class auto ansi serializable sealed nested assembly beforefieldinit orders3@100 + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@100-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3001,9 +3001,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders3@100::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@100-12'::builder@ IL_000d: ret - } // end of method orders3@100::.ctor + } // end of method 'orders3@100-12'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -3016,26 +3016,26 @@ IL_0001: stloc.0 .line 101,101 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders3@100::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@100-12'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders3@100::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@100-12'::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders3@100::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@100-12'::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Select01/'orders3@101-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Select01/'orders3@101-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method orders3@100::Invoke + } // end of method 'orders3@100-12'::Invoke - } // end of class orders3@100 + } // end of class 'orders3@100-12' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@102-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@102-14' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -3048,7 +3048,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'orders3@102-2'::.ctor + } // end of method 'orders3@102-14'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -3080,11 +3080,11 @@ IL_0022: call bool [mscorlib]System.Decimal::op_GreaterThanOrEqual(valuetype [mscorlib]System.Decimal, valuetype [mscorlib]System.Decimal) IL_0027: ret - } // end of method 'orders3@102-2'::Invoke + } // end of method 'orders3@102-14'::Invoke - } // end of class 'orders3@102-2' + } // end of class 'orders3@102-14' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@103-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@103-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -3097,7 +3097,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'orders3@103-3'::.ctor + } // end of method 'orders3@103-15'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -3124,11 +3124,11 @@ !1, !2) IL_0025: ret - } // end of method 'orders3@103-3'::Invoke + } // end of method 'orders3@103-15'::Invoke - } // end of class 'orders3@103-3' + } // end of class 'orders3@103-15' - .class auto ansi serializable sealed nested assembly beforefieldinit orders4@111 + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@111-18' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3146,9 +3146,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders4@111::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-18'::builder@ IL_000d: ret - } // end of method orders4@111::.ctor + } // end of method 'orders4@111-18'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -3161,16 +3161,16 @@ IL_0001: stloc.0 .line 112,112 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders4@111::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-18'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method orders4@111::Invoke + } // end of method 'orders4@111-18'::Invoke - } // end of class orders4@111 + } // end of class 'orders4@111-18' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@112-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@112-19' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -3183,7 +3183,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'orders4@112-1'::.ctor + } // end of method 'orders4@112-19'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Customer c) cil managed @@ -3197,11 +3197,11 @@ IL_000b: call bool [mscorlib]System.String::Equals(string, string) IL_0010: ret - } // end of method 'orders4@112-1'::Invoke + } // end of method 'orders4@112-19'::Invoke - } // end of class 'orders4@112-1' + } // end of class 'orders4@112-19' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@113-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@113-21' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3221,12 +3221,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@113-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@113-21'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders4@113-3'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders4@113-21'::c IL_0014: ret - } // end of method 'orders4@113-3'::.ctor + } // end of method 'orders4@113-21'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg3) cil managed @@ -3239,20 +3239,20 @@ IL_0001: stloc.0 .line 114,114 : 9,42 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@113-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@113-21'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders4@113-3'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders4@113-21'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'orders4@113-3'::Invoke + } // end of method 'orders4@113-21'::Invoke - } // end of class 'orders4@113-3' + } // end of class 'orders4@113-21' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@111-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@111-20' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3270,9 +3270,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-2'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-20'::builder@ IL_000d: ret - } // end of method 'orders4@111-2'::.ctor + } // end of method 'orders4@111-20'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg2) cil managed @@ -3284,26 +3284,26 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-2'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-20'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-2'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-20'::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-2'::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-20'::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Select01/'orders4@113-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Select01/'orders4@113-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'orders4@111-2'::Invoke + } // end of method 'orders4@111-20'::Invoke - } // end of class 'orders4@111-2' + } // end of class 'orders4@111-20' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@114-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@114-22' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -3316,7 +3316,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'orders4@114-4'::.ctor + } // end of method 'orders4@114-22'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -3340,11 +3340,11 @@ IL_001b: call bool [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/HashCompare::GenericGreaterOrEqualIntrinsic(!!0, !!0) IL_0020: ret - } // end of method 'orders4@114-4'::Invoke + } // end of method 'orders4@114-22'::Invoke - } // end of class 'orders4@114-4' + } // end of class 'orders4@114-22' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@115-5' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@115-23' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -3357,7 +3357,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'orders4@115-5'::.ctor + } // end of method 'orders4@115-23'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -3381,16 +3381,16 @@ IL_001a: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001f: ret - } // end of method 'orders4@115-5'::Invoke + } // end of method 'orders4@115-23'::Invoke - } // end of class 'orders4@115-5' + } // end of class 'orders4@115-23' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_numbers() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbers@7-9' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbers@7-48' IL_0005: ret } // end of method Linq101Select01::get_numbers @@ -3399,7 +3399,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numsPlusOne@10 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numsPlusOne@10-6' IL_0005: ret } // end of method Linq101Select01::get_numsPlusOne @@ -3408,7 +3408,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'products@17-12' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'products@17-66' IL_0005: ret } // end of method Linq101Select01::get_products @@ -3417,7 +3417,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Select01::productNames@19 + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Select01::'productNames@19-6' IL_0005: ret } // end of method Linq101Select01::get_productNames @@ -3426,7 +3426,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'strings@26-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'strings@26-14' IL_0005: ret } // end of method Linq101Select01::get_strings @@ -3435,7 +3435,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::textNums@27 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'textNums@27-6' IL_0005: ret } // end of method Linq101Select01::get_textNums @@ -3444,7 +3444,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'words@34-8' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'words@34-38' IL_0005: ret } // end of method Linq101Select01::get_words @@ -3453,7 +3453,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::upperLowerWords@36 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::'upperLowerWords@36-6' IL_0005: ret } // end of method Linq101Select01::get_upperLowerWords @@ -3462,7 +3462,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Select01::digitOddEvens@43 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Select01::'digitOddEvens@43-6' IL_0005: ret } // end of method Linq101Select01::get_digitOddEvens @@ -3471,7 +3471,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::productInfos@50 + IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'productInfos@50-6' IL_0005: ret } // end of method Linq101Select01::get_productInfos @@ -3480,7 +3480,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'digits@57-4' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'digits@57-28' IL_0005: ret } // end of method Linq101Select01::get_digits @@ -3489,7 +3489,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::lowNums@58 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'lowNums@58-12' IL_0005: ret } // end of method Linq101Select01::get_lowNums @@ -3498,7 +3498,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numbersA@67 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbersA@67-6' IL_0005: ret } // end of method Linq101Select01::get_numbersA @@ -3507,7 +3507,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numbersB@68 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbersB@68-6' IL_0005: ret } // end of method Linq101Select01::get_numbersB @@ -3516,7 +3516,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::pairs@70 + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::'pairs@70-6' IL_0005: ret } // end of method Linq101Select01::get_pairs @@ -3525,7 +3525,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'customers@79-4' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'customers@79-34' IL_0005: ret } // end of method Linq101Select01::get_customers @@ -3534,7 +3534,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::orders@80 + IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'orders@80-6' IL_0005: ret } // end of method Linq101Select01::get_orders @@ -3543,7 +3543,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::orders2@89 + IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'orders2@89-6' IL_0005: ret } // end of method Linq101Select01::get_orders2 @@ -3552,7 +3552,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::orders3@98 + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::'orders3@98-6' IL_0005: ret } // end of method Linq101Select01::get_orders3 @@ -3561,7 +3561,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld valuetype [mscorlib]System.DateTime ''.$Linq101Select01::cutOffDate@107 + IL_0000: ldsfld valuetype [mscorlib]System.DateTime ''.$Linq101Select01::'cutOffDate@107-6' IL_0005: ret } // end of method Linq101Select01::get_cutOffDate @@ -3570,7 +3570,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::orders4@109 + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::'orders4@109-6' IL_0005: ret } // end of method Linq101Select01::get_orders4 @@ -3705,47 +3705,47 @@ .class private abstract auto ansi sealed ''.$Linq101Select01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@7-9' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@7-48' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numsPlusOne@10 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numsPlusOne@10-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@17-12' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@17-66' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 productNames@19 + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'productNames@19-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'strings@26-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'strings@26-14' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 textNums@27 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'textNums@27-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@34-8' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@34-38' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] upperLowerWords@36 + .field static assembly class [mscorlib]System.Tuple`2[] 'upperLowerWords@36-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> digitOddEvens@43 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> 'digitOddEvens@43-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`3[] productInfos@50 + .field static assembly class [mscorlib]System.Tuple`3[] 'productInfos@50-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@57-4' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@57-28' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 lowNums@58 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'lowNums@58-12' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numbersA@67 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbersA@67-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numbersB@68 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbersB@68-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] pairs@70 + .field static assembly class [mscorlib]System.Tuple`2[] 'pairs@70-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@79-4' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@79-34' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`3[] orders@80 + .field static assembly class [mscorlib]System.Tuple`3[] 'orders@80-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`3[] orders2@89 + .field static assembly class [mscorlib]System.Tuple`3[] 'orders2@89-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1> orders3@98 + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1> 'orders3@98-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly valuetype [mscorlib]System.DateTime cutOffDate@107 + .field static assembly valuetype [mscorlib]System.DateTime 'cutOffDate@107-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1> orders4@109 + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1> 'orders4@109-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -3824,7 +3824,7 @@ IL_003d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0042: dup - IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbers@7-9' + IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbers@7-48' IL_0048: stloc.0 .line 10,14 : 1,20 '' IL_0049: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3832,28 +3832,28 @@ IL_0050: ldnull IL_0051: ldc.i4.0 IL_0052: ldc.i4.0 - IL_0053: newobj instance void Linq101Select01/numsPlusOne@13::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0053: newobj instance void Linq101Select01/'numsPlusOne@13-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0058: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_005d: dup - IL_005e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numsPlusOne@10 + IL_005e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numsPlusOne@10-6' IL_0063: stloc.1 .line 17,17 : 1,32 '' IL_0064: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0069: dup - IL_006a: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'products@17-12' + IL_006a: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'products@17-66' IL_006f: stloc.2 IL_0070: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0075: stloc.s V_22 IL_0077: ldnull IL_0078: ldc.i4.0 IL_0079: ldnull - IL_007a: newobj instance void Linq101Select01/productNames@22::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_007a: newobj instance void Linq101Select01/'productNames@22-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_007f: dup - IL_0080: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Select01::productNames@19 + IL_0080: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Select01::'productNames@19-6' IL_0085: stloc.3 .line 26,26 : 1,97 '' IL_0086: ldstr "zero" @@ -3888,7 +3888,7 @@ IL_00ea: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_00ef: dup - IL_00f0: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'strings@26-2' + IL_00f0: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'strings@26-14' IL_00f5: stloc.s strings .line 27,31 : 1,20 '' IL_00f7: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3896,12 +3896,12 @@ IL_00fe: ldnull IL_00ff: ldc.i4.0 IL_0100: ldnull - IL_0101: newobj instance void Linq101Select01/textNums@30::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0101: newobj instance void Linq101Select01/'textNums@30-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0106: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_010b: dup - IL_010c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::textNums@27 + IL_010c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'textNums@27-6' IL_0111: stloc.s textNums .line 34,34 : 1,46 '' IL_0113: ldstr "aPPLE" @@ -3915,7 +3915,7 @@ IL_0131: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0136: dup - IL_0137: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'words@34-8' + IL_0137: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'words@34-38' IL_013c: stloc.s words .line 36,40 : 1,20 '' IL_013e: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3923,12 +3923,12 @@ IL_0145: ldnull IL_0146: ldc.i4.0 IL_0147: ldnull - IL_0148: newobj instance void Linq101Select01/upperLowerWords@39::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`2) + IL_0148: newobj instance void Linq101Select01/'upperLowerWords@39-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`2) IL_014d: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0152: dup - IL_0153: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::upperLowerWords@36 + IL_0153: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::'upperLowerWords@36-6' IL_0158: stloc.s upperLowerWords .line 43,47 : 1,20 '' IL_015a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3936,12 +3936,12 @@ IL_0161: ldnull IL_0162: ldc.i4.0 IL_0163: ldnull - IL_0164: newobj instance void Linq101Select01/digitOddEvens@46::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`2) + IL_0164: newobj instance void Linq101Select01/'digitOddEvens@46-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`2) IL_0169: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_016e: dup - IL_016f: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Select01::digitOddEvens@43 + IL_016f: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Select01::'digitOddEvens@43-6' IL_0174: stloc.s digitOddEvens .line 50,54 : 1,21 '' IL_0176: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3949,17 +3949,17 @@ IL_017d: ldnull IL_017e: ldc.i4.0 IL_017f: ldnull - IL_0180: newobj instance void Linq101Select01/productInfos@53::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`3) + IL_0180: newobj instance void Linq101Select01/'productInfos@53-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`3) IL_0185: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_018a: dup - IL_018b: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::productInfos@50 + IL_018b: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'productInfos@50-6' IL_0190: stloc.s productInfos .line 57,57 : 1,21 '' IL_0192: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_strings() IL_0197: dup - IL_0198: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'digits@57-4' + IL_0198: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'digits@57-28' IL_019d: stloc.s digits .line 58,63 : 1,20 '' IL_019f: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3971,19 +3971,19 @@ IL_01ae: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbers() IL_01b3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01b8: ldloc.s V_27 - IL_01ba: newobj instance void Linq101Select01/lowNums@60::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01ba: newobj instance void Linq101Select01/'lowNums@60-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01bf: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01c4: newobj instance void Linq101Select01/'lowNums@61-1'::.ctor() + IL_01c4: newobj instance void Linq101Select01/'lowNums@61-19'::.ctor() IL_01c9: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_01ce: newobj instance void Linq101Select01/'lowNums@62-2'::.ctor() + IL_01ce: newobj instance void Linq101Select01/'lowNums@62-20'::.ctor() IL_01d3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01d8: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_01dd: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01e2: dup - IL_01e3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::lowNums@58 + IL_01e3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'lowNums@58-12' IL_01e8: stloc.s lowNums .line 64,64 : 1,59 '' IL_01ea: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_lowNums() @@ -4057,7 +4057,7 @@ IL_0287: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_028c: dup - IL_028d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numbersA@67 + IL_028d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbersA@67-6' IL_0292: stloc.s numbersA .line 68,68 : 1,31 '' IL_0294: ldc.i4.1 @@ -4077,7 +4077,7 @@ IL_02b2: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_02b7: dup - IL_02b8: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numbersB@68 + IL_02b8: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbersB@68-6' IL_02bd: stloc.s numbersB .line 70,76 : 1,21 '' IL_02bf: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -4089,24 +4089,24 @@ IL_02ce: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbersA() IL_02d3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_02d8: ldloc.s V_30 - IL_02da: newobj instance void Linq101Select01/pairs@72::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_02da: newobj instance void Linq101Select01/'pairs@72-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_02df: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_02e4: newobj instance void Linq101Select01/'pairs@74-2'::.ctor() + IL_02e4: newobj instance void Linq101Select01/'pairs@74-14'::.ctor() IL_02e9: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_02ee: newobj instance void Linq101Select01/'pairs@75-3'::.ctor() + IL_02ee: newobj instance void Linq101Select01/'pairs@75-15'::.ctor() IL_02f3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_02f8: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_02fd: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0302: dup - IL_0303: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::pairs@70 + IL_0303: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::'pairs@70-6' IL_0308: stloc.s pairs .line 79,79 : 1,34 '' IL_030a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_030f: dup - IL_0310: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'customers@79-4' + IL_0310: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'customers@79-34' IL_0315: stloc.s customers .line 80,86 : 1,21 '' IL_0317: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -4118,19 +4118,19 @@ IL_0326: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_customers() IL_032b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0330: ldloc.s V_31 - IL_0332: newobj instance void Linq101Select01/'orders@82-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0332: newobj instance void Linq101Select01/'orders@82-20'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0337: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_033c: newobj instance void Linq101Select01/'orders@84-4'::.ctor() + IL_033c: newobj instance void Linq101Select01/'orders@84-22'::.ctor() IL_0341: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0346: newobj instance void Linq101Select01/'orders@85-5'::.ctor() + IL_0346: newobj instance void Linq101Select01/'orders@85-23'::.ctor() IL_034b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0350: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0355: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_035a: dup - IL_035b: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::orders@80 + IL_035b: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'orders@80-6' IL_0360: stloc.s orders .line 89,95 : 1,21 '' IL_0362: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -4142,19 +4142,19 @@ IL_0371: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_customers() IL_0376: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_037b: ldloc.s V_32 - IL_037d: newobj instance void Linq101Select01/orders2@91::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_037d: newobj instance void Linq101Select01/'orders2@91-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0382: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0387: newobj instance void Linq101Select01/'orders2@93-2'::.ctor() + IL_0387: newobj instance void Linq101Select01/'orders2@93-14'::.ctor() IL_038c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0391: newobj instance void Linq101Select01/'orders2@94-3'::.ctor() + IL_0391: newobj instance void Linq101Select01/'orders2@94-15'::.ctor() IL_0396: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_039b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_03a0: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03a5: dup - IL_03a6: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::orders2@89 + IL_03a6: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'orders2@89-6' IL_03ab: stloc.s orders2 IL_03ad: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_03b2: stloc.s V_33 @@ -4165,18 +4165,18 @@ IL_03bc: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_customers() IL_03c1: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03c6: ldloc.s V_33 - IL_03c8: newobj instance void Linq101Select01/orders3@100::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_03c8: newobj instance void Linq101Select01/'orders3@100-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_03cd: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_03d2: newobj instance void Linq101Select01/'orders3@102-2'::.ctor() + IL_03d2: newobj instance void Linq101Select01/'orders3@102-14'::.ctor() IL_03d7: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_03dc: newobj instance void Linq101Select01/'orders3@103-3'::.ctor() + IL_03dc: newobj instance void Linq101Select01/'orders3@103-15'::.ctor() IL_03e1: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_03e6: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_03eb: dup - IL_03ec: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::orders3@98 + IL_03ec: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::'orders3@98-6' IL_03f1: stloc.s orders3 .line 107,107 : 1,38 '' IL_03f3: ldc.i4 0x7cd @@ -4186,7 +4186,7 @@ int32, int32) IL_03ff: dup - IL_0400: stsfld valuetype [mscorlib]System.DateTime ''.$Linq101Select01::cutOffDate@107 + IL_0400: stsfld valuetype [mscorlib]System.DateTime ''.$Linq101Select01::'cutOffDate@107-6' IL_0405: stloc.s cutOffDate IL_0407: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_040c: stloc.s V_34 @@ -4199,25 +4199,25 @@ IL_041a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_customers() IL_041f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0424: ldloc.s V_34 - IL_0426: newobj instance void Linq101Select01/orders4@111::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0426: newobj instance void Linq101Select01/'orders4@111-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_042b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0430: newobj instance void Linq101Select01/'orders4@112-1'::.ctor() + IL_0430: newobj instance void Linq101Select01/'orders4@112-19'::.ctor() IL_0435: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_043a: ldloc.s V_34 - IL_043c: newobj instance void Linq101Select01/'orders4@111-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_043c: newobj instance void Linq101Select01/'orders4@111-20'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0441: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0446: newobj instance void Linq101Select01/'orders4@114-4'::.ctor() + IL_0446: newobj instance void Linq101Select01/'orders4@114-22'::.ctor() IL_044b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0450: newobj instance void Linq101Select01/'orders4@115-5'::.ctor() + IL_0450: newobj instance void Linq101Select01/'orders4@115-23'::.ctor() IL_0455: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_045a: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_045f: dup - IL_0460: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::orders4@109 + IL_0460: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::'orders4@109-6' IL_0465: stloc.s orders4 IL_0467: ret } // end of method $Linq101Select01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl index 65ec82f4292..0e8801c53c3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01010000 +// Image base: 0x00CB0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'uniqueFactors@13-1' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'uniqueFactors@13-7' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -88,17 +88,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_0009: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current + IL_0010: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'uniqueFactors@13-1'::.ctor + } // end of method 'uniqueFactors@13-7'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -110,7 +110,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101SetOperators01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101SetOperators01::get_factorsOf300() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_003d: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc .line 13,13 : 9,33 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 13,13 : 9,33 '' @@ -162,11 +162,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_005f: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc .line 14,14 : 9,17 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current + IL_0066: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -176,24 +176,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_0072: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc .line 13,13 : 9,33 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_008c: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current + IL_0093: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'uniqueFactors@13-1'::GenerateNext + } // end of method 'uniqueFactors@13-7'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -205,7 +205,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -221,7 +221,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_001b: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -259,19 +259,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_004f: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_0063: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current + IL_006a: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -311,7 +311,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'uniqueFactors@13-1'::Close + } // end of method 'uniqueFactors@13-7'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -320,7 +320,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc + IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -362,7 +362,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'uniqueFactors@13-1'::get_CheckClose + } // end of method 'uniqueFactors@13-7'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -372,9 +372,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current + IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current IL_0006: ret - } // end of method 'uniqueFactors@13-1'::get_LastGenerated + } // end of method 'uniqueFactors@13-7'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -386,15 +386,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101SetOperators01/'uniqueFactors@13-1'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + IL_0003: newobj instance void Linq101SetOperators01/'uniqueFactors@13-7'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, int32, int32) IL_0008: ret - } // end of method 'uniqueFactors@13-1'::GetFreshEnumerator + } // end of method 'uniqueFactors@13-7'::GetFreshEnumerator - } // end of class 'uniqueFactors@13-1' + } // end of class 'uniqueFactors@13-7' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categoryNames@22-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categoryNames@22-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -407,7 +407,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'categoryNames@22-1'::.ctor + } // end of method 'categoryNames@22-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -423,11 +423,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'categoryNames@22-1'::Invoke + } // end of method 'categoryNames@22-7'::Invoke - } // end of class 'categoryNames@22-1' + } // end of class 'categoryNames@22-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname categoryNames@23 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'categoryNames@23-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -452,17 +452,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_0009: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101SetOperators01/categoryNames@23::current + IL_0010: stfld string Linq101SetOperators01/'categoryNames@23-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method categoryNames@23::.ctor + } // end of method 'categoryNames@23-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -472,7 +472,7 @@ .locals init ([0] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_0001: ldfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -503,33 +503,33 @@ IL_002a: nop .line 23,23 : 9,26 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101SetOperators01/'categoryNames@22-1'::.ctor() + IL_002c: newobj instance void Linq101SetOperators01/'categoryNames@22-7'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101SetOperators01::get_products() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Product>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_0047: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc .line 23,23 : 9,26 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_007d IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_0067: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc .line 23,23 : 16,26 '' IL_006c: ldarg.0 IL_006d: ldloc.0 IL_006e: callvirt instance string [Utils]Utils/Product::get_Category() - IL_0073: stfld string Linq101SetOperators01/categoryNames@23::current + IL_0073: stfld string Linq101SetOperators01/'categoryNames@23-6'::current IL_0078: ldc.i4.1 IL_0079: ret @@ -539,24 +539,24 @@ IL_007d: ldarg.0 IL_007e: ldc.i4.3 - IL_007f: stfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_007f: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc .line 23,23 : 9,26 '' IL_0084: ldarg.0 - IL_0085: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' + IL_0085: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' IL_008a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_008f: nop IL_0090: ldarg.0 IL_0091: ldnull - IL_0092: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' + IL_0092: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' IL_0097: ldarg.0 IL_0098: ldc.i4.3 - IL_0099: stfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_0099: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc IL_009e: ldarg.0 IL_009f: ldnull - IL_00a0: stfld string Linq101SetOperators01/categoryNames@23::current + IL_00a0: stfld string Linq101SetOperators01/'categoryNames@23-6'::current IL_00a5: ldc.i4.0 IL_00a6: ret - } // end of method categoryNames@23::GenerateNext + } // end of method 'categoryNames@23-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -568,7 +568,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_0001: ldfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -584,7 +584,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_001b: ldfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -622,19 +622,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_004f: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_0063: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101SetOperators01/categoryNames@23::current + IL_006a: stfld string Linq101SetOperators01/'categoryNames@23-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -674,7 +674,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method categoryNames@23::Close + } // end of method 'categoryNames@23-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -683,7 +683,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/categoryNames@23::pc + IL_0001: ldfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -725,7 +725,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method categoryNames@23::get_CheckClose + } // end of method 'categoryNames@23-6'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -735,9 +735,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101SetOperators01/categoryNames@23::current + IL_0001: ldfld string Linq101SetOperators01/'categoryNames@23-6'::current IL_0006: ret - } // end of method categoryNames@23::get_LastGenerated + } // end of method 'categoryNames@23-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -749,15 +749,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101SetOperators01/categoryNames@23::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101SetOperators01/'categoryNames@23-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method categoryNames@23::GetFreshEnumerator + } // end of method 'categoryNames@23-6'::GetFreshEnumerator - } // end of class categoryNames@23 + } // end of class 'categoryNames@23-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productFirstChars@32-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productFirstChars@32-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -770,7 +770,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'productFirstChars@32-1'::.ctor + } // end of method 'productFirstChars@32-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -786,11 +786,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'productFirstChars@32-1'::Invoke + } // end of method 'productFirstChars@32-7'::Invoke - } // end of class 'productFirstChars@32-1' + } // end of class 'productFirstChars@32-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname productFirstChars@33 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productFirstChars@33-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -815,17 +815,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_0009: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld char Linq101SetOperators01/productFirstChars@33::current + IL_0010: stfld char Linq101SetOperators01/'productFirstChars@33-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method productFirstChars@33::.ctor + } // end of method 'productFirstChars@33-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -835,7 +835,7 @@ .locals init ([0] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_0001: ldfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -866,35 +866,35 @@ IL_002d: nop .line 33,33 : 9,33 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101SetOperators01/'productFirstChars@32-1'::.ctor() + IL_002f: newobj instance void Linq101SetOperators01/'productFirstChars@32-7'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101SetOperators01::get_products() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Product>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_004a: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc .line 33,33 : 9,33 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_0086 IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_006a: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc .line 33,33 : 29,30 '' IL_006f: ldarg.0 IL_0070: ldloc.0 IL_0071: callvirt instance string [Utils]Utils/Product::get_ProductName() IL_0076: ldc.i4.0 IL_0077: callvirt instance char [mscorlib]System.String::get_Chars(int32) - IL_007c: stfld char Linq101SetOperators01/productFirstChars@33::current + IL_007c: stfld char Linq101SetOperators01/'productFirstChars@33-6'::current IL_0081: ldc.i4.1 IL_0082: ret @@ -904,24 +904,24 @@ IL_0086: ldarg.0 IL_0087: ldc.i4.3 - IL_0088: stfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_0088: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc .line 33,33 : 9,33 '' IL_008d: ldarg.0 - IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' + IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' IL_0093: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0098: nop IL_0099: ldarg.0 IL_009a: ldnull - IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' + IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' IL_00a0: ldarg.0 IL_00a1: ldc.i4.3 - IL_00a2: stfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_00a2: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc IL_00a7: ldarg.0 IL_00a8: ldc.i4.0 - IL_00a9: stfld char Linq101SetOperators01/productFirstChars@33::current + IL_00a9: stfld char Linq101SetOperators01/'productFirstChars@33-6'::current IL_00ae: ldc.i4.0 IL_00af: ret - } // end of method productFirstChars@33::GenerateNext + } // end of method 'productFirstChars@33-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -933,7 +933,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_0001: ldfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -949,7 +949,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_001b: ldfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -987,19 +987,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_004f: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_0063: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld char Linq101SetOperators01/productFirstChars@33::current + IL_006a: stfld char Linq101SetOperators01/'productFirstChars@33-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1039,7 +1039,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method productFirstChars@33::Close + } // end of method 'productFirstChars@33-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1048,7 +1048,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/productFirstChars@33::pc + IL_0001: ldfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1090,7 +1090,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method productFirstChars@33::get_CheckClose + } // end of method 'productFirstChars@33-6'::get_CheckClose .method public strict virtual instance char get_LastGenerated() cil managed @@ -1100,9 +1100,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld char Linq101SetOperators01/productFirstChars@33::current + IL_0001: ldfld char Linq101SetOperators01/'productFirstChars@33-6'::current IL_0006: ret - } // end of method productFirstChars@33::get_LastGenerated + } // end of method 'productFirstChars@33-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1114,15 +1114,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101SetOperators01/productFirstChars@33::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - char) + IL_0003: newobj instance void Linq101SetOperators01/'productFirstChars@33-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + char) IL_0008: ret - } // end of method productFirstChars@33::GetFreshEnumerator + } // end of method 'productFirstChars@33-6'::GetFreshEnumerator - } // end of class productFirstChars@33 + } // end of class 'productFirstChars@33-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'customerFirstChars@38-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'customerFirstChars@38-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -1135,7 +1135,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'customerFirstChars@38-1'::.ctor + } // end of method 'customerFirstChars@38-7'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -1151,11 +1151,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'customerFirstChars@38-1'::Invoke + } // end of method 'customerFirstChars@38-7'::Invoke - } // end of class 'customerFirstChars@38-1' + } // end of class 'customerFirstChars@38-7' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname customerFirstChars@39 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'customerFirstChars@39-6' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1180,17 +1180,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_0009: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld char Linq101SetOperators01/customerFirstChars@39::current + IL_0010: stfld char Linq101SetOperators01/'customerFirstChars@39-6'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method customerFirstChars@39::.ctor + } // end of method 'customerFirstChars@39-6'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1200,7 +1200,7 @@ .locals init ([0] class [Utils]Utils/Customer c) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_0001: ldfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1231,35 +1231,35 @@ IL_002d: nop .line 39,39 : 9,33 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101SetOperators01/'customerFirstChars@38-1'::.ctor() + IL_002f: newobj instance void Linq101SetOperators01/'customerFirstChars@38-7'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101SetOperators01::get_customers() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Customer>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_004a: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc .line 39,39 : 9,33 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_0086 IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_006a: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc .line 39,39 : 29,30 '' IL_006f: ldarg.0 IL_0070: ldloc.0 IL_0071: callvirt instance string [Utils]Utils/Customer::get_CompanyName() IL_0076: ldc.i4.0 IL_0077: callvirt instance char [mscorlib]System.String::get_Chars(int32) - IL_007c: stfld char Linq101SetOperators01/customerFirstChars@39::current + IL_007c: stfld char Linq101SetOperators01/'customerFirstChars@39-6'::current IL_0081: ldc.i4.1 IL_0082: ret @@ -1269,24 +1269,24 @@ IL_0086: ldarg.0 IL_0087: ldc.i4.3 - IL_0088: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_0088: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc .line 39,39 : 9,33 '' IL_008d: ldarg.0 - IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' + IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' IL_0093: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0098: nop IL_0099: ldarg.0 IL_009a: ldnull - IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' + IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' IL_00a0: ldarg.0 IL_00a1: ldc.i4.3 - IL_00a2: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_00a2: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc IL_00a7: ldarg.0 IL_00a8: ldc.i4.0 - IL_00a9: stfld char Linq101SetOperators01/customerFirstChars@39::current + IL_00a9: stfld char Linq101SetOperators01/'customerFirstChars@39-6'::current IL_00ae: ldc.i4.0 IL_00af: ret - } // end of method customerFirstChars@39::GenerateNext + } // end of method 'customerFirstChars@39-6'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1298,7 +1298,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_0001: ldfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1314,7 +1314,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_001b: ldfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1352,19 +1352,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_004f: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_0063: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld char Linq101SetOperators01/customerFirstChars@39::current + IL_006a: stfld char Linq101SetOperators01/'customerFirstChars@39-6'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1404,7 +1404,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method customerFirstChars@39::Close + } // end of method 'customerFirstChars@39-6'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1413,7 +1413,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/customerFirstChars@39::pc + IL_0001: ldfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1455,7 +1455,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method customerFirstChars@39::get_CheckClose + } // end of method 'customerFirstChars@39-6'::get_CheckClose .method public strict virtual instance char get_LastGenerated() cil managed @@ -1465,9 +1465,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld char Linq101SetOperators01/customerFirstChars@39::current + IL_0001: ldfld char Linq101SetOperators01/'customerFirstChars@39-6'::current IL_0006: ret - } // end of method customerFirstChars@39::get_LastGenerated + } // end of method 'customerFirstChars@39-6'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1479,20 +1479,20 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101SetOperators01/customerFirstChars@39::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - char) + IL_0003: newobj instance void Linq101SetOperators01/'customerFirstChars@39-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + char) IL_0008: ret - } // end of method customerFirstChars@39::GetFreshEnumerator + } // end of method 'customerFirstChars@39-6'::GetFreshEnumerator - } // end of class customerFirstChars@39 + } // end of class 'customerFirstChars@39-6' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_factorsOf300() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'factorsOf300@9-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'factorsOf300@9-14' IL_0005: ret } // end of method Linq101SetOperators01::get_factorsOf300 @@ -1501,7 +1501,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'uniqueFactors@11-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'uniqueFactors@11-14' IL_0005: ret } // end of method Linq101SetOperators01::get_uniqueFactors @@ -1510,7 +1510,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'products@18-14' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'products@18-68' IL_0005: ret } // end of method Linq101SetOperators01::get_products @@ -1519,7 +1519,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::categoryNames@20 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'categoryNames@20-6' IL_0005: ret } // end of method Linq101SetOperators01::get_categoryNames @@ -1528,7 +1528,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'customers@28-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'customers@28-36' IL_0005: ret } // end of method Linq101SetOperators01::get_customers @@ -1537,7 +1537,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::productFirstChars@30 + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::'productFirstChars@30-6' IL_0005: ret } // end of method Linq101SetOperators01::get_productFirstChars @@ -1546,7 +1546,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::customerFirstChars@36 + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::'customerFirstChars@36-6' IL_0005: ret } // end of method Linq101SetOperators01::get_customerFirstChars @@ -1597,19 +1597,19 @@ .class private abstract auto ansi sealed ''.$Linq101SetOperators01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'factorsOf300@9-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'factorsOf300@9-14' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'uniqueFactors@11-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'uniqueFactors@11-14' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@18-14' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@18-68' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 categoryNames@20 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'categoryNames@20-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@28-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@28-36' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 productFirstChars@30 + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'productFirstChars@30-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 customerFirstChars@36 + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'customerFirstChars@36-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1649,7 +1649,7 @@ IL_001e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0023: dup - IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'factorsOf300@9-2' + IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'factorsOf300@9-14' IL_0029: stloc.0 .line 11,15 : 1,20 '' IL_002a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1658,7 +1658,7 @@ IL_0033: ldnull IL_0034: ldc.i4.0 IL_0035: ldc.i4.0 - IL_0036: newobj instance void Linq101SetOperators01/'uniqueFactors@13-1'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + IL_0036: newobj instance void Linq101SetOperators01/'uniqueFactors@13-7'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, int32, int32) IL_003b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) @@ -1666,12 +1666,12 @@ IL_0045: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_004a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_004f: dup - IL_0050: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'uniqueFactors@11-2' + IL_0050: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'uniqueFactors@11-14' IL_0055: stloc.1 .line 18,18 : 1,32 '' IL_0056: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_005b: dup - IL_005c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'products@18-14' + IL_005c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'products@18-68' IL_0061: stloc.2 .line 20,25 : 1,20 '' IL_0062: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1680,42 +1680,42 @@ IL_006b: ldnull IL_006c: ldc.i4.0 IL_006d: ldnull - IL_006e: newobj instance void Linq101SetOperators01/categoryNames@23::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_006e: newobj instance void Linq101SetOperators01/'categoryNames@23-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0073: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0078: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Distinct(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_007d: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0082: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0087: dup - IL_0088: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::categoryNames@20 + IL_0088: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'categoryNames@20-6' IL_008d: stloc.3 .line 28,28 : 1,34 '' IL_008e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_0093: dup - IL_0094: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'customers@28-6' + IL_0094: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'customers@28-36' IL_0099: stloc.s customers IL_009b: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00a0: stloc.s V_9 IL_00a2: ldnull IL_00a3: ldc.i4.0 IL_00a4: ldc.i4.0 - IL_00a5: newobj instance void Linq101SetOperators01/productFirstChars@33::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - char) + IL_00a5: newobj instance void Linq101SetOperators01/'productFirstChars@33-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + char) IL_00aa: dup - IL_00ab: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::productFirstChars@30 + IL_00ab: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::'productFirstChars@30-6' IL_00b0: stloc.s productFirstChars IL_00b2: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00b7: stloc.s V_10 IL_00b9: ldnull IL_00ba: ldc.i4.0 IL_00bb: ldc.i4.0 - IL_00bc: newobj instance void Linq101SetOperators01/customerFirstChars@39::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - char) + IL_00bc: newobj instance void Linq101SetOperators01/'customerFirstChars@39-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + char) IL_00c1: dup - IL_00c2: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::customerFirstChars@36 + IL_00c2: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::'customerFirstChars@36-6' IL_00c7: stloc.s customerFirstChars IL_00c9: ret } // end of method $Linq101SetOperators01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl index 040b644cf17..a1d3c038c80 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl @@ -54,7 +54,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A70000 +// Image base: 0x00CD0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@14-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@14-21' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'lowNums@14-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'lowNums@14-21'::builder@ IL_000d: ret - } // end of method 'lowNums@14-3'::.ctor + } // end of method 'lowNums@14-21'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(int32 _arg1) cil managed @@ -97,16 +97,16 @@ IL_0001: stloc.0 .line 15,15 : 9,22 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'lowNums@14-3'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'lowNums@14-21'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'lowNums@14-3'::Invoke + } // end of method 'lowNums@14-21'::Invoke - } // end of class 'lowNums@14-3' + } // end of class 'lowNums@14-21' - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@15-4' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@15-22' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -119,7 +119,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'lowNums@15-4'::.ctor + } // end of method 'lowNums@15-22'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -131,11 +131,11 @@ IL_0001: ldc.i4.5 IL_0002: clt IL_0004: ret - } // end of method 'lowNums@15-4'::Invoke + } // end of method 'lowNums@15-22'::Invoke - } // end of class 'lowNums@15-4' + } // end of class 'lowNums@15-22' - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@16-5' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@16-23' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -148,7 +148,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'lowNums@16-5'::.ctor + } // end of method 'lowNums@16-23'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -158,11 +158,11 @@ .line 16,16 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'lowNums@16-5'::Invoke + } // end of method 'lowNums@16-23'::Invoke - } // end of class 'lowNums@16-5' + } // end of class 'lowNums@16-23' - .class auto ansi serializable sealed nested assembly beforefieldinit soldOutProducts@24 + .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@24-9' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -180,9 +180,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/soldOutProducts@24::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'soldOutProducts@24-9'::builder@ IL_000d: ret - } // end of method soldOutProducts@24::.ctor + } // end of method 'soldOutProducts@24-9'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -195,16 +195,16 @@ IL_0001: stloc.0 .line 25,25 : 9,35 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/soldOutProducts@24::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'soldOutProducts@24-9'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method soldOutProducts@24::Invoke + } // end of method 'soldOutProducts@24-9'::Invoke - } // end of class soldOutProducts@24 + } // end of class 'soldOutProducts@24-9' - .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@25-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@25-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -217,7 +217,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'soldOutProducts@25-1'::.ctor + } // end of method 'soldOutProducts@25-10'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product p) cil managed @@ -230,11 +230,11 @@ IL_0006: ldc.i4.0 IL_0007: ceq IL_0009: ret - } // end of method 'soldOutProducts@25-1'::Invoke + } // end of method 'soldOutProducts@25-10'::Invoke - } // end of class 'soldOutProducts@25-1' + } // end of class 'soldOutProducts@25-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@26-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@26-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -247,7 +247,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'soldOutProducts@26-2'::.ctor + } // end of method 'soldOutProducts@26-11'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -257,11 +257,11 @@ .line 26,26 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'soldOutProducts@26-2'::Invoke + } // end of method 'soldOutProducts@26-11'::Invoke - } // end of class 'soldOutProducts@26-2' + } // end of class 'soldOutProducts@26-11' - .class auto ansi serializable sealed nested assembly beforefieldinit expensiveInStockProducts@32 + .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@32-9' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -279,9 +279,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/expensiveInStockProducts@32::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'expensiveInStockProducts@32-9'::builder@ IL_000d: ret - } // end of method expensiveInStockProducts@32::.ctor + } // end of method 'expensiveInStockProducts@32-9'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -294,16 +294,16 @@ IL_0001: stloc.0 .line 33,33 : 9,58 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/expensiveInStockProducts@32::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'expensiveInStockProducts@32-9'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method expensiveInStockProducts@32::Invoke + } // end of method 'expensiveInStockProducts@32-9'::Invoke - } // end of class expensiveInStockProducts@32 + } // end of class 'expensiveInStockProducts@32-9' - .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@33-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@33-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -316,7 +316,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'expensiveInStockProducts@33-1'::.ctor + } // end of method 'expensiveInStockProducts@33-10'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product p) cil managed @@ -353,11 +353,11 @@ .line 100001,100001 : 0,0 '' IL_0027: ldc.i4.0 IL_0028: ret - } // end of method 'expensiveInStockProducts@33-1'::Invoke + } // end of method 'expensiveInStockProducts@33-10'::Invoke - } // end of class 'expensiveInStockProducts@33-1' + } // end of class 'expensiveInStockProducts@33-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@34-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@34-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -370,7 +370,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'expensiveInStockProducts@34-2'::.ctor + } // end of method 'expensiveInStockProducts@34-11'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -380,11 +380,11 @@ .line 34,34 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'expensiveInStockProducts@34-2'::Invoke + } // end of method 'expensiveInStockProducts@34-11'::Invoke - } // end of class 'expensiveInStockProducts@34-2' + } // end of class 'expensiveInStockProducts@34-11' - .class auto ansi serializable sealed nested assembly beforefieldinit waCustomers@42 + .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@42-9' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -402,9 +402,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/waCustomers@42::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'waCustomers@42-9'::builder@ IL_000d: ret - } // end of method waCustomers@42::.ctor + } // end of method 'waCustomers@42-9'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -417,16 +417,16 @@ IL_0001: stloc.0 .line 43,43 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/waCustomers@42::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'waCustomers@42-9'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method waCustomers@42::Invoke + } // end of method 'waCustomers@42-9'::Invoke - } // end of class waCustomers@42 + } // end of class 'waCustomers@42-9' - .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@43-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@43-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -439,7 +439,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'waCustomers@43-1'::.ctor + } // end of method 'waCustomers@43-10'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Customer c) cil managed @@ -453,11 +453,11 @@ IL_000b: call bool [mscorlib]System.String::Equals(string, string) IL_0010: ret - } // end of method 'waCustomers@43-1'::Invoke + } // end of method 'waCustomers@43-10'::Invoke - } // end of class 'waCustomers@43-1' + } // end of class 'waCustomers@43-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@44-2' + .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@44-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -470,7 +470,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'waCustomers@44-2'::.ctor + } // end of method 'waCustomers@44-11'::.ctor .method public strict virtual instance class [Utils]Utils/Customer Invoke(class [Utils]Utils/Customer c) cil managed @@ -480,11 +480,11 @@ .line 44,44 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'waCustomers@44-2'::Invoke + } // end of method 'waCustomers@44-11'::Invoke - } // end of class 'waCustomers@44-2' + } // end of class 'waCustomers@44-11' - .class auto ansi serializable sealed nested assembly beforefieldinit shortDigits@55 + .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@55-12' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1> { .method assembly specialname rtspecialname @@ -497,7 +497,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1>::.ctor() IL_0006: ret - } // end of method shortDigits@55::.ctor + } // end of method 'shortDigits@55-12'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1 x) cil managed @@ -509,11 +509,11 @@ IL_0001: tail. IL_0003: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::Identity>(!!0) IL_0008: ret - } // end of method shortDigits@55::Invoke + } // end of method 'shortDigits@55-12'::Invoke - } // end of class shortDigits@55 + } // end of class 'shortDigits@55-12' - .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@54-1' + .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@54-13' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3> { .method assembly specialname rtspecialname @@ -526,7 +526,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3>::.ctor() IL_0006: ret - } // end of method 'shortDigits@54-1'::.ctor + } // end of method 'shortDigits@54-13'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1 Invoke(int32 i, @@ -552,11 +552,11 @@ .line 54,54 : 63,67 '' IL_0014: ldnull IL_0015: ret - } // end of method 'shortDigits@54-1'::Invoke + } // end of method 'shortDigits@54-13'::Invoke - } // end of class 'shortDigits@54-1' + } // end of class 'shortDigits@54-13' - .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@51-3' + .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@51-15' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -569,7 +569,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'shortDigits@51-3'::.ctor + } // end of method 'shortDigits@51-15'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(string _arg1) cil managed @@ -585,11 +585,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'shortDigits@51-3'::Invoke + } // end of method 'shortDigits@51-15'::Invoke - } // end of class 'shortDigits@51-3' + } // end of class 'shortDigits@51-15' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'shortDigits@52-2' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'shortDigits@52-14' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -614,17 +614,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_0009: stfld int32 Linq101Where01/'shortDigits@52-14'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Where01/'shortDigits@52-2'::current + IL_0010: stfld string Linq101Where01/'shortDigits@52-14'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'shortDigits@52-2'::.ctor + } // end of method 'shortDigits@52-14'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -634,7 +634,7 @@ .locals init ([0] string d) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-14'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -665,32 +665,32 @@ IL_002a: nop .line 52,52 : 9,17 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101Where01/'shortDigits@51-3'::.ctor() + IL_002c: newobj instance void Linq101Where01/'shortDigits@51-15'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_digits() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,string>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_0047: stfld int32 Linq101Where01/'shortDigits@52-14'::pc .line 52,52 : 9,17 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_0078 IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_0067: stfld int32 Linq101Where01/'shortDigits@52-14'::pc .line 52,52 : 16,17 '' IL_006c: ldarg.0 IL_006d: ldloc.0 - IL_006e: stfld string Linq101Where01/'shortDigits@52-2'::current + IL_006e: stfld string Linq101Where01/'shortDigits@52-14'::current IL_0073: ldc.i4.1 IL_0074: ret @@ -700,24 +700,24 @@ IL_0078: ldarg.0 IL_0079: ldc.i4.3 - IL_007a: stfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_007a: stfld int32 Linq101Where01/'shortDigits@52-14'::pc .line 52,52 : 9,17 '' IL_007f: ldarg.0 - IL_0080: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' + IL_0080: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' IL_0085: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_008a: nop IL_008b: ldarg.0 IL_008c: ldnull - IL_008d: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' + IL_008d: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' IL_0092: ldarg.0 IL_0093: ldc.i4.3 - IL_0094: stfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_0094: stfld int32 Linq101Where01/'shortDigits@52-14'::pc IL_0099: ldarg.0 IL_009a: ldnull - IL_009b: stfld string Linq101Where01/'shortDigits@52-2'::current + IL_009b: stfld string Linq101Where01/'shortDigits@52-14'::current IL_00a0: ldc.i4.0 IL_00a1: ret - } // end of method 'shortDigits@52-2'::GenerateNext + } // end of method 'shortDigits@52-14'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -729,7 +729,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-14'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -745,7 +745,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_001b: ldfld int32 Linq101Where01/'shortDigits@52-14'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -783,19 +783,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_004f: stfld int32 Linq101Where01/'shortDigits@52-14'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_0063: stfld int32 Linq101Where01/'shortDigits@52-14'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Where01/'shortDigits@52-2'::current + IL_006a: stfld string Linq101Where01/'shortDigits@52-14'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -835,7 +835,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'shortDigits@52-2'::Close + } // end of method 'shortDigits@52-14'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -844,7 +844,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-2'::pc + IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-14'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -886,7 +886,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'shortDigits@52-2'::get_CheckClose + } // end of method 'shortDigits@52-14'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -896,9 +896,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Where01/'shortDigits@52-2'::current + IL_0001: ldfld string Linq101Where01/'shortDigits@52-14'::current IL_0006: ret - } // end of method 'shortDigits@52-2'::get_LastGenerated + } // end of method 'shortDigits@52-14'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -910,20 +910,20 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Where01/'shortDigits@52-2'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Where01/'shortDigits@52-14'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'shortDigits@52-2'::GetFreshEnumerator + } // end of method 'shortDigits@52-14'::GetFreshEnumerator - } // end of class 'shortDigits@52-2' + } // end of class 'shortDigits@52-14' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_numbers() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'numbers@9-11' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'numbers@9-50' IL_0005: ret } // end of method Linq101Where01::get_numbers @@ -932,7 +932,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'lowNums@12-2' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'lowNums@12-14' IL_0005: ret } // end of method Linq101Where01::get_lowNums @@ -941,7 +941,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'products@20-16' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'products@20-70' IL_0005: ret } // end of method Linq101Where01::get_products @@ -950,7 +950,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::soldOutProducts@22 + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'soldOutProducts@22-6' IL_0005: ret } // end of method Linq101Where01::get_soldOutProducts @@ -959,7 +959,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::expensiveInStockProducts@30 + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'expensiveInStockProducts@30-6' IL_0005: ret } // end of method Linq101Where01::get_expensiveInStockProducts @@ -968,7 +968,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'customers@38-8' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'customers@38-38' IL_0005: ret } // end of method Linq101Where01::get_customers @@ -977,7 +977,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Customer[] ''.$Linq101Where01::waCustomers@40 + IL_0000: ldsfld class [Utils]Utils/Customer[] ''.$Linq101Where01::'waCustomers@40-6' IL_0005: ret } // end of method Linq101Where01::get_waCustomers @@ -986,7 +986,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'digits@48-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'digits@48-30' IL_0005: ret } // end of method Linq101Where01::get_digits @@ -995,7 +995,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::shortDigits@49 + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'shortDigits@49-6' IL_0005: ret } // end of method Linq101Where01::get_shortDigits @@ -1058,23 +1058,23 @@ .class private abstract auto ansi sealed ''.$Linq101Where01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@9-11' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@9-50' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'lowNums@12-2' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'lowNums@12-14' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@20-16' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@20-70' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 soldOutProducts@22 + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'soldOutProducts@22-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 expensiveInStockProducts@30 + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'expensiveInStockProducts@30-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@38-8' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@38-38' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Customer[] waCustomers@40 + .field static assembly class [Utils]Utils/Customer[] 'waCustomers@40-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@48-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@48-30' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 shortDigits@49 + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'shortDigits@49-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1132,7 +1132,7 @@ IL_003d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0042: dup - IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'numbers@9-11' + IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'numbers@9-50' IL_0048: stloc.0 .line 12,17 : 1,20 '' IL_0049: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1144,24 +1144,24 @@ IL_0058: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_numbers() IL_005d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0062: ldloc.s V_9 - IL_0064: newobj instance void Linq101Where01/'lowNums@14-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0064: newobj instance void Linq101Where01/'lowNums@14-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0069: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_006e: newobj instance void Linq101Where01/'lowNums@15-4'::.ctor() + IL_006e: newobj instance void Linq101Where01/'lowNums@15-22'::.ctor() IL_0073: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0078: newobj instance void Linq101Where01/'lowNums@16-5'::.ctor() + IL_0078: newobj instance void Linq101Where01/'lowNums@16-23'::.ctor() IL_007d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0082: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0087: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.ListModule::OfSeq(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_008c: dup - IL_008d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'lowNums@12-2' + IL_008d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'lowNums@12-14' IL_0092: stloc.1 .line 20,20 : 1,32 '' IL_0093: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0098: dup - IL_0099: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'products@20-16' + IL_0099: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'products@20-70' IL_009e: stloc.2 IL_009f: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00a4: stloc.s V_10 @@ -1172,18 +1172,18 @@ IL_00ae: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_products() IL_00b3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00b8: ldloc.s V_10 - IL_00ba: newobj instance void Linq101Where01/soldOutProducts@24::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00ba: newobj instance void Linq101Where01/'soldOutProducts@24-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00bf: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00c4: newobj instance void Linq101Where01/'soldOutProducts@25-1'::.ctor() + IL_00c4: newobj instance void Linq101Where01/'soldOutProducts@25-10'::.ctor() IL_00c9: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_00ce: newobj instance void Linq101Where01/'soldOutProducts@26-2'::.ctor() + IL_00ce: newobj instance void Linq101Where01/'soldOutProducts@26-11'::.ctor() IL_00d3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00d8: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_00dd: dup - IL_00de: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::soldOutProducts@22 + IL_00de: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'soldOutProducts@22-6' IL_00e3: stloc.3 IL_00e4: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00e9: stloc.s V_11 @@ -1194,23 +1194,23 @@ IL_00f3: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_products() IL_00f8: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00fd: ldloc.s V_11 - IL_00ff: newobj instance void Linq101Where01/expensiveInStockProducts@32::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00ff: newobj instance void Linq101Where01/'expensiveInStockProducts@32-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0104: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0109: newobj instance void Linq101Where01/'expensiveInStockProducts@33-1'::.ctor() + IL_0109: newobj instance void Linq101Where01/'expensiveInStockProducts@33-10'::.ctor() IL_010e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0113: newobj instance void Linq101Where01/'expensiveInStockProducts@34-2'::.ctor() + IL_0113: newobj instance void Linq101Where01/'expensiveInStockProducts@34-11'::.ctor() IL_0118: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_011d: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0122: dup - IL_0123: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::expensiveInStockProducts@30 + IL_0123: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'expensiveInStockProducts@30-6' IL_0128: stloc.s expensiveInStockProducts .line 38,38 : 1,34 '' IL_012a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_012f: dup - IL_0130: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'customers@38-8' + IL_0130: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'customers@38-38' IL_0135: stloc.s customers .line 40,45 : 1,21 '' IL_0137: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1222,19 +1222,19 @@ IL_0146: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_customers() IL_014b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0150: ldloc.s V_12 - IL_0152: newobj instance void Linq101Where01/waCustomers@42::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0152: newobj instance void Linq101Where01/'waCustomers@42-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0157: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_015c: newobj instance void Linq101Where01/'waCustomers@43-1'::.ctor() + IL_015c: newobj instance void Linq101Where01/'waCustomers@43-10'::.ctor() IL_0161: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0166: newobj instance void Linq101Where01/'waCustomers@44-2'::.ctor() + IL_0166: newobj instance void Linq101Where01/'waCustomers@44-11'::.ctor() IL_016b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0170: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0175: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_017a: dup - IL_017b: stsfld class [Utils]Utils/Customer[] ''.$Linq101Where01::waCustomers@40 + IL_017b: stsfld class [Utils]Utils/Customer[] ''.$Linq101Where01::'waCustomers@40-6' IL_0180: stloc.s waCustomers .line 48,48 : 1,96 '' IL_0182: ldstr "zero" @@ -1269,25 +1269,25 @@ IL_01e6: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_01eb: dup - IL_01ec: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'digits@48-6' + IL_01ec: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'digits@48-30' IL_01f1: stloc.s digits .line 49,55 : 1,21 '' - IL_01f3: newobj instance void Linq101Where01/shortDigits@55::.ctor() - IL_01f8: newobj instance void Linq101Where01/'shortDigits@54-1'::.ctor() + IL_01f3: newobj instance void Linq101Where01/'shortDigits@55-12'::.ctor() + IL_01f8: newobj instance void Linq101Where01/'shortDigits@54-13'::.ctor() IL_01fd: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0202: stloc.s V_13 IL_0204: ldnull IL_0205: ldc.i4.0 IL_0206: ldnull - IL_0207: newobj instance void Linq101Where01/'shortDigits@52-2'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0207: newobj instance void Linq101Where01/'shortDigits@52-14'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_020c: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::MapIndexed>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0211: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Choose,string>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0216: dup - IL_0217: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::shortDigits@49 + IL_0217: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'shortDigits@49-6' IL_021c: stloc.s shortDigits IL_021e: ret } // end of method $Linq101Where01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl index 471ba037081..71ce10879f9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018E0000 +// Image base: 0x01200000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname f0@6 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f0@6-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -83,14 +83,14 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc + IL_0002: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::current + IL_0009: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::current IL_000e: ldarg.0 IL_000f: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0014: ret - } // end of method f0@6::.ctor + } // end of method 'f0@6-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -100,7 +100,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest1.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -124,23 +124,23 @@ IL_0021: nop IL_0022: ldarg.0 IL_0023: ldc.i4.1 - IL_0024: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc + IL_0024: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc .line 6,6 : 15,22 '' IL_0029: ldarg.0 IL_002a: ldc.i4.1 - IL_002b: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::current + IL_002b: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::current IL_0030: ldc.i4.1 IL_0031: ret IL_0032: ldarg.0 IL_0033: ldc.i4.2 - IL_0034: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc + IL_0034: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc IL_0039: ldarg.0 IL_003a: ldc.i4.0 - IL_003b: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::current + IL_003b: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::current IL_0040: ldc.i4.0 IL_0041: ret - } // end of method f0@6::GenerateNext + } // end of method 'f0@6-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -149,9 +149,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.2 - IL_0002: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc + IL_0002: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc IL_0007: ret - } // end of method f0@6::Close + } // end of method 'f0@6-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -160,7 +160,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc IL_0006: switch ( IL_0019, IL_001b, @@ -192,7 +192,7 @@ IL_002b: ldc.i4.0 IL_002c: ret - } // end of method f0@6::get_CheckClose + } // end of method 'f0@6-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -202,9 +202,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::current + IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::current IL_0006: ret - } // end of method f0@6::get_LastGenerated + } // end of method 'f0@6-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -215,12 +215,12 @@ .maxstack 8 IL_0000: ldc.i4.0 IL_0001: ldc.i4.0 - IL_0002: newobj instance void SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::.ctor(int32, - int32) + IL_0002: newobj instance void SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::.ctor(int32, + int32) IL_0007: ret - } // end of method f0@6::GetFreshEnumerator + } // end of method 'f0@6-3'::GetFreshEnumerator - } // end of class f0@6 + } // end of class 'f0@6-3' .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1 f0() cil managed @@ -230,8 +230,8 @@ .line 6,6 : 9,24 '' IL_0000: ldc.i4.0 IL_0001: ldc.i4.0 - IL_0002: newobj instance void SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::.ctor(int32, - int32) + IL_0002: newobj instance void SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::.ctor(int32, + int32) IL_0007: ret } // end of method SeqExpressionSteppingTest1::f0 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl index 938d07b4561..04070696eb0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02EB0000 +// Image base: 0x00A90000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname f1@5 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f1@5-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -83,14 +83,14 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc + IL_0002: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current + IL_0009: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current IL_000e: ldarg.0 IL_000f: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0014: ret - } // end of method f1@5::.ctor + } // end of method 'f1@5-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -100,7 +100,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest2.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -136,11 +136,11 @@ IL_003a: pop IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc + IL_003d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc .line 6,6 : 15,22 '' IL_0042: ldarg.0 IL_0043: ldc.i4.1 - IL_0044: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current + IL_0044: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current IL_0049: ldc.i4.1 IL_004a: ret @@ -151,23 +151,23 @@ IL_005a: pop IL_005b: ldarg.0 IL_005c: ldc.i4.2 - IL_005d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc + IL_005d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc .line 8,8 : 15,22 '' IL_0062: ldarg.0 IL_0063: ldc.i4.2 - IL_0064: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current + IL_0064: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current IL_0069: ldc.i4.1 IL_006a: ret IL_006b: ldarg.0 IL_006c: ldc.i4.3 - IL_006d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc + IL_006d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc IL_0072: ldarg.0 IL_0073: ldc.i4.0 - IL_0074: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current + IL_0074: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current IL_0079: ldc.i4.0 IL_007a: ret - } // end of method f1@5::GenerateNext + } // end of method 'f1@5-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -176,9 +176,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.3 - IL_0002: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc + IL_0002: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc IL_0007: ret - } // end of method f1@5::Close + } // end of method 'f1@5-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -187,7 +187,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -229,7 +229,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method f1@5::get_CheckClose + } // end of method 'f1@5-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -239,9 +239,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current + IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current IL_0006: ret - } // end of method f1@5::get_LastGenerated + } // end of method 'f1@5-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -252,12 +252,12 @@ .maxstack 8 IL_0000: ldc.i4.0 IL_0001: ldc.i4.0 - IL_0002: newobj instance void SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::.ctor(int32, - int32) + IL_0002: newobj instance void SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::.ctor(int32, + int32) IL_0007: ret - } // end of method f1@5::GetFreshEnumerator + } // end of method 'f1@5-3'::GetFreshEnumerator - } // end of class f1@5 + } // end of class 'f1@5-3' .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1 f1() cil managed @@ -267,8 +267,8 @@ .line 5,8 : 9,24 '' IL_0000: ldc.i4.0 IL_0001: ldc.i4.0 - IL_0002: newobj instance void SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::.ctor(int32, - int32) + IL_0002: newobj instance void SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::.ctor(int32, + int32) IL_0007: ret } // end of method SeqExpressionSteppingTest2::f1 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl index 23014de1c4b..17e65e7d61a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01900000 +// Image base: 0x01150000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname f2@6 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f2@6-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1> { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -85,17 +85,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x + IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc + IL_0009: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::current + IL_0010: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1>::.ctor() IL_001b: ret - } // end of method f2@6::.ctor + } // end of method 'f2@6-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1>& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest3.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -129,14 +129,14 @@ IL_0021: nop .line 6,6 : 21,27 '' IL_0022: ldarg.0 - IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x + IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x IL_0028: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_002d: ldc.i4.4 IL_002e: bge.s IL_0064 .line 7,7 : 18,24 '' IL_0030: ldarg.0 - IL_0031: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x + IL_0031: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x IL_0036: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_003b: nop .line 8,8 : 18,33 '' @@ -146,12 +146,12 @@ IL_004b: pop IL_004c: ldarg.0 IL_004d: ldc.i4.1 - IL_004e: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc + IL_004e: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc .line 9,9 : 18,25 '' IL_0053: ldarg.0 IL_0054: ldarg.0 - IL_0055: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x - IL_005a: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::current + IL_0055: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x + IL_005a: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::current IL_005f: ldc.i4.1 IL_0060: ret @@ -161,13 +161,13 @@ IL_0064: ldarg.0 IL_0065: ldc.i4.2 - IL_0066: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc + IL_0066: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc IL_006b: ldarg.0 IL_006c: ldnull - IL_006d: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::current + IL_006d: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::current IL_0072: ldc.i4.0 IL_0073: ret - } // end of method f2@6::GenerateNext + } // end of method 'f2@6-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -176,9 +176,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.2 - IL_0002: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc + IL_0002: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc IL_0007: ret - } // end of method f2@6::Close + } // end of method 'f2@6-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -187,7 +187,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc IL_0006: switch ( IL_0019, IL_001b, @@ -219,7 +219,7 @@ IL_002b: ldc.i4.0 IL_002c: ret - } // end of method f2@6::get_CheckClose + } // end of method 'f2@6-3'::get_CheckClose .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 get_LastGenerated() cil managed @@ -229,9 +229,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::current + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::current IL_0006: ret - } // end of method f2@6::get_LastGenerated + } // end of method 'f2@6-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1> GetFreshEnumerator() cil managed @@ -241,16 +241,16 @@ // Code size 14 (0xe) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x IL_0006: ldc.i4.0 IL_0007: ldnull - IL_0008: newobj instance void SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0008: newobj instance void SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000d: ret - } // end of method f2@6::GetFreshEnumerator + } // end of method 'f2@6-3'::GetFreshEnumerator - } // end of class f2@6 + } // end of class 'f2@6-3' .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1> f2() cil managed @@ -266,9 +266,9 @@ IL_0007: ldloc.0 IL_0008: ldc.i4.0 IL_0009: ldnull - IL_000a: newobj instance void SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_000a: newobj instance void SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000f: ret } // end of method SeqExpressionSteppingTest3::f2 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl index 940d987fddf..1c0464c3307 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02510000 +// Image base: 0x00210000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname f3@5 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f3@5-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -87,20 +87,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x + IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y + IL_0009: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc + IL_0010: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current + IL_0018: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method f3@5::.ctor + } // end of method 'f3@5-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -111,7 +111,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest4.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -144,69 +144,69 @@ IL_002e: ldarg.0 IL_002f: ldc.i4.0 IL_0030: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) - IL_0035: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x + IL_0035: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x .line 6,6 : 15,21 '' IL_003a: ldarg.0 - IL_003b: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x + IL_003b: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x IL_0040: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0045: nop .line 7,7 : 15,28 '' IL_0046: ldarg.0 IL_0047: ldc.i4.0 IL_0048: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) - IL_004d: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y + IL_004d: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y .line 8,8 : 15,21 '' IL_0052: ldarg.0 - IL_0053: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y + IL_0053: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y IL_0058: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_005d: nop IL_005e: ldarg.0 IL_005f: ldc.i4.1 - IL_0060: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc + IL_0060: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc .line 9,9 : 15,23 '' IL_0065: ldarg.0 IL_0066: ldarg.0 - IL_0067: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x + IL_0067: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x IL_006c: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) - IL_0071: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current + IL_0071: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current IL_0076: ldc.i4.1 IL_0077: ret .line 10,10 : 15,30 '' IL_0078: ldarg.0 - IL_0079: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x + IL_0079: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x IL_007e: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0083: ldarg.0 - IL_0084: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y + IL_0084: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y IL_0089: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_008e: add IL_008f: stloc.0 IL_0090: ldarg.0 IL_0091: ldc.i4.2 - IL_0092: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc + IL_0092: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc .line 11,11 : 15,22 '' IL_0097: ldarg.0 IL_0098: ldloc.0 - IL_0099: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current + IL_0099: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current IL_009e: ldc.i4.1 IL_009f: ret .line 7,7 : 19,20 '' IL_00a0: ldarg.0 IL_00a1: ldnull - IL_00a2: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y + IL_00a2: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y IL_00a7: ldarg.0 IL_00a8: ldnull - IL_00a9: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x + IL_00a9: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x IL_00ae: ldarg.0 IL_00af: ldc.i4.3 - IL_00b0: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc + IL_00b0: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc IL_00b5: ldarg.0 IL_00b6: ldc.i4.0 - IL_00b7: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current + IL_00b7: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current IL_00bc: ldc.i4.0 IL_00bd: ret - } // end of method f3@5::GenerateNext + } // end of method 'f3@5-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -215,9 +215,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.3 - IL_0002: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc + IL_0002: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc IL_0007: ret - } // end of method f3@5::Close + } // end of method 'f3@5-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -226,7 +226,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -268,7 +268,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method f3@5::get_CheckClose + } // end of method 'f3@5-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -278,9 +278,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current + IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current IL_0006: ret - } // end of method f3@5::get_LastGenerated + } // end of method 'f3@5-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -293,14 +293,14 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + int32) IL_0009: ret - } // end of method f3@5::GetFreshEnumerator + } // end of method 'f3@5-3'::GetFreshEnumerator - } // end of class f3@5 + } // end of class 'f3@5-3' .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1 f3() cil managed @@ -312,10 +312,10 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + int32) IL_0009: ret } // end of method SeqExpressionSteppingTest4::f3 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl index 6dfb1b94512..e19cdaddb31 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F20000 +// Image base: 0x00B50000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname f4@5 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f4@5-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -87,20 +87,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x + IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y + IL_0009: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_0010: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current + IL_0018: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method f4@5::.ctor + } // end of method 'f4@5-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -111,7 +111,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest5.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -151,60 +151,60 @@ IL_003a: ldarg.0 IL_003b: ldc.i4.0 IL_003c: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) - IL_0041: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x + IL_0041: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x IL_0046: ldarg.0 IL_0047: ldc.i4.1 - IL_0048: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_0048: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc .line 7,7 : 19,32 '' IL_004d: ldarg.0 IL_004e: ldc.i4.0 IL_004f: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) - IL_0054: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y + IL_0054: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y .line 8,8 : 19,25 '' IL_0059: ldarg.0 - IL_005a: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y + IL_005a: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y IL_005f: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0064: nop IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_0067: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc .line 9,9 : 19,27 '' IL_006c: ldarg.0 IL_006d: ldarg.0 - IL_006e: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x + IL_006e: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x IL_0073: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) - IL_0078: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current + IL_0078: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current IL_007d: ldc.i4.1 IL_007e: ret .line 10,10 : 19,34 '' IL_007f: ldarg.0 - IL_0080: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x + IL_0080: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x IL_0085: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_008a: ldarg.0 - IL_008b: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y + IL_008b: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y IL_0090: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0095: add IL_0096: stloc.0 IL_0097: ldarg.0 IL_0098: ldc.i4.3 - IL_0099: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_0099: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc .line 11,11 : 19,26 '' IL_009e: ldarg.0 IL_009f: ldloc.0 - IL_00a0: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current + IL_00a0: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current IL_00a5: ldc.i4.1 IL_00a6: ret IL_00a7: ldarg.0 IL_00a8: ldnull - IL_00a9: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y + IL_00a9: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y IL_00ae: ldarg.0 IL_00af: ldc.i4.4 - IL_00b0: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_00b0: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc .line 13,13 : 18,24 '' IL_00b5: ldarg.0 - IL_00b6: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x + IL_00b6: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x IL_00bb: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_00c0: nop .line 14,14 : 18,32 '' @@ -214,16 +214,16 @@ IL_00d0: pop IL_00d1: ldarg.0 IL_00d2: ldnull - IL_00d3: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x + IL_00d3: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x IL_00d8: ldarg.0 IL_00d9: ldc.i4.4 - IL_00da: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_00da: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc IL_00df: ldarg.0 IL_00e0: ldc.i4.0 - IL_00e1: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current + IL_00e1: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current IL_00e6: ldc.i4.0 IL_00e7: ret - } // end of method f4@5::GenerateNext + } // end of method 'f4@5-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -235,7 +235,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc IL_0006: ldc.i4.4 IL_0007: sub IL_0008: switch ( @@ -251,7 +251,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_001b: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc IL_0020: switch ( IL_003b, IL_003d, @@ -300,10 +300,10 @@ IL_0058: nop IL_0059: ldarg.0 IL_005a: ldc.i4.4 - IL_005b: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_005b: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc .line 13,13 : 18,24 '' IL_0060: ldarg.0 - IL_0061: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x + IL_0061: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x IL_0066: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_006b: nop .line 14,14 : 18,32 '' @@ -315,10 +315,10 @@ IL_007c: nop IL_007d: ldarg.0 IL_007e: ldc.i4.4 - IL_007f: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_007f: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc IL_0084: ldarg.0 IL_0085: ldc.i4.0 - IL_0086: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current + IL_0086: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current IL_008b: ldnull IL_008c: stloc.1 IL_008d: leave.s IL_009b @@ -358,7 +358,7 @@ .line 100001,100001 : 0,0 '' IL_00af: ret - } // end of method f4@5::Close + } // end of method 'f4@5-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -367,7 +367,7 @@ .maxstack 5 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc IL_0006: switch ( IL_0021, IL_0023, @@ -419,7 +419,7 @@ IL_0041: ldc.i4.0 IL_0042: ret - } // end of method f4@5::get_CheckClose + } // end of method 'f4@5-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -429,9 +429,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current + IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current IL_0006: ret - } // end of method f4@5::get_LastGenerated + } // end of method 'f4@5-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -444,14 +444,14 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + int32) IL_0009: ret - } // end of method f4@5::GetFreshEnumerator + } // end of method 'f4@5-3'::GetFreshEnumerator - } // end of class f4@5 + } // end of class 'f4@5-3' .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1 f4() cil managed @@ -463,10 +463,10 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + int32) IL_0009: ret } // end of method SeqExpressionSteppingTest5::f4 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl index 7e83b9080ae..db58fbe634b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03080000 +// Image base: 0x02480000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname f7@6 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f7@6-3' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -93,20 +93,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0010: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current + IL_0018: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method f7@6::.ctor + } // end of method 'f7@6-3'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -118,7 +118,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest6.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -165,18 +165,18 @@ IL_0046: ldarg.0 IL_0047: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6::get_es() IL_004c: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0051: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' + IL_0051: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' IL_0056: ldarg.0 IL_0057: ldc.i4.1 - IL_0058: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0058: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc .line 6,8 : 15,25 '' IL_005d: ldarg.0 - IL_005e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' + IL_005e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' IL_0063: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0068: brfalse.s IL_0099 IL_006a: ldarg.0 - IL_006b: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' + IL_006b: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' IL_0070: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0075: stloc.0 .line 7,7 : 18,33 '' @@ -186,11 +186,11 @@ IL_0085: pop IL_0086: ldarg.0 IL_0087: ldc.i4.2 - IL_0088: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0088: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc .line 8,8 : 18,25 '' IL_008d: ldarg.0 IL_008e: ldloc.0 - IL_008f: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current + IL_008f: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current IL_0094: ldc.i4.1 IL_0095: ret @@ -200,31 +200,31 @@ IL_0099: ldarg.0 IL_009a: ldc.i4.5 - IL_009b: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_009b: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc .line 6,8 : 15,25 '' IL_00a0: ldarg.0 - IL_00a1: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' + IL_00a1: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' IL_00a6: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_00ab: nop IL_00ac: ldarg.0 IL_00ad: ldnull - IL_00ae: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' + IL_00ae: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' .line 9,11 : 15,25 '' IL_00b3: ldarg.0 IL_00b4: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6::get_es() IL_00b9: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_00be: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 + IL_00be: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 IL_00c3: ldarg.0 IL_00c4: ldc.i4.3 - IL_00c5: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_00c5: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc .line 9,11 : 15,25 '' IL_00ca: ldarg.0 - IL_00cb: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 + IL_00cb: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 IL_00d0: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_00d5: brfalse.s IL_0106 IL_00d7: ldarg.0 - IL_00d8: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 + IL_00d8: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 IL_00dd: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_00e2: stloc.1 .line 10,10 : 18,35 '' @@ -234,11 +234,11 @@ IL_00f2: pop IL_00f3: ldarg.0 IL_00f4: ldc.i4.4 - IL_00f5: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_00f5: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc .line 11,11 : 18,25 '' IL_00fa: ldarg.0 IL_00fb: ldloc.1 - IL_00fc: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current + IL_00fc: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current IL_0101: ldc.i4.1 IL_0102: ret @@ -248,24 +248,24 @@ IL_0106: ldarg.0 IL_0107: ldc.i4.5 - IL_0108: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0108: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc .line 9,11 : 15,25 '' IL_010d: ldarg.0 - IL_010e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 + IL_010e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 IL_0113: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0118: nop IL_0119: ldarg.0 IL_011a: ldnull - IL_011b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 + IL_011b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 IL_0120: ldarg.0 IL_0121: ldc.i4.5 - IL_0122: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0122: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_0127: ldarg.0 IL_0128: ldc.i4.0 - IL_0129: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current + IL_0129: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current IL_012e: ldc.i4.0 IL_012f: ret - } // end of method f7@6::GenerateNext + } // end of method 'f7@6-3'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -277,7 +277,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_0006: ldc.i4.5 IL_0007: sub IL_0008: switch ( @@ -293,7 +293,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_001b: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_0020: switch ( IL_003f, IL_0041, @@ -345,9 +345,9 @@ IL_005e: nop IL_005f: ldarg.0 IL_0060: ldc.i4.5 - IL_0061: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0061: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_0066: ldarg.0 - IL_0067: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 + IL_0067: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 IL_006c: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0071: nop .line 100001,100001 : 0,0 '' @@ -358,19 +358,19 @@ IL_0075: nop IL_0076: ldarg.0 IL_0077: ldc.i4.5 - IL_0078: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0078: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_007d: ldarg.0 - IL_007e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' + IL_007e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' IL_0083: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0088: nop .line 100001,100001 : 0,0 '' IL_0089: nop IL_008a: ldarg.0 IL_008b: ldc.i4.5 - IL_008c: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_008c: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current + IL_0093: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current IL_0098: ldnull IL_0099: stloc.1 IL_009a: leave.s IL_00a8 @@ -410,7 +410,7 @@ .line 100001,100001 : 0,0 '' IL_00bc: ret - } // end of method f7@6::Close + } // end of method 'f7@6-3'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -419,7 +419,7 @@ .maxstack 5 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc IL_0006: switch ( IL_0025, IL_0027, @@ -481,7 +481,7 @@ IL_004c: ldc.i4.0 IL_004d: ret - } // end of method f7@6::get_CheckClose + } // end of method 'f7@6-3'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -491,9 +491,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current + IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current IL_0006: ret - } // end of method f7@6::get_LastGenerated + } // end of method 'f7@6-3'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -506,21 +506,21 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0009: ret - } // end of method f7@6::GetFreshEnumerator + } // end of method 'f7@6-3'::GetFreshEnumerator - } // end of class f7@6 + } // end of class 'f7@6-3' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_es() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$SeqExpressionSteppingTest6::es@4 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$SeqExpressionSteppingTest6::'es@4-6' IL_0005: ret } // end of method SeqExpressionSteppingTest6::get_es @@ -534,10 +534,10 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0009: ret } // end of method SeqExpressionSteppingTest6::f7 @@ -554,7 +554,7 @@ .class private abstract auto ansi sealed ''.$SeqExpressionSteppingTest6 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 es@4 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'es@4-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -578,7 +578,7 @@ IL_0012: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0017: dup - IL_0018: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$SeqExpressionSteppingTest6::es@4 + IL_0018: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$SeqExpressionSteppingTest6::'es@4-6' IL_001d: stloc.0 .line 13,13 : 13,31 '' IL_001e: call class [mscorlib]System.Collections.Generic.IEnumerable`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6::f7() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl index 258a218d79d..1088c1b7fca 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02F10000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname f@5 + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f@5-11' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -79,14 +79,14 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld int32 class SeqExpressionSteppingTest7/f@5::pc + IL_0002: stfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld !0 class SeqExpressionSteppingTest7/f@5::current + IL_0009: stfld !0 class SeqExpressionSteppingTest7/'f@5-11'::current IL_000e: ldarg.0 IL_000f: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0014: ret - } // end of method f@5::.ctor + } // end of method 'f@5-11'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -98,7 +98,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest7.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 class SeqExpressionSteppingTest7/f@5::pc + IL_0001: ldfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -139,7 +139,7 @@ IL_003a: stloc.0 IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 class SeqExpressionSteppingTest7/f@5::pc + IL_003d: stfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc .line 5,5 : 44,55 '' IL_0042: ldarg.1 IL_0043: ldc.i4.0 @@ -167,13 +167,13 @@ IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.2 - IL_0063: stfld int32 class SeqExpressionSteppingTest7/f@5::pc + IL_0063: stfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc IL_0068: ldarg.0 IL_0069: ldloc.1 - IL_006a: stfld !0 class SeqExpressionSteppingTest7/f@5::current + IL_006a: stfld !0 class SeqExpressionSteppingTest7/'f@5-11'::current IL_006f: ldc.i4.0 IL_0070: ret - } // end of method f@5::GenerateNext + } // end of method 'f@5-11'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -182,9 +182,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.2 - IL_0002: stfld int32 class SeqExpressionSteppingTest7/f@5::pc + IL_0002: stfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc IL_0007: ret - } // end of method f@5::Close + } // end of method 'f@5-11'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -193,7 +193,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 class SeqExpressionSteppingTest7/f@5::pc + IL_0001: ldfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc IL_0006: switch ( IL_0019, IL_001b, @@ -227,7 +227,7 @@ IL_002b: nop IL_002c: ldc.i4.0 IL_002d: ret - } // end of method f@5::get_CheckClose + } // end of method 'f@5-11'::get_CheckClose .method public strict virtual instance !a get_LastGenerated() cil managed @@ -237,9 +237,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld !0 class SeqExpressionSteppingTest7/f@5::current + IL_0001: ldfld !0 class SeqExpressionSteppingTest7/'f@5-11'::current IL_0006: ret - } // end of method f@5::get_LastGenerated + } // end of method 'f@5-11'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -251,19 +251,19 @@ .locals init (!a V_0) IL_0000: ldc.i4.0 IL_0001: ldloc.0 - IL_0002: newobj instance void class SeqExpressionSteppingTest7/f@5::.ctor(int32, - !0) + IL_0002: newobj instance void class SeqExpressionSteppingTest7/'f@5-11'::.ctor(int32, + !0) IL_0007: ret - } // end of method f@5::GetFreshEnumerator + } // end of method 'f@5-11'::GetFreshEnumerator - } // end of class f@5 + } // end of class 'f@5-11' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 get_r() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ''.$SeqExpressionSteppingTest7::r@4 + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ''.$SeqExpressionSteppingTest7::'r@4-32' IL_0005: ret } // end of method SeqExpressionSteppingTest7::get_r @@ -276,8 +276,8 @@ .line 5,5 : 12,57 '' IL_0000: ldc.i4.0 IL_0001: ldloc.0 - IL_0002: newobj instance void class SeqExpressionSteppingTest7/f@5::.ctor(int32, - !0) + IL_0002: newobj instance void class SeqExpressionSteppingTest7/'f@5-11'::.ctor(int32, + !0) IL_0007: tail. IL_0009: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000e: ret @@ -294,7 +294,7 @@ .class private abstract auto ansi sealed ''.$SeqExpressionSteppingTest7 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 r@4 + .field static assembly class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 'r@4-32' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -315,7 +315,7 @@ IL_0000: ldc.i4.0 IL_0001: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) IL_0006: dup - IL_0007: stsfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ''.$SeqExpressionSteppingTest7::r@4 + IL_0007: stsfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ''.$SeqExpressionSteppingTest7::'r@4-32' IL_000c: stloc.0 .line 6,6 : 1,19 '' IL_000d: ldstr "res = %A" diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl index a4b8d0f0ded..84d76337574 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002C8 Length: 0x00000000 } .module SeqExpressionTailCalls01.exe -// MVID: {5BF2D41C-093A-A6BE-A745-03831CD4F25B} +// MVID: {5BF2DEA9-093A-A6BE-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026B0000 +// Image base: 0x012E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl index 3608269bc35..5c8cea931f7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000320 Length: 0x00000000 } .module SeqExpressionTailCalls02.exe -// MVID: {5BF2D41C-093A-EC43-A745-03831CD4F25B} +// MVID: {5BF2DEA9-093A-EC43-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00790000 +// Image base: 0x030C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl index c028e5825e4..f504445fa01 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl index 88dc97427cd..fad636a18e4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl @@ -29,7 +29,7 @@ } .mresource public FSharpSignatureData.StaticInit_Class01 { - // Offset: 0x00000000 Length: 0x0000033D + // Offset: 0x00000000 Length: 0x0000033E } .mresource public FSharpSignatureDataB.StaticInit_Class01 { @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01540000 +// Image base: 0x00C90000 // =============== CLASS MEMBERS DECLARATION =================== @@ -64,7 +64,7 @@ { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 03 00 00 00 00 00 ) .field static assembly int32 x - .field static assembly int32 'init@4-1' + .field static assembly int32 'init@4-17' .method public specialname rtspecialname instance void .ctor(valuetype [mscorlib]System.DateTime s) cil managed { @@ -87,7 +87,7 @@ .maxstack 8 .line 7,7 : 23,37 '' IL_0000: volatile. - IL_0002: ldsfld int32 StaticInit_ClassS01/C::'init@4-1' + IL_0002: ldsfld int32 StaticInit_ClassS01/C::'init@4-17' IL_0007: ldc.i4.1 IL_0008: bge.s IL_000c @@ -146,7 +146,7 @@ IL_000a: stsfld int32 StaticInit_ClassS01/C::x IL_000f: ldc.i4.1 IL_0010: volatile. - IL_0012: stsfld int32 StaticInit_ClassS01/C::'init@4-1' + IL_0012: stsfld int32 StaticInit_ClassS01/C::'init@4-17' .line 4,4 : 6,7 '' IL_0017: ret } // end of method $StaticInit_ClassS01::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl index 42a2e1c2b56..5c44ab5a27d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x027B0000 +// Image base: 0x00310000 // =============== CLASS MEMBERS DECLARATION =================== @@ -72,7 +72,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$StaticInit_Module01::y@7 + IL_0000: ldsfld int32 ''.$StaticInit_Module01::'y@7-93' IL_0005: ret } // end of method N::get_y @@ -81,7 +81,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$StaticInit_Module01::z@8 + IL_0000: ldsfld int32 ''.$StaticInit_Module01::'z@8-17' IL_0005: ret } // end of method N::get_z @@ -102,7 +102,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$StaticInit_Module01::'x@5-2' + IL_0000: ldsfld int32 ''.$StaticInit_Module01::'x@5-121' IL_0005: ret } // end of method M::get_x @@ -118,11 +118,11 @@ .class private abstract auto ansi sealed ''.$StaticInit_Module01 extends [mscorlib]System.Object { - .field static assembly initonly int32 'x@5-2' + .field static assembly initonly int32 'x@5-121' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly initonly int32 y@7 + .field static assembly initonly int32 'y@7-93' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly initonly int32 z@8 + .field static assembly initonly int32 'z@8-17' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -141,7 +141,7 @@ IL_0000: ldstr "1" IL_0005: callvirt instance int32 [mscorlib]System.String::get_Length() IL_000a: dup - IL_000b: stsfld int32 ''.$StaticInit_Module01::'x@5-2' + IL_000b: stsfld int32 ''.$StaticInit_Module01::'x@5-121' IL_0010: stloc.0 .line 7,7 : 5,27 '' IL_0011: call int32 StaticInit_Module01/M::get_x() @@ -149,7 +149,7 @@ IL_001b: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0020: add IL_0021: dup - IL_0022: stsfld int32 ''.$StaticInit_Module01::y@7 + IL_0022: stsfld int32 ''.$StaticInit_Module01::'y@7-93' IL_0027: stloc.1 .line 8,8 : 5,27 '' IL_0028: call int32 StaticInit_Module01/M/N::get_y() @@ -157,7 +157,7 @@ IL_0032: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0037: add IL_0038: dup - IL_0039: stsfld int32 ''.$StaticInit_Module01::z@8 + IL_0039: stsfld int32 ''.$StaticInit_Module01::'z@8-17' IL_003e: stloc.2 IL_003f: ret } // end of method $StaticInit_Module01::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl index 170b714cb41..b9c82dce033 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl @@ -29,7 +29,7 @@ } .mresource public FSharpSignatureData.StaticInit_Struct01 { - // Offset: 0x00000000 Length: 0x000007A5 + // Offset: 0x00000000 Length: 0x000007A8 } .mresource public FSharpSignatureDataB.StaticInit_Struct01 { @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x01020000 // =============== CLASS MEMBERS DECLARATION =================== @@ -69,7 +69,7 @@ { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 03 00 00 00 00 00 ) .field static assembly int32 x - .field static assembly int32 init@4 + .field static assembly int32 'init@4-16' .field assembly valuetype [mscorlib]System.DateTime s .method public hidebysig virtual final instance int32 CompareTo(valuetype StaticInit_Struct01/C obj) cil managed @@ -236,7 +236,7 @@ .maxstack 8 .line 7,7 : 23,37 '' IL_0000: volatile. - IL_0002: ldsfld int32 StaticInit_Struct01/C::init@4 + IL_0002: ldsfld int32 StaticInit_Struct01/C::'init@4-16' IL_0007: ldc.i4.1 IL_0008: bge.s IL_000c @@ -343,7 +343,7 @@ IL_000a: stsfld int32 StaticInit_Struct01/C::x IL_000f: ldc.i4.1 IL_0010: volatile. - IL_0012: stsfld int32 StaticInit_Struct01/C::init@4 + IL_0012: stsfld int32 StaticInit_Struct01/C::'init@4-16' .line 4,4 : 6,7 '' IL_0017: ret } // end of method $StaticInit_Struct01::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl index f2f3578c471..adc1126dea5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00B00000 +// Image base: 0x02AE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl index ed0280a9b7b..6e2e3b05b18 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02630000 +// Image base: 0x01710000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl index 36409c086ea..720bc8d58cf 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00820000 +// Image base: 0x01410000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl index ca01e65af33..70b329c46d4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01760000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl index 7b815297394..6a1e4f65a48 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C90000 +// Image base: 0x03160000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl index cd327ca7dba..b0f6385be28 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03040000 +// Image base: 0x017A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl index 89872b6a2c2..20710e6eff9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CE0000 +// Image base: 0x00CD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl index d9a69225e5d..16fb299ec9a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00710000 +// Image base: 0x02B80000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl index 9f0db454dec..24cf90b058c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl @@ -50,7 +50,7 @@ .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00520000 +// Image base: 0x00CC0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit GenericInner@15 + .class auto ansi serializable sealed nested assembly beforefieldinit 'GenericInner@15-3' extends [FSharp.Core]Microsoft.FSharp.Core.FSharpTypeFunc { .method assembly specialname rtspecialname @@ -74,7 +74,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [FSharp.Core]Microsoft.FSharp.Core.FSharpTypeFunc::.ctor() IL_0006: ret - } // end of method GenericInner@15::.ctor + } // end of method 'GenericInner@15-3'::.ctor .method public strict virtual instance object Specialize() cil managed @@ -84,22 +84,22 @@ // Code size 12 (0xc) .maxstack 8 IL_0000: ldarg.0 - IL_0001: newobj instance void class SteppingMatch09/GenericInner@15T::.ctor(class SteppingMatch09/GenericInner@15) + IL_0001: newobj instance void class SteppingMatch09/'GenericInner@15-3T'::.ctor(class SteppingMatch09/'GenericInner@15-3') IL_0006: box class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> IL_000b: ret - } // end of method GenericInner@15::Specialize + } // end of method 'GenericInner@15-3'::Specialize - } // end of class GenericInner@15 + } // end of class 'GenericInner@15-3' - .class auto ansi serializable sealed nested assembly beforefieldinit GenericInner@15T + .class auto ansi serializable sealed nested assembly beforefieldinit 'GenericInner@15-3T' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> { - .field public class SteppingMatch09/GenericInner@15 self0@ + .field public class SteppingMatch09/'GenericInner@15-3' self0@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) .custom instance void [mscorlib]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) .method assembly specialname rtspecialname - instance void .ctor(class SteppingMatch09/GenericInner@15 self0@) cil managed + instance void .ctor(class SteppingMatch09/'GenericInner@15-3' self0@) cil managed { .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) .custom instance void [mscorlib]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) @@ -109,20 +109,20 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class SteppingMatch09/GenericInner@15 class SteppingMatch09/GenericInner@15T::self0@ + IL_0008: stfld class SteppingMatch09/'GenericInner@15-3' class SteppingMatch09/'GenericInner@15-3T'::self0@ IL_000d: ret - } // end of method GenericInner@15T::.ctor + } // end of method 'GenericInner@15-3T'::.ctor .method public strict virtual instance int32 Invoke(class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 list) cil managed { // Code size 23 (0x17) .maxstack 6 - .locals init ([0] class SteppingMatch09/GenericInner@15 V_0) + .locals init ([0] class SteppingMatch09/'GenericInner@15-3' V_0) .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 16,16 : 6,21 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SteppingMatch\\SteppingMatch09.fs' IL_0000: ldarg.0 - IL_0001: ldfld class SteppingMatch09/GenericInner@15 class SteppingMatch09/GenericInner@15T::self0@ + IL_0001: ldfld class SteppingMatch09/'GenericInner@15-3' class SteppingMatch09/'GenericInner@15-3T'::self0@ IL_0006: stloc.0 IL_0007: ldarg.1 IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::get_TailOrNull() @@ -139,11 +139,11 @@ .line 18,18 : 13,14 '' IL_0015: ldc.i4.2 IL_0016: ret - } // end of method GenericInner@15T::Invoke + } // end of method 'GenericInner@15-3T'::Invoke - } // end of class GenericInner@15T + } // end of class 'GenericInner@15-3T' - .class auto ansi serializable sealed nested assembly beforefieldinit NonGenericInner@25 + .class auto ansi serializable sealed nested assembly beforefieldinit 'NonGenericInner@25-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> { .method assembly specialname rtspecialname @@ -156,7 +156,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>::.ctor() IL_0006: ret - } // end of method NonGenericInner@25::.ctor + } // end of method 'NonGenericInner@25-3'::.ctor .method public strict virtual instance int32 Invoke(class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 list) cil managed @@ -179,11 +179,11 @@ .line 27,27 : 13,14 '' IL_000e: ldc.i4.2 IL_000f: ret - } // end of method NonGenericInner@25::Invoke + } // end of method 'NonGenericInner@25-3'::Invoke - } // end of class NonGenericInner@25 + } // end of class 'NonGenericInner@25-3' - .class auto ansi serializable sealed nested assembly beforefieldinit NonGenericInnerWithCapture@34 + .class auto ansi serializable sealed nested assembly beforefieldinit 'NonGenericInnerWithCapture@34-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> { .field public int32 x @@ -198,9 +198,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 SteppingMatch09/NonGenericInnerWithCapture@34::x + IL_0008: stfld int32 SteppingMatch09/'NonGenericInnerWithCapture@34-3'::x IL_000d: ret - } // end of method NonGenericInnerWithCapture@34::.ctor + } // end of method 'NonGenericInnerWithCapture@34-3'::.ctor .method public strict virtual instance int32 Invoke(class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 list) cil managed @@ -222,11 +222,11 @@ .line 36,36 : 13,14 '' IL_000e: ldarg.0 - IL_000f: ldfld int32 SteppingMatch09/NonGenericInnerWithCapture@34::x + IL_000f: ldfld int32 SteppingMatch09/'NonGenericInnerWithCapture@34-3'::x IL_0014: ret - } // end of method NonGenericInnerWithCapture@34::Invoke + } // end of method 'NonGenericInnerWithCapture@34-3'::Invoke - } // end of class NonGenericInnerWithCapture@34 + } // end of class 'NonGenericInnerWithCapture@34-3' .method public static class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1 funcA(int32 n) cil managed @@ -268,7 +268,7 @@ .locals init ([0] class [FSharp.Core]Microsoft.FSharp.Core.FSharpTypeFunc GenericInner, [1] class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 V_1) .line 100001,100001 : 0,0 '' - IL_0000: newobj instance void SteppingMatch09/GenericInner@15::.ctor() + IL_0000: newobj instance void SteppingMatch09/'GenericInner@15-3'::.ctor() IL_0005: stloc.0 .line 20,20 : 3,20 '' IL_0006: ldloc.0 @@ -288,7 +288,7 @@ .maxstack 4 .locals init ([0] class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> NonGenericInner) .line 100001,100001 : 0,0 '' - IL_0000: newobj instance void SteppingMatch09/NonGenericInner@25::.ctor() + IL_0000: newobj instance void SteppingMatch09/'NonGenericInner@25-3'::.ctor() IL_0005: stloc.0 .line 29,29 : 3,23 '' IL_0006: ldloc.0 @@ -307,7 +307,7 @@ .locals init ([0] class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> NonGenericInnerWithCapture) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: newobj instance void SteppingMatch09/NonGenericInnerWithCapture@34::.ctor(int32) + IL_0001: newobj instance void SteppingMatch09/'NonGenericInnerWithCapture@34-3'::.ctor(int32) IL_0006: stloc.0 .line 38,38 : 3,34 '' IL_0007: ldloc.0 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl index 5111245fae6..dbae376dec4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B8 Length: 0x00000000 } .module TailCall01.exe -// MVID: {5BF2D41D-7D8F-CF4A-A745-03831DD4F25B} +// MVID: {5BF2DEA9-7D8F-CF4A-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00380000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl index d8912f079c0..db117ac1675 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A0 Length: 0x00000000 } .module TailCall02.exe -// MVID: {5BF2D41D-7D8F-CE9D-A745-03831DD4F25B} +// MVID: {5BF2DEA9-7D8F-CE9D-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x00730000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl index e19d5661b50..e3a79ae4c66 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002D8 Length: 0x00000000 } .module TailCall03.exe -// MVID: {5BF2D41D-7D8F-CE88-A745-03831DD4F25B} +// MVID: {5BF2DEA9-7D8F-CE88-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x029E0000 +// Image base: 0x018A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl index 05a3eb5472a..e726e81367d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002C8 Length: 0x00000000 } .module TailCall04.exe -// MVID: {5BF2D41D-7D8F-CFE3-A745-03831DD4F25B} +// MVID: {5BF2DEA9-7D8F-CFE3-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x00EC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl index c1e9a1e0c3c..b6eb07a466b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002D8 Length: 0x00000000 } .module TailCall05.exe -// MVID: {5BF2D41D-7D8F-CFC6-A745-03831DD4F25B} +// MVID: {5BF2DEA9-7D8F-CFC6-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BF0000 +// Image base: 0x00700000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl index 856acc02fd7..6c6431d7a0d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction1.exe -// MVID: {5BF2D41D-65FC-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-65FC-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01160000 +// Image base: 0x00690000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl index f80d99b89dc..7af93d05cf7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction10.exe -// MVID: {5BF2D41D-A624-44FB-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-44FB-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00E70000 +// Image base: 0x00730000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl index dd2268fcc5a..3ad21b14aa7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A0 Length: 0x00000000 } .module TestFunction13.exe -// MVID: {5BF2D41D-A624-451C-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-451C-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03120000 +// Image base: 0x02F00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl index 453bb51da69..dfed6a61615 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction14.exe -// MVID: {5BF2D41D-A624-4587-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-4587-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x00FF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl index e6ce7c40c8e..f6b03567c69 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000008F0 Length: 0x0000002A } .module TestFunction16.exe -// MVID: {5BF2D41D-A624-45C5-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-45C5-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C40000 +// Image base: 0x00F60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl index 83c4d740a6f..8e4ad71535a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000008D0 Length: 0x0000002A } .module TestFunction17.exe -// MVID: {5BF2D41D-A624-45A8-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-45A8-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x00CE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl index 6dcdb20bfb9..fb9b9e9bb11 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000490 Length: 0x0000000E } .module TestFunction19.exe -// MVID: {5BF2D41D-A624-46AE-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-46AE-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x030C0000 +// Image base: 0x03080000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl index 8dd17a6f9b7..8c2714d7ece 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000004D8 Length: 0x0000000E } .module TestFunction20.exe -// MVID: {5BF2D41D-A643-44FB-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A643-44FB-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01040000 +// Image base: 0x02DB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl index 95ab49b4406..0d88f9b8b84 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000008D8 Length: 0x0000002A } .module TestFunction21.exe -// MVID: {5BF2D41D-A643-45E6-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A643-45E6-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01850000 +// Image base: 0x00CA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl index c1e170f54c5..2888e614bd0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000458 Length: 0x00000008 } .module TestFunction23.exe -// MVID: {5BF2D41D-A643-451C-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A643-451C-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01910000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl index ce3a83b1a98..6b546ebc079 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000A18 Length: 0x0000002A } .module TestFunction24.exe -// MVID: {5BF2D41D-A643-4587-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A643-4587-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CD0000 +// Image base: 0x00C10000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl index 63b97447314..6b451c24795 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3b.exe -// MVID: {5BF2D41D-A662-4FC9-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A662-4FC9-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00910000 +// Image base: 0x01220000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl index 671a95fa0aa..496a1071871 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3c.exe -// MVID: {5BF2D41D-A662-4FAC-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A662-4FAC-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03050000 +// Image base: 0x01490000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl index b14246c5423..22cfee2b531 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002F0 Length: 0x00000000 } .module TestFunction9b4.exe -// MVID: {5BF2D41D-A091-56C1-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A091-56C1-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x014B0000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl index 5e18a755528..2d512adb9aa 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction11.exe -// MVID: {5BF2D41D-A624-45E6-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-45E6-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x00C90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl index 2b25d41d7ed..7c253aeb76d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000268 Length: 0x00000000 } .module TestFunction12.exe -// MVID: {5BF2D41D-A624-4539-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-4539-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010B0000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl index 630556943eb..a64a8ca5634 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction15.exe -// MVID: {5BF2D41D-A624-4662-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-4662-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02FB0000 +// Image base: 0x011B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl index d49edbe5161..522516812e5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction18.exe -// MVID: {5BF2D41D-A624-4603-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A624-4603-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013B0000 +// Image base: 0x00730000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl index 3f69cf64452..9b437414e76 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction2.exe -// MVID: {5BF2D41D-661D-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-661D-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01890000 +// Image base: 0x00CA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl index 4976f6c16ec..58173306300 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D0 Length: 0x00000000 } .module Testfunction22.exe -// MVID: {5BF2D41D-5AA3-4518-A745-03831DD4F25B} +// MVID: {5BF2DEA9-5AA3-4518-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x003D0000 +// Image base: 0x00640000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl index 8245a7e853c..c6da2a4f3a5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22b.exe -// MVID: {5BF2D41D-8504-18B7-A745-03831DD4F25B} +// MVID: {5BF2DEA9-8504-18B7-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x00400000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl index 6cbdd683cfe..d4de1d510f0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22c.exe -// MVID: {5BF2D41D-459D-3DF8-A745-03831DD4F25B} +// MVID: {5BF2DEA9-459D-3DF8-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x00CB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl index f893f6cf772..d969cec6fc1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22d.exe -// MVID: {5BF2D41D-FDCA-89B1-A745-03831DD4F25B} +// MVID: {5BF2DEA9-FDCA-89B1-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00700000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl index 4f04f30ec14..d9779a59000 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22e.exe -// MVID: {5BF2D41D-C83B-1CB9-A745-03831DD4F25B} +// MVID: {5BF2DEA9-C83B-1CB9-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x01590000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl index a923076f9a3..582fad73ff8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22f.exe -// MVID: {5BF2D41D-C040-2523-A745-03831DD4F25B} +// MVID: {5BF2DEA9-C040-2523-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A60000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl index ae400771e54..9799785f034 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22g.exe -// MVID: {5BF2D41D-CA89-74DB-A745-03831DD4F25B} +// MVID: {5BF2DEA9-CA89-74DB-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00380000 +// Image base: 0x00CB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl index 4235854246f..8623b16d23a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22h.exe -// MVID: {5BF2D41D-0266-39F6-A745-03831DD4F25B} +// MVID: {5BF2DEA9-0266-39F6-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02810000 +// Image base: 0x01910000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl index 8ea2c215ea3..1831f844a6c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3.exe -// MVID: {5BF2D41D-663A-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-663A-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CD0000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl index 6aa58e66fe0..50b68d36e7e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction4.exe -// MVID: {5BF2D41D-665B-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-665B-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01460000 +// Image base: 0x003F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl index 883487a4db9..14815c7127e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction5.exe -// MVID: {5BF2D41D-6570-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-6570-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013B0000 +// Image base: 0x03050000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl index ac26e0a64b4..5ba964e1264 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction6.exe -// MVID: {5BF2D41D-6591-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-6591-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x014D0000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl index 2a79ad9c582..f6081237e9d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000250 Length: 0x00000000 } .module TestFunction7.exe -// MVID: {5BF2D41D-65AE-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-65AE-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x001F0000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl index 87ff57748b7..7e68e2ae488 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction8.exe -// MVID: {5BF2D41D-65CF-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-65CF-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BE0000 +// Image base: 0x03040000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl index 288186f0a7a..79e5b351ca7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000268 Length: 0x00000000 } .module TestFunction9.exe -// MVID: {5BF2D41D-64F4-8929-A745-03831DD4F25B} +// MVID: {5BF2DEA9-64F4-8929-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018B0000 +// Image base: 0x00560000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl index 928d0446c9f..8d13cc7b5d6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000288 Length: 0x00000000 } .module TestFunction9b.exe -// MVID: {5BF2D41D-A52C-4FC9-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A52C-4FC9-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01990000 +// Image base: 0x01830000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl index 5c7deb8ef58..08f2e0aeccc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b1.exe -// MVID: {5BF2D41D-A406-DAF4-A745-03831DD4F25B} +// MVID: {5BF2DEA9-A406-DAF4-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FE0000 +// Image base: 0x00490000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl index 92e4e27cf1f..95d4b2f1ea2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b2.exe -// MVID: {5BF2D41D-9C0B-E35E-A745-03831DD4F25B} +// MVID: {5BF2DEA9-9C0B-E35E-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01750000 +// Image base: 0x00BF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl index 8093ec86471..78362473f67 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b3.exe -// MVID: {5BF2D41D-C1A4-612A-A745-03831DD4F25B} +// MVID: {5BF2DEA9-C1A4-612A-A745-0383A9DEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CE0000 +// Image base: 0x00FD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl index 4608ff9f653..03b44500fed 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple01.exe -// MVID: {5BF2D41D-6FDB-3E0B-A745-03831DD4F25B} +// MVID: {5BF2DEAA-6FDB-3E0B-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CF0000 +// Image base: 0x00200000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl index 78a632b0ac8..553c9d7ffa3 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple02.exe -// MVID: {5BF2D41D-ECCC-7D58-A745-03831DD4F25B} +// MVID: {5BF2DEAA-ECCC-7D58-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02710000 +// Image base: 0x011E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl index 02cd274bb64..aaabc19aa36 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple03.exe -// MVID: {5BF2D41D-AD65-A299-A745-03831DD4F25B} +// MVID: {5BF2DEAA-AD65-A299-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007C0000 +// Image base: 0x01890000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl index 43955aa0e24..82d2e9b1f07 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple04.exe -// MVID: {5BF2D41D-6A2E-9E97-A745-03831DD4F25B} +// MVID: {5BF2DEAA-6A2E-9E97-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x003A0000 +// Image base: 0x00540000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl index 4bb72cb2383..065bc7ccc06 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple05.exe -// MVID: {5BF2D41D-349F-319F-A745-03831DD4F25B} +// MVID: {5BF2DEAA-349F-319F-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02AB0000 +// Image base: 0x00970000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl index a877051fe59..645ed3c1308 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple06.exe -// MVID: {5BF2D41D-67E0-4675-A745-03831DD4F25B} +// MVID: {5BF2DEAA-67E0-4675-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01830000 +// Image base: 0x00CC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl index ef88d3bc949..53c71c27def 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple07.exe -// MVID: {5BF2D41D-7229-962D-A745-03831DD4F25B} +// MVID: {5BF2DEAA-7229-962D-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00790000 +// Image base: 0x01250000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl index 34e71bbe7f0..2f067b4e028 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple08.exe -// MVID: {5BF2D41D-E542-67B3-A745-03831DD4F25B} +// MVID: {5BF2DEAA-E542-67B3-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F60000 +// Image base: 0x00C70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl index 4ce2515f6f0..00b5cac3cbe 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002D0 Length: 0x00000000 } .module TupleElimination.exe -// MVID: {5BF2D41D-DFDD-92DF-A745-03831DD4F25B} +// MVID: {5BF2DEAA-DFDD-92DF-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x03070000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl index dbd4cd2ae9d..329a466ea00 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B8 Length: 0x00000000 } .module TupleMonster.exe -// MVID: {5BF2D41D-1552-41D8-A745-03831DD4F25B} +// MVID: {5BF2DEAA-1552-41D8-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02FA0000 +// Image base: 0x00BA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl index c76f35e9dec..c126f7b1c68 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl @@ -49,13 +49,13 @@ // Offset: 0x00000260 Length: 0x00000000 } .module ValueTupleAliasConstructor.exe -// MVID: {5BF2D41D-A8CF-BB34-A745-03831DD4F25B} +// MVID: {5BF2DEAA-A8CF-BB34-A745-0383AADEF25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01530000 +// Image base: 0x02E70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/comparer.fsx index dfc716408b9..78eba0e6a71 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/comparer.fsx +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/gccerrors/comparer.fsx @@ -1,8 +1,10 @@ +open System +open System.IO // #NoMT #CompilerOptions #RequiresENU let fn1 = fsi.CommandLineArgs.[1] let fn2 = fsi.CommandLineArgs.[2] // Read file into an array -let File2List(filename : string) = System.IO.File.ReadAllLines filename |> Array.toList +let File2List(filename : string) = File.ReadAllLines filename |> Array.toList let f1 = File2List fn1 let f2 = File2List fn2 let mutable i = 0 @@ -17,5 +19,11 @@ let compare f1 f2 = printfn "\t<< %s" b false) +let update = try Environment.GetEnvironmentVariable("TEST_UPDATE_BSL") = "1" with _ -> false + +if update then + printfn "Updating %s --> %s" fn1 fn2 + File.Copy(fn1, fn2, true) + exit (if (f1.Length = f2.Length && compare f1 f2) then 0 else 1) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx index 33c7eb50dbf..eee9590f48a 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx @@ -1,33 +1,40 @@ // #NoMT #CompilerOptions #RequiresENU -#light +open System +open System.IO + let fn1 = fsi.CommandLineArgs.[1] let fn2 = fsi.CommandLineArgs.[2] -// Read file into an array -let File2List (filename:string) = - use s = new System.IO.StreamReader(filename) - let mutable l = [] - while not s.EndOfStream do - l <- List.append l ( s.ReadLine() :: []) - l - -let f1 = File2List fn1 -let f2 = File2List fn2 +let f1 = File.ReadAllLines fn1 |> Array.toList +let f2 = File.ReadAllLines fn2 |> Array.toList let mutable i = 0 -let compare (f1:string list) (f2:string list) = List.forall2 (fun (a:string) (b:string) -> - let aa = System.Text.RegularExpressions.Regex.Replace(a, @"F# Compiler version .+", "F# Compiler") - let bb = System.Text.RegularExpressions.Regex.Replace(b, @"F# Compiler version .+", "F# Compiler") - - i <- i+1 - if (aa = bb) then - true - else - printfn "Files differ at line %d:" i - printfn "\t>> %s" a - printfn "\t<< %s" b - false - ) f1 f2 - -exit (if (f1.Length = f2.Length && compare f1 f2) then 0 else printfn "File lengths differ"; 1) +let compare (f1:string list) (f2:string list) = + (f1,f2) ||> List.forall2 (fun (a:string) (b:string) -> + let aa = System.Text.RegularExpressions.Regex.Replace(a, @"F# Compiler version .+", "F# Compiler") + let bb = System.Text.RegularExpressions.Regex.Replace(b, @"F# Compiler version .+", "F# Compiler") + + i <- i+1 + if (aa = bb) then + true + else + printfn "Files differ at line %d:" i + printfn "\t>> %s" a + printfn "\t<< %s" b + false + ) + +let update = try Environment.GetEnvironmentVariable("TEST_UPDATE_BSL") = "1" with _ -> false + +if update then + printfn "Updating %s --> %s" fn1 fn2 + File.Copy(fn1, fn2, true) + +let exitCode = + if f1.Length = f2.Length then + if compare f1 f2 then 0 + else printfn "File contents differ"; 1 + else printfn "File lengths differ"; 1 + +exit exitCode diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl index 2a833479ba4..abbdd587455 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl @@ -1,4 +1,4 @@ -Microsoft (R) F# Compiler version 3.0 +Microsoft (R) F# Compiler version 10.2.3 for F# 4.5 Copyright (c) Microsoft Corporation. All Rights Reserved. @@ -76,6 +76,7 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. --warnon: Enable specific warnings that may be off by default --checknulls[+|-] Enable nullness declarations and checks +--langversion: Specify the language version --consolecolors[+|-] Output warning and error messages in color diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/nologo/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsc/nologo/comparer.fsx index 9f4ea4aab69..92dbc42a9a2 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/nologo/comparer.fsx +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/nologo/comparer.fsx @@ -1,5 +1,6 @@ // #NoMT #CompilerOptions #RequiresENU -#light +open System +open System.IO let fn1 = fsi.CommandLineArgs.[1] let fn2 = fsi.CommandLineArgs.[2] @@ -30,4 +31,11 @@ let compare (f1:string list) (f2:string list) = List.forall2 (fun (a:string) (b false ) f1 f2 + +let update = try Environment.GetEnvironmentVariable("TEST_UPDATE_BSL") = "1" with _ -> false + +if update then + printfn "Updating %s --> %s" fn1 fn2 + File.Copy(fn1, fn2, true) + exit (if compare f1 f2 then 0 else 1) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/nologo/logo.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsc/nologo/logo.437.1033.bsl index 7f0560a46c0..aa3952904d4 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/nologo/logo.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/nologo/logo.437.1033.bsl @@ -1,4 +1,4 @@ -Microsoft (R) F# Compiler version 11.0.50518.0 +Microsoft (R) F# Compiler version 10.2.3 for F# 4.5 Copyright (c) Microsoft Corporation. All Rights Reserved. error FS0207: No inputs specified diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/comparer.fsx index dd10fa3f16c..4dd1708a4ab 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/comparer.fsx +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/comparer.fsx @@ -1,4 +1,7 @@ // #NoMT #CompilerOptions #RequiresENU +open System +open System.IO + let fn1 = fsi.CommandLineArgs.[1] let fn2 = fsi.CommandLineArgs.[2] let File2List(filename : string) = System.IO.File.ReadAllLines filename |> Array.toList @@ -16,6 +19,13 @@ let compare f1 f2 = printfn "\t<< %s" b false) + +let update = try Environment.GetEnvironmentVariable("TEST_UPDATE_BSL") = "1" with _ -> false + +if update then + printfn "Updating %s --> %s" fn1 fn2 + File.Copy(fn1, fn2, true) + exit (if compare f1 f2 then 0 else 1) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl index 6acee0f652b..3aa2145418b 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl @@ -34,6 +34,7 @@ Usage: fsharpi [script.fsx []] --warnon: Enable specific warnings that may be off by default --checknulls[+|-] Enable nullness declarations and checks +--langversion: Specify the language version --consolecolors[+|-] Output warning and error messages in color diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsi/help/comparer.fsx index 944d18cc8ee..611eb2394bd 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/comparer.fsx +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/comparer.fsx @@ -1,5 +1,6 @@ // #NoMT #CompilerOptions #RequiresENU -#light +open System +open System.IO let fn1 = fsi.CommandLineArgs.[1] let fn2 = fsi.CommandLineArgs.[2] @@ -34,4 +35,11 @@ let compare (f1:string list) (f2:string list) = List.forall2 (fun (a:string) (b: false ) f1 f2 + +let update = try Environment.GetEnvironmentVariable("TEST_UPDATE_BSL") = "1" with _ -> false + +if update then + printfn "Updating %s --> %s" fn1 fn2 + File.Copy(fn1, fn2, true) + exit (if compare f1 f2 then 0 else 1) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl index 9ba2c8a22ce..9f8e58c4c9f 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl @@ -1,5 +1,5 @@ -Usage: fsi.exe [script.fsx []] +Usage: fsiAnyCpu.exe [script.fsx []] - INPUT FILES - @@ -34,6 +34,7 @@ Usage: fsi.exe [script.fsx []] --warnon: Enable specific warnings that may be off by default --checknulls[+|-] Enable nullness declarations and checks +--langversion: Specify the language version --consolecolors[+|-] Output warning and error messages in color @@ -52,7 +53,7 @@ Usage: fsi.exe [script.fsx []] - ADVANCED - --codepage: Specify the codepage used to read source files --utf8output Output messages in UTF-8 encoding ---preferreduilang: Specify the preferred output language culture +--preferreduilang: Specify the preferred output language culture name (e.g. es-ES, ja-JP) --fullpaths Output messages with fully qualified paths --lib: Specify a directory for the include path which diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl index 2cf72f6212e..8ed871e1552 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl @@ -1,7 +1,7 @@ -Microsoft (R) F# Interactive version 4.1 +Microsoft (R) F# Interactive version 10.2.3 for F# 4.5 Copyright (c) Microsoft Corporation. All Rights Reserved. -Usage: fsi.exe [script.fsx []] +Usage: fsiAnyCpu.exe [script.fsx []] - INPUT FILES - @@ -36,6 +36,7 @@ Usage: fsi.exe [script.fsx []] --warnon: Enable specific warnings that may be off by default --checknulls[+|-] Enable nullness declarations and checks +--langversion: Specify the language version --consolecolors[+|-] Output warning and error messages in color diff --git a/tests/fsharpqa/Source/Optimizations/CompareIL.cmd b/tests/fsharpqa/Source/Optimizations/CompareIL.cmd index 0462386d285..0b48c2a26da 100644 --- a/tests/fsharpqa/Source/Optimizations/CompareIL.cmd +++ b/tests/fsharpqa/Source/Optimizations/CompareIL.cmd @@ -5,5 +5,12 @@ IF NOT ERRORLEVEL 0 exit 1 echo ..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il" ..\..\..\testenv\bin\ILComparer.exe "%~n1.il.bsl" "%~n1.il" + + +if /i "%TEST_UPDATE_BSL%" == "1" ( + echo copy /y "%~n1.il" "%~n1.il.bsl" + copy /y "%~n1.il" "%~n1.il.bsl" +) + exit /b %ERRORLEVEL% diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl index 38b3a3aa80c..d4905c1a468 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ForEachOnArray01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ForEachOnArray01 { - // Offset: 0x00000000 Length: 0x000001E0 + // Offset: 0x00000000 Length: 0x000001E8 +} +.mresource public FSharpSignatureDataB.ForEachOnArray01 +{ + // Offset: 0x000001F0 Length: 0x00000004 } .mresource public FSharpOptimizationData.ForEachOnArray01 { - // Offset: 0x000001E8 Length: 0x0000007C + // Offset: 0x000001F8 Length: 0x0000007C +} +.mresource public FSharpOptimizationDataB.ForEachOnArray01 +{ + // Offset: 0x00000278 Length: 0x00000000 } .module ForEachOnArray01.dll -// MVID: {59B18AEE-7E2E-D3AE-A745-0383EE8AB159} +// MVID: {5BF2D394-7E2E-D3AE-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x00FA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl index 14d6a854963..1d395be7bac 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ForEachOnList01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ForEachOnList01 { - // Offset: 0x00000000 Length: 0x000002ED + // Offset: 0x00000000 Length: 0x000002F5 +} +.mresource public FSharpSignatureDataB.ForEachOnList01 +{ + // Offset: 0x00000300 Length: 0x00000016 } .mresource public FSharpOptimizationData.ForEachOnList01 { - // Offset: 0x000002F8 Length: 0x000000DB + // Offset: 0x00000320 Length: 0x000000DB +} +.mresource public FSharpOptimizationDataB.ForEachOnList01 +{ + // Offset: 0x00000400 Length: 0x00000000 } .module ForEachOnList01.dll -// MVID: {59B18AEE-56DF-F74F-A745-0383EE8AB159} +// MVID: {5BF2D394-56DF-F74F-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x01760000 // =============== CLASS MEMBERS DECLARATION =================== @@ -51,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit test6@38 + .class auto ansi serializable sealed nested assembly beforefieldinit 'test6@38-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -64,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method test6@38::.ctor + } // end of method 'test6@38-2'::.ctor .method public strict virtual instance int32 Invoke(int32 x) cil managed @@ -77,11 +85,11 @@ IL_0001: ldc.i4.1 IL_0002: add IL_0003: ret - } // end of method test6@38::Invoke + } // end of method 'test6@38-2'::Invoke - } // end of class test6@38 + } // end of class 'test6@38-2' - .class auto ansi serializable sealed nested assembly beforefieldinit test7@47 + .class auto ansi serializable sealed nested assembly beforefieldinit 'test7@47-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -94,7 +102,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method test7@47::.ctor + } // end of method 'test7@47-1'::.ctor .method public strict virtual instance int32 Invoke(int32 x) cil managed @@ -106,9 +114,9 @@ IL_0001: ldc.i4.1 IL_0002: add IL_0003: ret - } // end of method test7@47::Invoke + } // end of method 'test7@47-1'::Invoke - } // end of class test7@47 + } // end of class 'test7@47-1' .method public static void test1(class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 lst) cil managed { @@ -390,7 +398,7 @@ [2] int32 i, [3] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_3) .line 36,40 : 5,21 '' - IL_0000: newobj instance void ForEachOnList01/test6@38::.ctor() + IL_0000: newobj instance void ForEachOnList01/'test6@38-2'::.ctor() IL_0005: ldc.i4.1 IL_0006: ldc.i4.2 IL_0007: ldc.i4.3 @@ -453,7 +461,7 @@ [3] int32 tmp, [4] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_4) .line 45,49 : 5,21 '' - IL_0000: newobj instance void ForEachOnList01/test7@47::.ctor() + IL_0000: newobj instance void ForEachOnList01/'test7@47-1'::.ctor() IL_0005: ldc.i4.1 IL_0006: ldc.i4.2 IL_0007: ldc.i4.3 diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl index 0db8de85fcc..45fab30bb75 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ForEachOnString01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ForEachOnString01 { - // Offset: 0x00000000 Length: 0x00000354 + // Offset: 0x00000000 Length: 0x0000035C +} +.mresource public FSharpSignatureDataB.ForEachOnString01 +{ + // Offset: 0x00000360 Length: 0x0000001B } .mresource public FSharpOptimizationData.ForEachOnString01 { - // Offset: 0x00000358 Length: 0x000000FF + // Offset: 0x00000380 Length: 0x000000FF +} +.mresource public FSharpOptimizationDataB.ForEachOnString01 +{ + // Offset: 0x00000488 Length: 0x00000000 } .module ForEachOnString01.dll -// MVID: {59B18AEE-105C-852B-A745-0383EE8AB159} +// MVID: {5BF2D394-105C-852B-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x00480000 // =============== CLASS MEMBERS DECLARATION =================== @@ -51,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit test8@54 + .class auto ansi serializable sealed nested assembly beforefieldinit 'test8@54-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -64,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method test8@54::.ctor + } // end of method 'test8@54-1'::.ctor .method public strict virtual instance char Invoke(char x) cil managed @@ -79,11 +87,11 @@ IL_0003: add IL_0004: conv.u2 IL_0005: ret - } // end of method test8@54::Invoke + } // end of method 'test8@54-1'::Invoke - } // end of class test8@54 + } // end of class 'test8@54-1' - .class auto ansi serializable sealed nested assembly beforefieldinit test9@63 + .class auto ansi serializable sealed nested assembly beforefieldinit 'test9@63-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -96,7 +104,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method test9@63::.ctor + } // end of method 'test9@63-1'::.ctor .method public strict virtual instance char Invoke(char x) cil managed @@ -110,9 +118,9 @@ IL_0003: add IL_0004: conv.u2 IL_0005: ret - } // end of method test9@63::Invoke + } // end of method 'test9@63-1'::Invoke - } // end of class test9@63 + } // end of class 'test9@63-1' .method public static void test1(string str) cil managed { @@ -455,7 +463,7 @@ [3] char i, [4] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_4) .line 53,55 : 17,40 '' - IL_0000: newobj instance void ForEachOnString01/test8@54::.ctor() + IL_0000: newobj instance void ForEachOnString01/'test8@54-1'::.ctor() IL_0005: ldstr "1234" IL_000a: call string [FSharp.Core]Microsoft.FSharp.Core.StringModule::Map(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string) @@ -512,7 +520,7 @@ [4] string tmp, [5] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_5) .line 62,64 : 17,40 '' - IL_0000: newobj instance void ForEachOnString01/test9@63::.ctor() + IL_0000: newobj instance void ForEachOnString01/'test9@63-1'::.ctor() IL_0005: ldstr "1234" IL_000a: call string [FSharp.Core]Microsoft.FSharp.Core.StringModule::Map(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string) diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl index 4dd6df631f0..98464726608 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly NoAllocationOfTuple01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.NoAllocationOfTuple01 { - // Offset: 0x00000000 Length: 0x000001E0 + // Offset: 0x00000000 Length: 0x000001E8 +} +.mresource public FSharpSignatureDataB.NoAllocationOfTuple01 +{ + // Offset: 0x000001F0 Length: 0x00000004 } .mresource public FSharpOptimizationData.NoAllocationOfTuple01 { - // Offset: 0x000001E8 Length: 0x00000085 + // Offset: 0x000001F8 Length: 0x00000085 +} +.mresource public FSharpOptimizationDataB.NoAllocationOfTuple01 +{ + // Offset: 0x00000288 Length: 0x00000000 } .module NoAllocationOfTuple01.dll -// MVID: {59B18AEE-13B5-F699-A745-0383EE8AB159} +// MVID: {5BF2D394-13B5-F699-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03460000 +// Image base: 0x02F40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl index 41dcfaf2ed2..1d88da72e80 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly NoIEnumerable01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.NoIEnumerable01 { - // Offset: 0x00000000 Length: 0x000001D1 + // Offset: 0x00000000 Length: 0x000001D9 +} +.mresource public FSharpSignatureDataB.NoIEnumerable01 +{ + // Offset: 0x000001E0 Length: 0x00000003 } .mresource public FSharpOptimizationData.NoIEnumerable01 { - // Offset: 0x000001D8 Length: 0x0000006C + // Offset: 0x000001E8 Length: 0x0000006C +} +.mresource public FSharpOptimizationDataB.NoIEnumerable01 +{ + // Offset: 0x00000258 Length: 0x00000000 } .module NoIEnumerable01.dll -// MVID: {59B18AEE-31A1-8DCB-A745-0383EE8AB159} +// MVID: {5BF2D394-31A1-8DCB-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013E0000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl index 12424f0aa91..64d7760eda9 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly NoIEnumerable02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.NoIEnumerable02 { - // Offset: 0x00000000 Length: 0x000001D1 + // Offset: 0x00000000 Length: 0x000001D9 +} +.mresource public FSharpSignatureDataB.NoIEnumerable02 +{ + // Offset: 0x000001E0 Length: 0x00000003 } .mresource public FSharpOptimizationData.NoIEnumerable02 { - // Offset: 0x000001D8 Length: 0x0000006C + // Offset: 0x000001E8 Length: 0x0000006C +} +.mresource public FSharpOptimizationDataB.NoIEnumerable02 +{ + // Offset: 0x00000258 Length: 0x00000000 } .module NoIEnumerable02.dll -// MVID: {59B18AEE-5066-4012-A745-0383EE8AB159} +// MVID: {5BF2D394-5066-4012-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00720000 +// Image base: 0x02440000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl index 7223d4a04bd..93893704952 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly NoIEnumerable03 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.NoIEnumerable03 { - // Offset: 0x00000000 Length: 0x000001DF + // Offset: 0x00000000 Length: 0x000001E7 +} +.mresource public FSharpSignatureDataB.NoIEnumerable03 +{ + // Offset: 0x000001F0 Length: 0x00000005 } .mresource public FSharpOptimizationData.NoIEnumerable03 { - // Offset: 0x000001E8 Length: 0x0000006C + // Offset: 0x00000200 Length: 0x0000006C +} +.mresource public FSharpOptimizationDataB.NoIEnumerable03 +{ + // Offset: 0x00000270 Length: 0x00000000 } .module NoIEnumerable03.dll -// MVID: {59B18AEE-7903-6020-A745-0383EE8AB159} +// MVID: {5BF2D394-7903-6020-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01970000 +// Image base: 0x013C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl index a27da5651f5..89e6ab2c46a 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ZeroToArrLength01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ZeroToArrLength01 { - // Offset: 0x00000000 Length: 0x000001E0 + // Offset: 0x00000000 Length: 0x000001E8 +} +.mresource public FSharpSignatureDataB.ZeroToArrLength01 +{ + // Offset: 0x000001F0 Length: 0x00000004 } .mresource public FSharpOptimizationData.ZeroToArrLength01 { - // Offset: 0x000001E8 Length: 0x0000007B + // Offset: 0x000001F8 Length: 0x0000007B +} +.mresource public FSharpOptimizationDataB.ZeroToArrLength01 +{ + // Offset: 0x00000278 Length: 0x00000000 } .module ZeroToArrLength01.dll -// MVID: {59B18AEE-A3D0-03A7-A745-0383EE8AB159} +// MVID: {5BF2D394-A3D0-03A7-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02E70000 +// Image base: 0x02520000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl index eedc9d7bee3..bbefe56a379 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly ZeroToArrLength02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.ZeroToArrLength02 { - // Offset: 0x00000000 Length: 0x000001E0 + // Offset: 0x00000000 Length: 0x000001E8 +} +.mresource public FSharpSignatureDataB.ZeroToArrLength02 +{ + // Offset: 0x000001F0 Length: 0x00000004 } .mresource public FSharpOptimizationData.ZeroToArrLength02 { - // Offset: 0x000001E8 Length: 0x0000007B + // Offset: 0x000001F8 Length: 0x0000007B +} +.mresource public FSharpOptimizationDataB.ZeroToArrLength02 +{ + // Offset: 0x00000278 Length: 0x00000000 } .module ZeroToArrLength02.dll -// MVID: {59B18AEE-A36B-03A7-A745-0383EE8AB159} +// MVID: {5BF2D394-A36B-03A7-A745-038394D3F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01550000 +// Image base: 0x010A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare01.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare01.il.bsl index 974905405eb..4c869f6be84 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare01 { - // Offset: 0x00000000 Length: 0x00000225 + // Offset: 0x00000000 Length: 0x0000022D +} +.mresource public FSharpSignatureDataB.Compare01 +{ + // Offset: 0x00000238 Length: 0x00000003 } .mresource public FSharpOptimizationData.Compare01 { - // Offset: 0x00000230 Length: 0x000000B2 + // Offset: 0x00000240 Length: 0x000000B2 +} +.mresource public FSharpOptimizationDataB.Compare01 +{ + // Offset: 0x000002F8 Length: 0x00000000 } .module Compare01.dll -// MVID: {59B18AEE-04A0-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-04A0-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FF0000 +// Image base: 0x00CC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare02.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare02.il.bsl index 74bd16af665..4c0ea027cdc 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare02 { - // Offset: 0x00000000 Length: 0x0000022C + // Offset: 0x00000000 Length: 0x00000234 +} +.mresource public FSharpSignatureDataB.Compare02 +{ + // Offset: 0x00000238 Length: 0x00000003 } .mresource public FSharpOptimizationData.Compare02 { - // Offset: 0x00000230 Length: 0x000000B9 + // Offset: 0x00000240 Length: 0x000000B9 +} +.mresource public FSharpOptimizationDataB.Compare02 +{ + // Offset: 0x00000300 Length: 0x00000000 } .module Compare02.dll -// MVID: {59B18AEE-0481-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-0481-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BA0000 +// Image base: 0x01420000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare03.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare03.il.bsl index c31f8088d27..569d23c8977 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare03.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare03 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare03 { - // Offset: 0x00000000 Length: 0x00000237 + // Offset: 0x00000000 Length: 0x0000023F +} +.mresource public FSharpSignatureDataB.Compare03 +{ + // Offset: 0x00000248 Length: 0x00000003 } .mresource public FSharpOptimizationData.Compare03 { - // Offset: 0x00000240 Length: 0x000000B9 + // Offset: 0x00000250 Length: 0x000000B9 +} +.mresource public FSharpOptimizationDataB.Compare03 +{ + // Offset: 0x00000310 Length: 0x00000000 } .module Compare03.dll -// MVID: {59B18AEE-0562-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-0562-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x01890000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare04.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare04.il.bsl index 0a5d7ed4b4f..29f69cc9fa9 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare04.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare04 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare04 { - // Offset: 0x00000000 Length: 0x00000237 + // Offset: 0x00000000 Length: 0x0000023F +} +.mresource public FSharpSignatureDataB.Compare04 +{ + // Offset: 0x00000248 Length: 0x00000003 } .mresource public FSharpOptimizationData.Compare04 { - // Offset: 0x00000240 Length: 0x000000B9 + // Offset: 0x00000250 Length: 0x000000B9 +} +.mresource public FSharpOptimizationDataB.Compare04 +{ + // Offset: 0x00000310 Length: 0x00000000 } .module Compare04.dll -// MVID: {59B18AEE-053B-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-053B-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013E0000 +// Image base: 0x00740000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare05.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare05.il.bsl index 1b66e37d298..89686b11a59 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare05.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare05.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare05 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare05 { - // Offset: 0x00000000 Length: 0x000006EC + // Offset: 0x00000000 Length: 0x000006E0 +} +.mresource public FSharpSignatureDataB.Compare05 +{ + // Offset: 0x000006E8 Length: 0x0000007C } .mresource public FSharpOptimizationData.Compare05 { - // Offset: 0x000006F0 Length: 0x000003BA + // Offset: 0x00000768 Length: 0x000003BA +} +.mresource public FSharpOptimizationDataB.Compare05 +{ + // Offset: 0x00000B28 Length: 0x00000057 } .module Compare05.dll -// MVID: {59B18AEE-051C-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-051C-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x012F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.bsl index 49c709033de..4b5f25e2f08 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare06 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare06 { - // Offset: 0x00000000 Length: 0x000006DF + // Offset: 0x00000000 Length: 0x000006D3 +} +.mresource public FSharpSignatureDataB.Compare06 +{ + // Offset: 0x000006D8 Length: 0x0000007B } .mresource public FSharpOptimizationData.Compare06 { - // Offset: 0x000006E8 Length: 0x000003BC + // Offset: 0x00000758 Length: 0x000003BC +} +.mresource public FSharpOptimizationDataB.Compare06 +{ + // Offset: 0x00000B18 Length: 0x00000057 } .module Compare06.dll -// MVID: {59B18AEE-04FD-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-04FD-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02E80000 +// Image base: 0x00300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.bsl index 70335b05d20..0e802e3eb8a 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare07 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare07 { - // Offset: 0x00000000 Length: 0x0000089A + // Offset: 0x00000000 Length: 0x0000088E +} +.mresource public FSharpSignatureDataB.Compare07 +{ + // Offset: 0x00000898 Length: 0x00000095 } .mresource public FSharpOptimizationData.Compare07 { - // Offset: 0x000008A0 Length: 0x00000692 + // Offset: 0x00000938 Length: 0x00000692 +} +.mresource public FSharpOptimizationDataB.Compare07 +{ + // Offset: 0x00000FD0 Length: 0x000000A4 } .module Compare07.dll -// MVID: {59B18AEE-05DE-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-05DE-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02BA0000 +// Image base: 0x01920000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare08.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare08.il.bsl index 29f55a0cb58..455270eb12f 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare08.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare08.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare08 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare08 { - // Offset: 0x00000000 Length: 0x00000230 + // Offset: 0x00000000 Length: 0x00000238 +} +.mresource public FSharpSignatureDataB.Compare08 +{ + // Offset: 0x00000240 Length: 0x00000003 } .mresource public FSharpOptimizationData.Compare08 { - // Offset: 0x00000238 Length: 0x000000B2 + // Offset: 0x00000248 Length: 0x000000B2 +} +.mresource public FSharpOptimizationDataB.Compare08 +{ + // Offset: 0x00000300 Length: 0x00000000 } .module Compare08.dll -// MVID: {59B18AEE-03E7-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-03E7-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01590000 +// Image base: 0x00BE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare09.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare09.il.bsl index 4d890783eed..1403a98ec68 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare09.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare09.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare09 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare09 { - // Offset: 0x00000000 Length: 0x00000230 + // Offset: 0x00000000 Length: 0x00000238 +} +.mresource public FSharpSignatureDataB.Compare09 +{ + // Offset: 0x00000240 Length: 0x00000003 } .mresource public FSharpOptimizationData.Compare09 { - // Offset: 0x00000238 Length: 0x000000B2 + // Offset: 0x00000248 Length: 0x000000B2 +} +.mresource public FSharpOptimizationDataB.Compare09 +{ + // Offset: 0x00000300 Length: 0x00000000 } .module Compare09.dll -// MVID: {59B18AEE-03C8-F88E-A745-0383EE8AB159} +// MVID: {5BF2E04A-03C8-F88E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01020000 +// Image base: 0x02E00000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.bsl index 16bada503c5..06025077306 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare10 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare10 { - // Offset: 0x00000000 Length: 0x00000AA4 + // Offset: 0x00000000 Length: 0x00000A98 +} +.mresource public FSharpSignatureDataB.Compare10 +{ + // Offset: 0x00000AA0 Length: 0x000000F6 } .mresource public FSharpOptimizationData.Compare10 { - // Offset: 0x00000AA8 Length: 0x0000058E + // Offset: 0x00000BA0 Length: 0x0000058E +} +.mresource public FSharpOptimizationDataB.Compare10 +{ + // Offset: 0x00001138 Length: 0x000000AE } .module Compare10.dll -// MVID: {59B18AEE-04BF-1753-A745-0383EE8AB159} +// MVID: {5BF2E04A-04BF-1753-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x01930000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare11.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare11.il.bsl index 7f37b719bb4..abc36af0576 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare11.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare11.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Compare11 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Compare11 { - // Offset: 0x00000000 Length: 0x00000230 + // Offset: 0x00000000 Length: 0x00000238 +} +.mresource public FSharpSignatureDataB.Compare11 +{ + // Offset: 0x00000240 Length: 0x00000003 } .mresource public FSharpOptimizationData.Compare11 { - // Offset: 0x00000238 Length: 0x000000B1 + // Offset: 0x00000248 Length: 0x000000B1 +} +.mresource public FSharpOptimizationDataB.Compare11 +{ + // Offset: 0x00000300 Length: 0x00000000 } .module Compare11.dll -// MVID: {59B18AEE-04A0-1753-A745-0383EE8AB159} +// MVID: {5BF2E04A-04A0-1753-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010A0000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals01.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals01.il.bsl index c722fc2d31f..23bcb08f957 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Equals01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Equals01 { - // Offset: 0x00000000 Length: 0x00000234 + // Offset: 0x00000000 Length: 0x0000023C +} +.mresource public FSharpSignatureDataB.Equals01 +{ + // Offset: 0x00000240 Length: 0x00000003 } .mresource public FSharpOptimizationData.Equals01 { - // Offset: 0x00000238 Length: 0x000000B6 + // Offset: 0x00000248 Length: 0x000000B6 +} +.mresource public FSharpOptimizationDataB.Equals01 +{ + // Offset: 0x00000308 Length: 0x00000000 } .module Equals01.dll -// MVID: {59B18AEE-0759-50B1-A745-0383EE8AB159} +// MVID: {5BF2E04A-0759-50B1-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02D70000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals02.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals02.il.bsl index aa7bbc68da5..20b1724916a 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly Equals02 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000023C } +.mresource public FSharpSignatureDataB.Equals02 +{ + // Offset: 0x00000240 Length: 0x00000003 +} .mresource public FSharpOptimizationData.Equals02 { - // Offset: 0x00000240 Length: 0x000000B6 + // Offset: 0x00000248 Length: 0x000000B6 +} +.mresource public FSharpOptimizationDataB.Equals02 +{ + // Offset: 0x00000308 Length: 0x00000000 } .module Equals02.dll -// MVID: {5B18753B-0759-B6D8-A745-03833B75185B} +// MVID: {5BF2E04A-0759-B6D8-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F20000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -57,7 +65,7 @@ .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) .method public static bool f4_tuple4() cil managed { - // Code size 44 (0x2c) + // Code size 36 (0x24) .maxstack 4 .locals init ([0] bool x, [1] int32 i) @@ -69,6 +77,7 @@ IL_0002: ldc.i4.0 IL_0003: stloc.1 IL_0004: br.s IL_001a + .line 9,9 : 12,26 '' IL_0006: ldstr "five" IL_000b: ldstr "5" @@ -83,17 +92,22 @@ IL_001a: ldloc.1 IL_001b: ldc.i4 0x989681 IL_0020: blt.s IL_0006 + .line 10,10 : 8,9 '' IL_0022: ldloc.0 IL_0023: ret } // end of method EqualsMicroPerfAndCodeGenerationTests::f4_tuple4 + } // end of class EqualsMicroPerfAndCodeGenerationTests + } // end of class Equals02 + .class private abstract auto ansi sealed ''.$Equals02$fsx extends [mscorlib]System.Object { } // end of class ''.$Equals02$fsx + // ============================================================= // *********** DISASSEMBLY COMPLETE *********************** diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals03.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals03.il.bsl index e222d314825..79e03eb97c0 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals03.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly Equals03 { @@ -31,18 +31,26 @@ { // Offset: 0x00000000 Length: 0x0000023C } +.mresource public FSharpSignatureDataB.Equals03 +{ + // Offset: 0x00000240 Length: 0x00000003 +} .mresource public FSharpOptimizationData.Equals03 { - // Offset: 0x00000240 Length: 0x000000B6 + // Offset: 0x00000248 Length: 0x000000B6 +} +.mresource public FSharpOptimizationDataB.Equals03 +{ + // Offset: 0x00000308 Length: 0x00000000 } .module Equals03.dll -// MVID: {5B18753B-0759-3313-A745-03833B75185B} +// MVID: {5BF2E04A-0759-3313-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02630000 +// Image base: 0x03160000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals04.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals04.il.bsl index 6ad198b4879..c615c847962 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals04.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Equals04 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Equals04 { - // Offset: 0x00000000 Length: 0x000006E8 + // Offset: 0x00000000 Length: 0x000006DC +} +.mresource public FSharpSignatureDataB.Equals04 +{ + // Offset: 0x000006E0 Length: 0x0000007C } .mresource public FSharpOptimizationData.Equals04 { - // Offset: 0x000006F0 Length: 0x000003B7 + // Offset: 0x00000760 Length: 0x000003B7 +} +.mresource public FSharpOptimizationDataB.Equals04 +{ + // Offset: 0x00000B20 Length: 0x00000057 } .module Equals04.dll -// MVID: {59B18AEE-0759-EA8A-A745-0383EE8AB159} +// MVID: {5BF2E04A-0759-EA8A-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x00A40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals05.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals05.il.bsl index ecc013d450a..3ae1f9cda83 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals05.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals05.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Equals05 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Equals05 { - // Offset: 0x00000000 Length: 0x000006DB + // Offset: 0x00000000 Length: 0x000006CF +} +.mresource public FSharpSignatureDataB.Equals05 +{ + // Offset: 0x000006D8 Length: 0x0000007B } .mresource public FSharpOptimizationData.Equals05 { - // Offset: 0x000006E0 Length: 0x000003B9 + // Offset: 0x00000758 Length: 0x000003B9 +} +.mresource public FSharpOptimizationDataB.Equals05 +{ + // Offset: 0x00000B18 Length: 0x00000057 } .module Equals05.dll -// MVID: {59B18AEE-0759-CBC5-A745-0383EE8AB159} +// MVID: {5BF2E04A-0759-CBC5-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x033B0000 +// Image base: 0x02BD0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.bsl index 91247bff24d..73d037b7378 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Equals06 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Equals06 { - // Offset: 0x00000000 Length: 0x00000896 + // Offset: 0x00000000 Length: 0x0000088A +} +.mresource public FSharpSignatureDataB.Equals06 +{ + // Offset: 0x00000890 Length: 0x00000095 } .mresource public FSharpOptimizationData.Equals06 { - // Offset: 0x000008A0 Length: 0x0000068E + // Offset: 0x00000930 Length: 0x0000068E +} +.mresource public FSharpOptimizationDataB.Equals06 +{ + // Offset: 0x00000FC8 Length: 0x000000A4 } .module Equals06.dll -// MVID: {59B18AEE-0759-31EC-A745-0383EE8AB159} +// MVID: {5BF2E04A-0759-31EC-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01B90000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals07.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals07.il.bsl index 91f97c289a2..5f5828990c7 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals07.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals07.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Equals07 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Equals07 { - // Offset: 0x00000000 Length: 0x0000022D + // Offset: 0x00000000 Length: 0x00000235 +} +.mresource public FSharpSignatureDataB.Equals07 +{ + // Offset: 0x00000240 Length: 0x00000003 } .mresource public FSharpOptimizationData.Equals07 { - // Offset: 0x00000238 Length: 0x000000AF + // Offset: 0x00000248 Length: 0x000000AF +} +.mresource public FSharpOptimizationDataB.Equals07 +{ + // Offset: 0x00000300 Length: 0x00000000 } .module Equals07.dll -// MVID: {59B18AEE-0759-AE27-A745-0383EE8AB159} +// MVID: {5BF2E04A-0759-AE27-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01C80000 +// Image base: 0x003D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals08.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals08.il.bsl index 55da6ee102e..5bc72199db1 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals08.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals08.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Equals08 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Equals08 { - // Offset: 0x00000000 Length: 0x0000022D + // Offset: 0x00000000 Length: 0x00000235 +} +.mresource public FSharpSignatureDataB.Equals08 +{ + // Offset: 0x00000240 Length: 0x00000003 } .mresource public FSharpOptimizationData.Equals08 { - // Offset: 0x00000238 Length: 0x000000AF + // Offset: 0x00000248 Length: 0x000000AF +} +.mresource public FSharpOptimizationDataB.Equals08 +{ + // Offset: 0x00000300 Length: 0x00000000 } .module Equals08.dll -// MVID: {59B18AEE-0759-659E-A745-0383EE8AB159} +// MVID: {5BF2E04A-0759-659E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01090000 +// Image base: 0x00FB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.bsl index 8985acaa02b..c0043ebdca8 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Equals09 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Equals09 { - // Offset: 0x00000000 Length: 0x00000AA0 + // Offset: 0x00000000 Length: 0x00000A94 +} +.mresource public FSharpSignatureDataB.Equals09 +{ + // Offset: 0x00000A98 Length: 0x000000F6 } .mresource public FSharpOptimizationData.Equals09 { - // Offset: 0x00000AA8 Length: 0x0000058B + // Offset: 0x00000B98 Length: 0x0000058B +} +.mresource public FSharpOptimizationDataB.Equals09 +{ + // Offset: 0x00001128 Length: 0x000000AE } .module Equals09.dll -// MVID: {59B18AEE-0759-46D9-A745-0383EE8AB159} +// MVID: {5BF2E04A-0759-46D9-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02720000 +// Image base: 0x00940000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash01.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash01.il.bsl index cb63a42741b..7f0a1092d67 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash01 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash01 { - // Offset: 0x00000000 Length: 0x00000219 + // Offset: 0x00000000 Length: 0x00000221 +} +.mresource public FSharpSignatureDataB.Hash01 +{ + // Offset: 0x00000228 Length: 0x00000003 } .mresource public FSharpOptimizationData.Hash01 { - // Offset: 0x00000220 Length: 0x000000A9 + // Offset: 0x00000230 Length: 0x000000A9 +} +.mresource public FSharpOptimizationDataB.Hash01 +{ + // Offset: 0x000002E0 Length: 0x00000000 } .module Hash01.dll -// MVID: {59B18AEE-9642-78D3-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-78D3-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02FB0000 +// Image base: 0x013C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash02.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash02.il.bsl index 985bcae6f37..6a48fd549ba 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash02 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash02 { - // Offset: 0x00000000 Length: 0x00000220 + // Offset: 0x00000000 Length: 0x00000228 +} +.mresource public FSharpSignatureDataB.Hash02 +{ + // Offset: 0x00000230 Length: 0x00000003 } .mresource public FSharpOptimizationData.Hash02 { - // Offset: 0x00000228 Length: 0x0000010B + // Offset: 0x00000238 Length: 0x0000010B +} +.mresource public FSharpOptimizationDataB.Hash02 +{ + // Offset: 0x00000348 Length: 0x00000006 } .module Hash02.dll -// MVID: {59B18AEE-9642-796E-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-796E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01920000 +// Image base: 0x01A70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl index 94e5977da05..a1f421d8a83 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash03 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash03 { - // Offset: 0x00000000 Length: 0x00000220 + // Offset: 0x00000000 Length: 0x00000228 +} +.mresource public FSharpSignatureDataB.Hash03 +{ + // Offset: 0x00000230 Length: 0x00000003 } .mresource public FSharpOptimizationData.Hash03 { - // Offset: 0x00000228 Length: 0x000000B0 + // Offset: 0x00000238 Length: 0x000000B0 +} +.mresource public FSharpOptimizationDataB.Hash03 +{ + // Offset: 0x000002F0 Length: 0x00000000 } .module Hash03.dll -// MVID: {59B18AEE-9642-788D-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-788D-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02DA0000 +// Image base: 0x01670000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl index 79b1e6d5ad9..3342bcfdd0d 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash04 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash04 { - // Offset: 0x00000000 Length: 0x00000220 + // Offset: 0x00000000 Length: 0x00000228 +} +.mresource public FSharpSignatureDataB.Hash04 +{ + // Offset: 0x00000230 Length: 0x00000003 } .mresource public FSharpOptimizationData.Hash04 { - // Offset: 0x00000228 Length: 0x000000B0 + // Offset: 0x00000238 Length: 0x000000B0 +} +.mresource public FSharpOptimizationDataB.Hash04 +{ + // Offset: 0x000002F0 Length: 0x00000000 } .module Hash04.dll -// MVID: {59B18AEE-9642-7838-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-7838-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012B0000 +// Image base: 0x01370000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash05.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash05.il.bsl index 50ea47e8580..ea290977b63 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash05.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash05.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash05 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash05 { - // Offset: 0x00000000 Length: 0x000006E0 + // Offset: 0x00000000 Length: 0x000006D4 +} +.mresource public FSharpSignatureDataB.Hash05 +{ + // Offset: 0x000006D8 Length: 0x0000007C } .mresource public FSharpOptimizationData.Hash05 { - // Offset: 0x000006E8 Length: 0x000003B1 + // Offset: 0x00000758 Length: 0x000003B1 +} +.mresource public FSharpOptimizationDataB.Hash05 +{ + // Offset: 0x00000B10 Length: 0x00000057 } .module Hash05.dll -// MVID: {59B18AEE-9642-7857-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-7857-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01AC0000 +// Image base: 0x02BA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash06.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash06.il.bsl index df45d5ddbdb..98440fb3a2a 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash06.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash06.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash06 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash06 { - // Offset: 0x00000000 Length: 0x000006E1 + // Offset: 0x00000000 Length: 0x000006D5 +} +.mresource public FSharpSignatureDataB.Hash06 +{ + // Offset: 0x000006E0 Length: 0x0000007C } .mresource public FSharpOptimizationData.Hash06 { - // Offset: 0x000006E8 Length: 0x000003B2 + // Offset: 0x00000760 Length: 0x000003B2 +} +.mresource public FSharpOptimizationDataB.Hash06 +{ + // Offset: 0x00000B18 Length: 0x00000057 } .module Hash06.dll -// MVID: {59B18AEE-9642-78F2-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-78F2-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01040000 +// Image base: 0x01400000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash07.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash07.il.bsl index b57640a2818..0f9f614d8a0 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash07.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash07.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash07 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash07 { - // Offset: 0x00000000 Length: 0x0000021A + // Offset: 0x00000000 Length: 0x00000222 +} +.mresource public FSharpSignatureDataB.Hash07 +{ + // Offset: 0x00000228 Length: 0x00000003 } .mresource public FSharpOptimizationData.Hash07 { - // Offset: 0x00000220 Length: 0x000000AA + // Offset: 0x00000230 Length: 0x000000AA +} +.mresource public FSharpOptimizationDataB.Hash07 +{ + // Offset: 0x000002E0 Length: 0x00000000 } .module Hash07.dll -// MVID: {59B18AEE-9642-7811-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-7811-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010A0000 +// Image base: 0x03140000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash08.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash08.il.bsl index a0945b3885d..f0c714e211d 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash08.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash08.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash08 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash08 { - // Offset: 0x00000000 Length: 0x000006D3 + // Offset: 0x00000000 Length: 0x000006C7 +} +.mresource public FSharpSignatureDataB.Hash08 +{ + // Offset: 0x000006D0 Length: 0x0000007B } .mresource public FSharpOptimizationData.Hash08 { - // Offset: 0x000006D8 Length: 0x000003B3 + // Offset: 0x00000750 Length: 0x000003B3 +} +.mresource public FSharpOptimizationDataB.Hash08 +{ + // Offset: 0x00000B08 Length: 0x00000057 } .module Hash08.dll -// MVID: {59B18AEE-9642-77BC-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-77BC-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01AA0000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash09.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash09.il.bsl index df7b115d207..dee0ecc3738 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash09.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash09.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash09 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash09 { - // Offset: 0x00000000 Length: 0x0000088E + // Offset: 0x00000000 Length: 0x00000882 +} +.mresource public FSharpSignatureDataB.Hash09 +{ + // Offset: 0x00000888 Length: 0x00000095 } .mresource public FSharpOptimizationData.Hash09 { - // Offset: 0x00000898 Length: 0x00000686 + // Offset: 0x00000928 Length: 0x00000686 +} +.mresource public FSharpOptimizationDataB.Hash09 +{ + // Offset: 0x00000FB8 Length: 0x000000A4 } .module Hash09.dll -// MVID: {59B18AEE-9642-77DB-A745-0383EE8AB159} +// MVID: {5BF2E04A-9642-77DB-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00690000 +// Image base: 0x01A50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash10.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash10.il.bsl index 20c3ceeb8f6..bf750198abd 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash10.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash10.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash10 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash10 { - // Offset: 0x00000000 Length: 0x00000219 + // Offset: 0x00000000 Length: 0x00000221 +} +.mresource public FSharpSignatureDataB.Hash10 +{ + // Offset: 0x00000228 Length: 0x00000003 } .mresource public FSharpOptimizationData.Hash10 { - // Offset: 0x00000220 Length: 0x000000A9 + // Offset: 0x00000230 Length: 0x000000A9 +} +.mresource public FSharpOptimizationDataB.Hash10 +{ + // Offset: 0x000002E0 Length: 0x00000000 } .module Hash10.dll -// MVID: {59B18AEE-9661-78B4-A745-0383EE8AB159} +// MVID: {5BF2E04A-9661-78B4-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01080000 +// Image base: 0x01920000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash11.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash11.il.bsl index f4eb5020175..9b4ab66023f 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash11.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash11.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash11 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash11 { - // Offset: 0x00000000 Length: 0x00000219 + // Offset: 0x00000000 Length: 0x00000221 +} +.mresource public FSharpSignatureDataB.Hash11 +{ + // Offset: 0x00000228 Length: 0x00000003 } .mresource public FSharpOptimizationData.Hash11 { - // Offset: 0x00000220 Length: 0x000000A9 + // Offset: 0x00000230 Length: 0x000000A9 +} +.mresource public FSharpOptimizationDataB.Hash11 +{ + // Offset: 0x000002E0 Length: 0x00000000 } .module Hash11.dll -// MVID: {59B18AEE-9661-78D3-A745-0383EE8AB159} +// MVID: {5BF2E04A-9661-78D3-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002D0000 +// Image base: 0x030C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash12.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash12.il.bsl index 9c5bfb73cf3..8a328febf3d 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash12.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash12.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Hash12 { @@ -29,20 +29,28 @@ } .mresource public FSharpSignatureData.Hash12 { - // Offset: 0x00000000 Length: 0x00000A98 + // Offset: 0x00000000 Length: 0x00000A8C +} +.mresource public FSharpSignatureDataB.Hash12 +{ + // Offset: 0x00000A90 Length: 0x000000F6 } .mresource public FSharpOptimizationData.Hash12 { - // Offset: 0x00000AA0 Length: 0x00000585 + // Offset: 0x00000B90 Length: 0x00000585 +} +.mresource public FSharpOptimizationDataB.Hash12 +{ + // Offset: 0x00001120 Length: 0x000000AE } .module Hash12.dll -// MVID: {59B18AEE-9661-796E-A745-0383EE8AB159} +// MVID: {5BF2E04A-9661-796E-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01080000 +// Image base: 0x007C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl b/tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl index aa979cf89ae..f1f1af084fd 100644 --- a/tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Match01 { @@ -25,20 +25,28 @@ } .mresource public FSharpSignatureData.Match01 { - // Offset: 0x00000000 Length: 0x000006F6 + // Offset: 0x00000000 Length: 0x000006EA +} +.mresource public FSharpSignatureDataB.Match01 +{ + // Offset: 0x000006F0 Length: 0x00000084 } .mresource public FSharpOptimizationData.Match01 { - // Offset: 0x00000700 Length: 0x000003B7 + // Offset: 0x00000778 Length: 0x000003B7 +} +.mresource public FSharpOptimizationDataB.Match01 +{ + // Offset: 0x00000B38 Length: 0x0000005F } .module Match01.dll -// MVID: {59B18AF8-FAFE-C8E4-A745-0383F88AB159} +// MVID: {5BF2E04A-FAFE-C8E4-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01790000 +// Image base: 0x02CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/Inlining/Match02.il.bsl b/tests/fsharpqa/Source/Optimizations/Inlining/Match02.il.bsl index a22def741ec..5d37190b9ed 100644 --- a/tests/fsharpqa/Source/Optimizations/Inlining/Match02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/Inlining/Match02.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:1:0 + .ver 4:5:0:0 } .assembly Match02 { @@ -27,18 +27,26 @@ { // Offset: 0x00000000 Length: 0x00000490 } +.mresource public FSharpSignatureDataB.Match02 +{ + // Offset: 0x00000498 Length: 0x0000002D +} .mresource public FSharpOptimizationData.Match02 { - // Offset: 0x00000498 Length: 0x000002EE + // Offset: 0x000004D0 Length: 0x000002EE +} +.mresource public FSharpOptimizationDataB.Match02 +{ + // Offset: 0x000007C8 Length: 0x00000040 } .module Match02.dll -// MVID: {59B18AF8-6125-4D81-A745-0383F88AB159} +// MVID: {5BF2E04A-6125-4D81-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x015D0000 +// Image base: 0x017D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl b/tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl index 7e07ff48ffd..404cddb7c36 100644 --- a/tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl @@ -13,7 +13,7 @@ .assembly extern FSharp.Core { .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: - .ver 4:4:3:0 + .ver 4:5:0:0 } .assembly StructUnion01 { @@ -27,18 +27,26 @@ { // Offset: 0x00000000 Length: 0x0000087E } +.mresource public FSharpSignatureDataB.StructUnion01 +{ + // Offset: 0x00000888 Length: 0x000000AE +} .mresource public FSharpOptimizationData.StructUnion01 { - // Offset: 0x00000888 Length: 0x00000421 + // Offset: 0x00000940 Length: 0x00000421 +} +.mresource public FSharpOptimizationDataB.StructUnion01 +{ + // Offset: 0x00000D68 Length: 0x00000067 } .module StructUnion01.dll -// MVID: {5B1ED843-D3E9-6B24-A745-038343D81E5B} +// MVID: {5BF2E04A-D3E9-6B24-A745-03834AE0F25B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017F0000 +// Image base: 0x00F80000 // =============== CLASS MEMBERS DECLARATION =================== From f428a06b500dc59962474ae664486655421d921e Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 19 Nov 2018 22:51:54 +0000 Subject: [PATCH 038/137] fix errors produced when /checknulls is off --- src/fsharp/ConstraintSolver.fs | 129 ++++++++++-------- src/fsharp/MethodOverrides.fs | 2 +- .../SteppingMatch/SteppingMatch09.il.bsl | 58 ++++---- 3 files changed, 100 insertions(+), 89 deletions(-) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 741953e31fe..f8d91043151 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -829,8 +829,11 @@ and SolveNullnessEquiv (csenv:ConstraintSolverEnv) m2 (trace: OptionalTrace) ty1 | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD | _ -> // NOTE: we never give nullness warnings for the 'obj' type - if csenv.g.checkNullness && not (isObjTy csenv.g ty1) && not (isObjTy csenv.g ty2) then - WarnD(ConstraintSolverNullnessWarningEquivWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) + if csenv.g.checkNullness then + if not (isObjTy csenv.g ty1) && not (isObjTy csenv.g ty2) then + WarnD(ConstraintSolverNullnessWarningEquivWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) + else + CompleteD else CompleteD @@ -859,8 +862,11 @@ and SolveNullnessSubsumesNullness (csenv:ConstraintSolverEnv) m2 (trace: Optiona // Allow target of WithNull and actual of WithoutNull | NullnessInfo.WithNull, NullnessInfo.WithoutNull -> CompleteD | NullnessInfo.WithoutNull, NullnessInfo.WithNull -> - if csenv.g.checkNullness && not (isObjTy csenv.g ty1) && not (isObjTy csenv.g ty2) then - WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) + if csenv.g.checkNullness then + if not (isObjTy csenv.g ty1) && not (isObjTy csenv.g ty2) then + WarnD(ConstraintSolverNullnessWarningWithTypes(csenv.DisplayEnv, ty1, ty2, n1, n2, csenv.m, m2)) + else + CompleteD else CompleteD @@ -1929,83 +1935,47 @@ and AddConstraint (csenv:ConstraintSolverEnv) ndeep m2 trace tp newConstraint = } -and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) ty nullness = +and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) ty nullness = trackErrors { + let g = csenv.g let m = csenv.m let denv = csenv.DisplayEnv match nullness with | Nullness.Variable nv -> if nv.IsSolved then - SolveNullnessSupportsNull csenv ndeep m2 trace ty nv.Solution + do! SolveNullnessSupportsNull csenv ndeep m2 trace ty nv.Solution else trace.Exec (fun () -> nv.Set KnownWithNull) (fun () -> nv.Unset()) - CompleteD | Nullness.Known n1 -> match n1 with - | NullnessInfo.AmbivalentToNull -> CompleteD - | NullnessInfo.WithNull -> CompleteD + | NullnessInfo.AmbivalentToNull -> () + | NullnessInfo.WithNull -> () | NullnessInfo.WithoutNull -> - if csenv.g.checkNullness && not (isObjTy csenv.g ty) then - WarnD(ConstraintSolverNullnessWarningWithType(denv, ty, n1, m, m2)) - else - CompleteD + if g.checkNullness then + if not (isObjTy g ty) then + return! WarnD(ConstraintSolverNullnessWarningWithType(denv, ty, n1, m, m2)) + } -and SolveTypeSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = +and SolveTypeSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = trackErrors { let g = csenv.g let m = csenv.m let denv = csenv.DisplayEnv if TypeNullIsExtraValueNew g m ty then - CompleteD + () else match ty with | NullableTy g _ -> - ErrorD (ConstraintSolverError(FSComp.SR.csNullableTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) + return! ErrorD (ConstraintSolverError(FSComp.SR.csNullableTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) | _ -> + // If langFeatureNullness is on then solve, maybe give warnings if g.langFeatureNullness then let nullness = nullnessOfTy g ty - SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness - else - if TypeNullIsExtraValueOld g m ty then - CompleteD - else - ErrorD (ConstraintSolverError(FSComp.SR.csTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) + do! SolveNullnessSupportsNull csenv ndeep m2 trace ty nullness -and SolveNullnessNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) ty nullness = - let m = csenv.m - let denv = csenv.DisplayEnv - match nullness with - | Nullness.Variable nv -> - if nv.IsSolved then - SolveNullnessNotSupportsNull csenv ndeep m2 trace ty nv.Solution - else - trace.Exec (fun () -> nv.Set KnownWithoutNull) (fun () -> nv.Unset()) - CompleteD - | Nullness.Known n1 -> - match n1 with - | NullnessInfo.AmbivalentToNull -> CompleteD - | NullnessInfo.WithoutNull -> CompleteD - | NullnessInfo.WithNull -> - if csenv.g.checkNullness && not (isObjTy csenv.g ty) then - WarnD(ConstraintSolverNonNullnessWarningWithType(denv, ty, n1, m, m2)) - else - CompleteD - -and SolveTypeNotSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = - let g = csenv.g - let m = csenv.m - let denv = csenv.DisplayEnv - if TypeNullIsTrueValue g ty then - ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsTrueValue(NicePrint.minimalStringOfType denv ty), m, m2)) - elif TypeNullIsExtraValueNew g m ty then - if g.checkNullness then - WarnD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) - else - CompleteD - else - if g.checkNullness then - let nullness = nullnessOfTy g ty - SolveNullnessNotSupportsNull csenv ndeep m2 trace ty nullness - else - CompleteD + // If langFeatureNullness or checkNullness are off give the same errors as F# 4.5 + if not g.langFeatureNullness || not g.checkNullness then + if not (TypeNullIsExtraValueOld g m ty) then + return! ErrorD (ConstraintSolverError(FSComp.SR.csTypeDoesNotHaveNull(NicePrint.minimalStringOfType denv ty), m, m2)) + } // This version prefers to constrain a type parameter definiton and SolveTypeDefnSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = @@ -2033,6 +2003,47 @@ and SolveTypeUseSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = | _ -> SolveTypeSupportsNullCore csenv ndeep m2 trace ty +and SolveNullnessNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) ty nullness = trackErrors { + let g = csenv.g + let m = csenv.m + let denv = csenv.DisplayEnv + match nullness with + | Nullness.Variable nv -> + if nv.IsSolved then + do! SolveNullnessNotSupportsNull csenv ndeep m2 trace ty nv.Solution + else + trace.Exec (fun () -> nv.Set KnownWithoutNull) (fun () -> nv.Unset()) + | Nullness.Known n1 -> + match n1 with + | NullnessInfo.AmbivalentToNull -> () + | NullnessInfo.WithoutNull -> () + | NullnessInfo.WithNull -> + if g.checkNullness then + if not (isObjTy g ty) then + return! WarnD(ConstraintSolverNonNullnessWarningWithType(denv, ty, n1, m, m2)) + else + if TypeNullIsExtraValueOld g m ty then + return! ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) + } + +and SolveTypeNotSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = trackErrors { + let g = csenv.g + let m = csenv.m + let denv = csenv.DisplayEnv + if TypeNullIsTrueValue g ty then + do! ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsTrueValue(NicePrint.minimalStringOfType denv ty), m, m2)) + elif TypeNullIsExtraValueNew g m ty then + if g.checkNullness then + do! WarnD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) + else + if TypeNullIsExtraValueOld g m ty then + do! ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) + else + if g.checkNullness then + let nullness = nullnessOfTy g ty + do! SolveNullnessNotSupportsNull csenv ndeep m2 trace ty nullness + } + // This version prefers to constrain a type parameter definiton and SolveTypeDefnNotSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let g = csenv.g diff --git a/src/fsharp/MethodOverrides.fs b/src/fsharp/MethodOverrides.fs index c2119d843a6..c965919d23c 100644 --- a/src/fsharp/MethodOverrides.fs +++ b/src/fsharp/MethodOverrides.fs @@ -376,7 +376,7 @@ module DispatchSlotChecking = // dispatch slots are ordered from the derived classes to base // so we can check the topmost dispatch slot if it is final match dispatchSlots with - | meth::_ when meth.IsFinal -> errorR(Error(FSComp.SR.tcCannotOverrideSealedMethod((sprintf "%s::%s" (meth.ApparentEnclosingType.ToString()) (meth.LogicalName))), m)) + | meth::_ when meth.IsFinal -> errorR(Error(FSComp.SR.tcCannotOverrideSealedMethod((sprintf "%s::%s" (NicePrint.stringOfTy denv meth.ApparentEnclosingType) meth.LogicalName)), m)) | _ -> () diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl index 24cf90b058c..cd681a9e7dd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000428 Length: 0x00000000 } .module SteppingMatch09.dll -// MVID: {5BF2D3CD-4935-D6AC-A745-0383CDD3F25B} +// MVID: {5BF32B72-4935-D6AC-A745-0383722BF35B} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CC0000 +// Image base: 0x007A0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'GenericInner@15-3' + .class auto ansi serializable sealed nested assembly beforefieldinit GenericInner@15 extends [FSharp.Core]Microsoft.FSharp.Core.FSharpTypeFunc { .method assembly specialname rtspecialname @@ -74,7 +74,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [FSharp.Core]Microsoft.FSharp.Core.FSharpTypeFunc::.ctor() IL_0006: ret - } // end of method 'GenericInner@15-3'::.ctor + } // end of method GenericInner@15::.ctor .method public strict virtual instance object Specialize() cil managed @@ -84,22 +84,22 @@ // Code size 12 (0xc) .maxstack 8 IL_0000: ldarg.0 - IL_0001: newobj instance void class SteppingMatch09/'GenericInner@15-3T'::.ctor(class SteppingMatch09/'GenericInner@15-3') + IL_0001: newobj instance void class SteppingMatch09/GenericInner@15T::.ctor(class SteppingMatch09/GenericInner@15) IL_0006: box class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> IL_000b: ret - } // end of method 'GenericInner@15-3'::Specialize + } // end of method GenericInner@15::Specialize - } // end of class 'GenericInner@15-3' + } // end of class GenericInner@15 - .class auto ansi serializable sealed nested assembly beforefieldinit 'GenericInner@15-3T' + .class auto ansi serializable sealed nested assembly beforefieldinit GenericInner@15T extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> { - .field public class SteppingMatch09/'GenericInner@15-3' self0@ + .field public class SteppingMatch09/GenericInner@15 self0@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) .custom instance void [mscorlib]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) .method assembly specialname rtspecialname - instance void .ctor(class SteppingMatch09/'GenericInner@15-3' self0@) cil managed + instance void .ctor(class SteppingMatch09/GenericInner@15 self0@) cil managed { .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) .custom instance void [mscorlib]System.Diagnostics.DebuggerNonUserCodeAttribute::.ctor() = ( 01 00 00 00 ) @@ -109,20 +109,20 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class SteppingMatch09/'GenericInner@15-3' class SteppingMatch09/'GenericInner@15-3T'::self0@ + IL_0008: stfld class SteppingMatch09/GenericInner@15 class SteppingMatch09/GenericInner@15T::self0@ IL_000d: ret - } // end of method 'GenericInner@15-3T'::.ctor + } // end of method GenericInner@15T::.ctor .method public strict virtual instance int32 Invoke(class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 list) cil managed { // Code size 23 (0x17) .maxstack 6 - .locals init ([0] class SteppingMatch09/'GenericInner@15-3' V_0) + .locals init ([0] class SteppingMatch09/GenericInner@15 V_0) .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 16,16 : 6,21 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SteppingMatch\\SteppingMatch09.fs' IL_0000: ldarg.0 - IL_0001: ldfld class SteppingMatch09/'GenericInner@15-3' class SteppingMatch09/'GenericInner@15-3T'::self0@ + IL_0001: ldfld class SteppingMatch09/GenericInner@15 class SteppingMatch09/GenericInner@15T::self0@ IL_0006: stloc.0 IL_0007: ldarg.1 IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::get_TailOrNull() @@ -139,11 +139,11 @@ .line 18,18 : 13,14 '' IL_0015: ldc.i4.2 IL_0016: ret - } // end of method 'GenericInner@15-3T'::Invoke + } // end of method GenericInner@15T::Invoke - } // end of class 'GenericInner@15-3T' + } // end of class GenericInner@15T - .class auto ansi serializable sealed nested assembly beforefieldinit 'NonGenericInner@25-3' + .class auto ansi serializable sealed nested assembly beforefieldinit NonGenericInner@25 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> { .method assembly specialname rtspecialname @@ -156,7 +156,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>::.ctor() IL_0006: ret - } // end of method 'NonGenericInner@25-3'::.ctor + } // end of method NonGenericInner@25::.ctor .method public strict virtual instance int32 Invoke(class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 list) cil managed @@ -179,11 +179,11 @@ .line 27,27 : 13,14 '' IL_000e: ldc.i4.2 IL_000f: ret - } // end of method 'NonGenericInner@25-3'::Invoke + } // end of method NonGenericInner@25::Invoke - } // end of class 'NonGenericInner@25-3' + } // end of class NonGenericInner@25 - .class auto ansi serializable sealed nested assembly beforefieldinit 'NonGenericInnerWithCapture@34-3' + .class auto ansi serializable sealed nested assembly beforefieldinit NonGenericInnerWithCapture@34 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> { .field public int32 x @@ -198,9 +198,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 SteppingMatch09/'NonGenericInnerWithCapture@34-3'::x + IL_0008: stfld int32 SteppingMatch09/NonGenericInnerWithCapture@34::x IL_000d: ret - } // end of method 'NonGenericInnerWithCapture@34-3'::.ctor + } // end of method NonGenericInnerWithCapture@34::.ctor .method public strict virtual instance int32 Invoke(class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 list) cil managed @@ -222,11 +222,11 @@ .line 36,36 : 13,14 '' IL_000e: ldarg.0 - IL_000f: ldfld int32 SteppingMatch09/'NonGenericInnerWithCapture@34-3'::x + IL_000f: ldfld int32 SteppingMatch09/NonGenericInnerWithCapture@34::x IL_0014: ret - } // end of method 'NonGenericInnerWithCapture@34-3'::Invoke + } // end of method NonGenericInnerWithCapture@34::Invoke - } // end of class 'NonGenericInnerWithCapture@34-3' + } // end of class NonGenericInnerWithCapture@34 .method public static class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1 funcA(int32 n) cil managed @@ -268,7 +268,7 @@ .locals init ([0] class [FSharp.Core]Microsoft.FSharp.Core.FSharpTypeFunc GenericInner, [1] class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 V_1) .line 100001,100001 : 0,0 '' - IL_0000: newobj instance void SteppingMatch09/'GenericInner@15-3'::.ctor() + IL_0000: newobj instance void SteppingMatch09/GenericInner@15::.ctor() IL_0005: stloc.0 .line 20,20 : 3,20 '' IL_0006: ldloc.0 @@ -288,7 +288,7 @@ .maxstack 4 .locals init ([0] class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> NonGenericInner) .line 100001,100001 : 0,0 '' - IL_0000: newobj instance void SteppingMatch09/'NonGenericInner@25-3'::.ctor() + IL_0000: newobj instance void SteppingMatch09/NonGenericInner@25::.ctor() IL_0005: stloc.0 .line 29,29 : 3,23 '' IL_0006: ldloc.0 @@ -307,7 +307,7 @@ .locals init ([0] class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32> NonGenericInnerWithCapture) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: newobj instance void SteppingMatch09/'NonGenericInnerWithCapture@34-3'::.ctor(int32) + IL_0001: newobj instance void SteppingMatch09/NonGenericInnerWithCapture@34::.ctor(int32) IL_0006: stloc.0 .line 38,38 : 3,34 '' IL_0007: ldloc.0 From ba893205e87eb48fcc5a3c458b4c560804aaf894 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 27 Nov 2018 12:12:53 +0000 Subject: [PATCH 039/137] fix tests and write new constraint to stream B of metadata --- src/fsharp/ConstraintSolver.fs | 9 +- src/fsharp/TastPickle.fs | 98 +++++++++++++++++-- .../Microsoft.FSharp.Core/OptionModule.fs | 12 +-- tests/fsharp/core/nullness/test.fsx | 4 +- tests/fsharp/tests.fs | 14 ++- .../BraceCompletionSessionProvider.fs | 4 +- .../src/FSharp.Editor/Common/Logging.fs | 4 +- .../Tests.LanguageService.ErrorList.fs | 6 +- 8 files changed, 127 insertions(+), 24 deletions(-) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index f8d91043151..5c6dfddd3c7 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -2031,13 +2031,12 @@ and SolveTypeNotSupportsNullCore (csenv:ConstraintSolverEnv) ndeep m2 trace ty = let m = csenv.m let denv = csenv.DisplayEnv if TypeNullIsTrueValue g ty then - do! ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsTrueValue(NicePrint.minimalStringOfType denv ty), m, m2)) + // We can only give warnings here as F# 5.0 introduces these constraints into existing + // code via Option.ofObj and Option.toObj + do! WarnD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsTrueValue(NicePrint.minimalStringOfType denv ty), m, m2)) elif TypeNullIsExtraValueNew g m ty then - if g.checkNullness then + if g.checkNullness || TypeNullIsExtraValueOld g m ty then do! WarnD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) - else - if TypeNullIsExtraValueOld g m ty then - do! ErrorD (ConstraintSolverError(FSComp.SR.csTypeHasNullAsExtraValue(NicePrint.minimalStringOfType denv ty), m, m2)) else if g.checkNullness then let nullness = nullnessOfTy g ty diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index 64a81cdcc4c..4564de9a0a3 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -171,12 +171,21 @@ type 'T pickler = 'T -> WriterState -> unit let p_byte b st = st.os.EmitIntAsByte b let p_byteB b st = st.osB.EmitIntAsByte b let p_bool b st = p_byte (if b then 1 else 0) st + +/// Write an uncompressed integer to the main stream. let prim_p_int32 i st = p_byte (b0 i) st p_byte (b1 i) st p_byte (b2 i) st p_byte (b3 i) st +/// Write an uncompressed integer to the B stream. +let prim_p_int32B i st = + p_byteB (b0 i) st + p_byteB (b1 i) st + p_byteB (b2 i) st + p_byteB (b3 i) st + /// Compress integers according to the same scheme used by CLR metadata /// This halves the size of pickled data let p_int32 n st = @@ -189,6 +198,17 @@ let p_int32 n st = p_byte 0xFF st prim_p_int32 n st +/// Write a compressed integer to the B stream. +let p_int32B n st = + if n >= 0 && n <= 0x7F then + p_byteB (b0 n) st + else if n >= 0x80 && n <= 0x3FFF then + p_byteB ( (0x80 ||| (n >>> 8))) st + p_byteB ( (n &&& 0xFF)) st + else + p_byteB 0xFF st + prim_p_int32B n st + let space = () let p_space n () st = for i = 0 to n - 1 do @@ -213,6 +233,7 @@ let p_prim_string (s:string) st = st.os.EmitBytes bytes let p_int c st = p_int32 c st +let p_intB c st = p_int32B c st let p_int8 (i:sbyte) st = p_int32 (int32 i) st let p_uint8 (i:byte) st = p_byte (int i) st let p_int16 (i:int16) st = p_int32 (int32 i) st @@ -244,6 +265,7 @@ let inline p_tup11 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 (a,b,c,d,e,f,x7,x8,x9,x10 let u_byte st = int (st.is.ReadByte()) +/// Unpickle an uncompressed integer from the B stream /// The extra B stream of bytes is implicitly 0 if not present let u_byteB st = if st.isB.IsEOF then 0 else int (st.isB.ReadByte()) @@ -252,6 +274,7 @@ type unpickler<'T> = ReaderState -> 'T let u_bool st = let b = u_byte st in (b = 1) +/// Unpickle an uncompressed integer from the main stream let prim_u_int32 st = let b0 = (u_byte st) let b1 = (u_byte st) @@ -259,6 +282,14 @@ let prim_u_int32 st = let b3 = (u_byte st) b0 ||| (b1 <<< 8) ||| (b2 <<< 16) ||| (b3 <<< 24) +/// Unpickle an uncompressed integer from the B stream +let prim_u_int32B st = + let b0 = u_byteB st + let b1 = u_byteB st + let b2 = u_byteB st + let b3 = u_byteB st + b0 ||| (b1 <<< 8) ||| (b2 <<< 16) ||| (b3 <<< 24) + let u_int32 st = let b0 = u_byte st if b0 <= 0x7F then b0 @@ -270,6 +301,19 @@ let u_int32 st = assert(b0 = 0xFF) prim_u_int32 st +/// Unpickle a compressed integer from the B stream. +/// The integer is 0 if the B stream is not present. +let u_int32B st = + let b0 = u_byteB st + if b0 <= 0x7F then b0 + else if b0 <= 0xbf then + let b0 = b0 &&& 0x7F + let b1 = u_byteB st + (b0 <<< 8) ||| b1 + else + assert(b0 = 0xFF) + prim_u_int32B st + let u_bytes st = let n = (u_int32 st) st.is.ReadBytes n @@ -279,6 +323,7 @@ let u_prim_string st = st.is.ReadUtf8String len let u_int st = u_int32 st +let u_intB st = u_int32B st let u_int8 st = sbyte (u_int32 st) let u_uint8 st = byte (u_byte st) let u_int16 st = int16 (u_int32 st) @@ -424,6 +469,10 @@ let p_array f (x: 'T[]) st = p_int x.Length st p_array_core f x st +let p_arrayB f (x: 'T[]) st = + p_intB x.Length st + p_array_core f x st + // Optionally encode an extra item using a marker bit. // When extraf is None, the marker bit is not set, and this is identical to p_array. let p_array_ext extraf f (x: 'T[]) st = @@ -437,6 +486,9 @@ let p_array_ext extraf f (x: 'T[]) st = let p_list f x st = p_array f (Array.ofList x) st + +let p_listB f x st = p_arrayB f (Array.ofList x) st + let p_list_ext extraf f x st = p_array_ext extraf f (Array.ofList x) st let p_List f (x: 'T list) st = p_list f x st @@ -510,6 +562,11 @@ let u_array f st = let n = u_int st u_array_core f n st +/// Unpickle an array from the B stream. The array is empty if the B stream is not present. +let u_arrayB f st = + let n = u_intB st + u_array_core f n st + // Optionally decode an extra item if a marker bit is present. // When the marker bit is not set this is identical to u_array, and extraf is not called let u_array_ext extraf f st = @@ -523,6 +580,10 @@ let u_array_ext extraf f st = extraItem, arr let u_list f st = Array.toList (u_array f st) + +/// Unpickle a list from the B stream. The resulting list is empty if the B stream is not present. +let u_listB f st = Array.toList (u_arrayB f st) + let u_list_ext extra f st = let v, res = u_array_ext extra f st in v, Array.toList res #if FLAT_LIST_AS_LIST @@ -1507,7 +1568,7 @@ let p_tyar_constraint x st = | TyparConstraint.MayResolveMember(traitInfo,_) -> p_byte 1 st; p_trait traitInfo st | TyparConstraint.DefaultsTo(_,rty,_) -> p_byte 2 st; p_ty rty st | TyparConstraint.SupportsNull _ -> p_byte 3 st - | TyparConstraint.IsNonNullableStruct _ -> p_byte 4 st + | TyparConstraint.IsNonNullableStruct _ -> p_byte 4 st | TyparConstraint.IsReferenceType _ -> p_byte 5 st | TyparConstraint.RequiresDefaultConstructor _ -> p_byte 6 st | TyparConstraint.SimpleChoice(tys,_) -> p_byte 7 st; p_tys tys st @@ -1516,8 +1577,20 @@ let p_tyar_constraint x st = | TyparConstraint.SupportsComparison _ -> p_byte 10 st | TyparConstraint.SupportsEquality _ -> p_byte 11 st | TyparConstraint.IsUnmanaged _ -> p_byte 12 st - | TyparConstraint.NotSupportsNull _ -> p_byte 13 st -let p_tyar_constraints = (p_list p_tyar_constraint) + | TyparConstraint.NotSupportsNull _ -> + failwith "NotSupportsNull constraints should only be emitted to streamB" + +// Some extra F# 5.0 constraints are stored in stream B, these will be ignored by earlier F# compilers +let p_tyar_constraintB x st = + match x with + | TyparConstraint.NotSupportsNull _ -> p_byteB 1 st + | _ -> failwith "only NotSupportsNull constraints should be emitted to streamB" + +let p_tyar_constraints cxs st = + let cxs1, cxs2 = cxs |> List.partition (function TyparConstraint.NotSupportsNull _ -> false | _ -> true) + p_list p_tyar_constraint cxs1 st + // Some extra F# 5.0 constraints are stored in stream B, these will be ignored by earlier F# compilers + p_listB p_tyar_constraintB cxs2 st let u_tyar_constraint st = let tag = u_byte st @@ -1535,12 +1608,23 @@ let u_tyar_constraint st = | 10 -> (fun _ -> TyparConstraint.SupportsComparison range0) | 11 -> (fun _ -> TyparConstraint.SupportsEquality range0) | 12 -> (fun _ -> TyparConstraint.IsUnmanaged range0) - | 13 -> (fun _ -> TyparConstraint.NotSupportsNull range0) | _ -> ufailwith st "u_tyar_constraint" - -let u_tyar_constraints = (u_list_revi u_tyar_constraint) - +// Some extra F# 5.0 constraints are stored in stream B, these will be ignored by earlier F# compilers +let u_tyar_constraintB st = + let tag = u_byteB st + match tag with + | 1 -> TyparConstraint.NotSupportsNull range0 + | _ -> ufailwith st "u_tyar_constraintB - unexpected constraint in streamB" + +let u_tyar_constraints st = + let cxs1 = u_list_revi u_tyar_constraint st + // Some extra F# 5.0 constraints are stored in stream B, these will be ignored by earlier F# compilers + // + // If the B stream is not present (e.g. reading F# 4.5 components) then this list will be empty + // via the implementation of u_listB. + let cxs2 = u_listB u_tyar_constraintB st + cxs1 @ cxs2 let p_tyar_spec_data (x:Typar) st = p_tup5 diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs index 12f0ac5d7c1..39cc4d00b7d 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs @@ -138,9 +138,9 @@ type OptionModule() = Assert.IsTrue( Option.ofObj "" = Some "") Assert.IsTrue( Option.ofObj [| "" |] = Some [| "" |]) Assert.IsTrue( Option.ofObj (null : string array) = None) - Assert.IsTrue( Option.ofObj null = None) - Assert.IsTrue( Option.ofObj null = None) - Assert.IsTrue( Option.ofObj null = None) + Assert.IsTrue( Option.ofObj null = None) + Assert.IsTrue( Option.ofObj null = None) + Assert.IsTrue( Option.ofObj null = None) [] member this.DefaultValue() = @@ -367,9 +367,9 @@ type ValueOptionTests() = Assert.IsTrue(ValueOption.ofObj "" = ValueSome "") Assert.IsTrue(ValueOption.ofObj [| "" |] = ValueSome [| "" |]) Assert.IsTrue(ValueOption.ofObj (null : string array) = ValueNone) - Assert.IsTrue(ValueOption.ofObj null = ValueNone) - Assert.IsTrue(ValueOption.ofObj null = ValueNone) - Assert.IsTrue(ValueOption.ofObj null = ValueNone) + Assert.IsTrue(ValueOption.ofObj null = ValueNone) + Assert.IsTrue(ValueOption.ofObj null = ValueNone) + Assert.IsTrue(ValueOption.ofObj null = ValueNone) [] member this.DefaultValue() = diff --git a/tests/fsharp/core/nullness/test.fsx b/tests/fsharp/core/nullness/test.fsx index c60a9918bb5..74f826baceb 100644 --- a/tests/fsharp/core/nullness/test.fsx +++ b/tests/fsharp/core/nullness/test.fsx @@ -35,7 +35,7 @@ module Basics = let x5 = nonNull "" // Should not give a Nullness warning check "ekjnceoiwe5" x5 "" - let x6 = nonNull "" // **Expected to give a Nullness warning + let x6 = nonNull "" // **Expected to give a Nullness warning, expected also to give a warning with nullness checking off check "ekjnceoiwe6" x6 "" let x7 = nonNull "" check "ekjnceoiwe7" x7 "" @@ -293,6 +293,7 @@ module NullConstraintTests = #endif +#if !NO_CHECKNULLS // This gave an error in F# 4.5. It now only gives a warning when /checknulls is on which is sort of ok // since we are treating .NET and F# types more symmetrically. // @@ -308,6 +309,7 @@ module NullConstraintTests = let f6 (y : C?>) = y // No warning expected, lexing/parsing should succeed let f7 (y : C>?) = y // No warning expected, lexing/parsing should succeed +#endif module DefaultValueTests = diff --git a/tests/fsharp/tests.fs b/tests/fsharp/tests.fs index 2d699bae9bc..89e0a613fbc 100644 --- a/tests/fsharp/tests.fs +++ b/tests/fsharp/tests.fs @@ -164,8 +164,6 @@ module CoreTests = [] let ``test int32`` () = singleTestBuildAndRun "core/int32" FSC_BASIC - [] - let nullness () = singleTestBuildAndRun "core/nullness" FSC_BASIC #if !FSHARP_SUITE_DRIVES_CORECLR_TESTS [] @@ -204,6 +202,18 @@ module CoreTests = testOkFile.CheckExists() + [] + let nullness_no_checknulls () = + let cfg = testConfig "core/nullness" + + use testOkFile = fileguard cfg "test.ok" + + fsc cfg "%s -o:test-no-checknulls.exe -g --define:NO_CHECKNULLS" cfg.fsc_flags ["test.fsx"] + + exec cfg ("." ++ "test-no-checknulls.exe") "" + + testOkFile.CheckExists() + [] let nullness_checknulls () = let cfg = testConfig "core/nullness" diff --git a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs index 8ec155c9450..8e58944eeaf 100644 --- a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs +++ b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs @@ -528,7 +528,9 @@ type BraceCompletionSessionProvider maybe { let! document = openingPoint.Snapshot.GetOpenDocumentInCurrentContextWithChanges() |> Option.ofObj let! sessionFactory = document.TryGetLanguageService() - let! session = sessionFactory.TryCreateSession(document, openingPoint.Position, openingBrace, CancellationToken.None) |> Option.ofObj + let! session = + sessionFactory.TryCreateSession(document, openingPoint.Position, openingBrace, CancellationToken.None) + |> Option.ofObj let undoHistory = undoManager.GetTextBufferUndoManager(textView.TextBuffer).TextBufferUndoHistory return BraceCompletionSession( diff --git a/vsintegration/src/FSharp.Editor/Common/Logging.fs b/vsintegration/src/FSharp.Editor/Common/Logging.fs index d5cb4d4695e..768c8835672 100644 --- a/vsintegration/src/FSharp.Editor/Common/Logging.fs +++ b/vsintegration/src/FSharp.Editor/Common/Logging.fs @@ -29,7 +29,9 @@ open Config type [] Logger [] ([)>] serviceProvider: IServiceProvider) = - let outputWindow = serviceProvider.GetService() |> Option.ofObj + let outputWindow = + serviceProvider.GetService() + |> Option.ofObj // TODO NULLNESS - this explicit annotation should not be needed let createPane () = outputWindow |> Option.iter (fun x -> diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs index f8b70f438e2..768dad941b2 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ErrorList.fs @@ -50,6 +50,10 @@ type UsingMSBuild() as this = let ok = errors |> List.exists (fun err -> err.Message = text) Assert.IsTrue(ok, sprintf "Error list should contain '%s' message" text) + let assertContainsContains (errors : list) text = + let ok = errors |> List.exists (fun err -> err.Message.Contains(text)) + Assert.IsTrue(ok, sprintf "Error list should contain '%s' message" text) + //verify the error list Count member private this.VerifyErrorListCountAtOpenProject(fileContents : string, num : int) = @@ -267,7 +271,7 @@ let x = CheckErrorList content <| fun errors -> Assert.AreEqual(1, List.length errors) - assertContains errors "A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point." + assertContainsContains errors "A unique overload for method 'WriteLine' could not be determined based on type information prior to this program point." [] member public this.``InvalidMethodOverload2``() = From 53608518c6a4593b522a7a01fb1ff2a6c1d7f61a Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 27 Nov 2018 13:15:48 +0000 Subject: [PATCH 040/137] fix tests --- .../Microsoft.FSharp.Core/OptionModule.fs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs index 39cc4d00b7d..12f0ac5d7c1 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/OptionModule.fs @@ -138,9 +138,9 @@ type OptionModule() = Assert.IsTrue( Option.ofObj "" = Some "") Assert.IsTrue( Option.ofObj [| "" |] = Some [| "" |]) Assert.IsTrue( Option.ofObj (null : string array) = None) - Assert.IsTrue( Option.ofObj null = None) - Assert.IsTrue( Option.ofObj null = None) - Assert.IsTrue( Option.ofObj null = None) + Assert.IsTrue( Option.ofObj null = None) + Assert.IsTrue( Option.ofObj null = None) + Assert.IsTrue( Option.ofObj null = None) [] member this.DefaultValue() = @@ -367,9 +367,9 @@ type ValueOptionTests() = Assert.IsTrue(ValueOption.ofObj "" = ValueSome "") Assert.IsTrue(ValueOption.ofObj [| "" |] = ValueSome [| "" |]) Assert.IsTrue(ValueOption.ofObj (null : string array) = ValueNone) - Assert.IsTrue(ValueOption.ofObj null = ValueNone) - Assert.IsTrue(ValueOption.ofObj null = ValueNone) - Assert.IsTrue(ValueOption.ofObj null = ValueNone) + Assert.IsTrue(ValueOption.ofObj null = ValueNone) + Assert.IsTrue(ValueOption.ofObj null = ValueNone) + Assert.IsTrue(ValueOption.ofObj null = ValueNone) [] member this.DefaultValue() = From d18f759b8182c23cb19a70e2b51c37eeddccca4b Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 27 Nov 2018 13:29:21 +0000 Subject: [PATCH 041/137] update FCS to use BUILD_FROM_SOURCE as written with prior version of F# compiler --- .../FSharp.Compiler.Service.fsproj | 2 +- fcs/README.md | 1 - fcs/build.fsx | 8 +++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index a16f39b084c..b3b7408f7a6 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -7,8 +7,8 @@ net45;netstandard2.0 true - $(DefineConstants);COMPILER_SERVICE_AS_DLL $(DefineConstants);COMPILER + $(DefineConstants);BUILD_FROM_SOURCE $(DefineConstants);ENABLE_MONO_SUPPORT $(DefineConstants);NO_STRONG_NAMES ..\..\$(Configuration.ToLower())\fcs diff --git a/fcs/README.md b/fcs/README.md index 8f86342739e..dcae1f48252 100644 --- a/fcs/README.md +++ b/fcs/README.md @@ -16,7 +16,6 @@ There are subtle differences between FSharp.Compiler.Service and FSharp.Compiler - FCS has a NuGet package - FCS has a .NET Standard 1.6 version in the nuget package - FCS testing also tests the "Project Cracker" (see below) -- FCS doesn't add the System.ValueTuple.dll reference by default, see ``#if COMPILER_SERVICE_AS_DLL`` in compiler codebase ## Version Numbers diff --git a/fcs/build.fsx b/fcs/build.fsx index d5e3df4ac4f..8aa3a1cbb88 100644 --- a/fcs/build.fsx +++ b/fcs/build.fsx @@ -24,7 +24,13 @@ let isMono = false // Utilities // -------------------------------------------------------------------------------------- -let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.403" +let dotnetSdkVersion = "2.1.403" + +printfn "Desired .NET SDK version = %s" dotnetSdkVersion +printfn "DotNetCli.isInstalled() = %b" (DotNetCli.isInstalled()) +if DotNetCli.isInstalled() then printfn "DotNetCli.getVersion() = %s" (DotNetCli.getVersion()) + +let dotnetExePath = DotNetCli.InstallDotNetSDK dotnetSdkVersion let runDotnet workingDir args = let result = From 2d414353d65aa5d0542281c673a1cb43fba3f663 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 27 Nov 2018 13:40:00 +0000 Subject: [PATCH 042/137] fix FCS build --- fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj | 2 +- src/fsharp/fsi/fsi.fs | 5 ++++- src/fsharp/tainted.fsi | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index b3b7408f7a6..12ee755ca53 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -16,7 +16,7 @@ $(TargetFramework)\ $(OtherFlags) /warnon:1182 $(OtherFlags) --times - $(NoWarn);44;62;69;65;54;61;75;62;9;2003; + $(NoWarn);44;62;69;65;54;61;75;62;9;2003;2015 true true true diff --git a/src/fsharp/fsi/fsi.fs b/src/fsharp/fsi/fsi.fs index 37697bad9d1..f79aca04f98 100644 --- a/src/fsharp/fsi/fsi.fs +++ b/src/fsharp/fsi/fsi.fs @@ -1612,9 +1612,12 @@ module internal MagicAssemblyResolution = ignore fsiConsoleOutput { new System.IDisposable with member x.Dispose() = () } +#else +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let ResolveAssembly (ctok, m, tcConfigB, tcImports: TcImports, fsiDynamicCompiler: FsiDynamicCompiler, fsiConsoleOutput: FsiConsoleOutput, fullAssemName:string) : Assembly = #else let ResolveAssembly (ctok, m, tcConfigB, tcImports: TcImports, fsiDynamicCompiler: FsiDynamicCompiler, fsiConsoleOutput: FsiConsoleOutput, fullAssemName:string) : Assembly? = - +#endif try // Grab the name of the assembly let tcConfig = TcConfig.Create(tcConfigB,validate=false) diff --git a/src/fsharp/tainted.fsi b/src/fsharp/tainted.fsi index 122ecdbf52e..2a292040b69 100644 --- a/src/fsharp/tainted.fsi +++ b/src/fsharp/tainted.fsi @@ -101,7 +101,7 @@ module internal Tainted = /// Test whether the tainted value is null #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - val (|Null|NonNull|) : Tainted<'T> -> Choice> when 'T : null and 'T : not struct + val (|Null|NonNull|) : Tainted<'T> -> Choice> when 'T : null #else val (|Null|NonNull|) : Tainted<'T?> -> Choice> when 'T : not null and 'T : not struct #endif From fb0b0f82a0e7e84007a9ed0754c1a5d73a74efc8 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 27 Nov 2018 16:59:36 +0000 Subject: [PATCH 043/137] fix tests --- src/fsharp/tainted.fs | 2 +- src/fsharp/tainted.fsi | 2 +- .../MemberDeclarations/E_Sealed_Member_Override02.fsx | 8 ++++---- .../MemberDeclarations/E_Sealed_Member_Override03.fsx | 4 ++-- tests/fsharpqa/Source/Import/E_SealedMethod.fs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/fsharp/tainted.fs b/src/fsharp/tainted.fs index 0a0ebefb57a..d7619590b76 100644 --- a/src/fsharp/tainted.fs +++ b/src/fsharp/tainted.fs @@ -164,7 +164,7 @@ type internal Tainted<'T> (context : TaintedContext, value : 'T) = module internal Tainted = #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let (|Null|NonNull|) (p:Tainted<'T>) : Choice> when 'T : null = + let (|Null|NonNull|) (p:Tainted<'T>) : Choice> when 'T : null and 'T : not struct = if p.PUntaintNoFailure isNull then Null else NonNull (p.PApplyNoFailure id) #else let (|Null|NonNull|) (p:Tainted<'T?>) : Choice> when 'T : not null = diff --git a/src/fsharp/tainted.fsi b/src/fsharp/tainted.fsi index 2a292040b69..122ecdbf52e 100644 --- a/src/fsharp/tainted.fsi +++ b/src/fsharp/tainted.fsi @@ -101,7 +101,7 @@ module internal Tainted = /// Test whether the tainted value is null #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - val (|Null|NonNull|) : Tainted<'T> -> Choice> when 'T : null + val (|Null|NonNull|) : Tainted<'T> -> Choice> when 'T : null and 'T : not struct #else val (|Null|NonNull|) : Tainted<'T?> -> Choice> when 'T : not null and 'T : not struct #endif diff --git a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_Sealed_Member_Override02.fsx b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_Sealed_Member_Override02.fsx index 5892335168c..f75c759bb9d 100644 --- a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_Sealed_Member_Override02.fsx +++ b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_Sealed_Member_Override02.fsx @@ -22,10 +22,10 @@ type T4() = inherit CSLib5.B1() override x.M(i : int) = 2 // ERROR {expected} -//Cannot override inherited member 'B1::M' because it is sealed$ -//Cannot override inherited member 'B1::M' because it is sealed$ -//Cannot override inherited member 'B1::M' because it is sealed$ +//Cannot override inherited member 'CSLib.B1::M' because it is sealed$ +//Cannot override inherited member 'CSLib2.B1::M' because it is sealed$ +//Cannot override inherited member 'CSLib4.B1::M' because it is sealed$ //No implementation was given for 'CSLib5\.B0\.M\(c: char, a: int\) : int'$ //No implementation was given for 'CSLib5\.B0\.N\(c: char, a: int\) : int'$ //This type is 'abstract' since some abstract members have not been given an implementation\. If this is intentional then add the '\[\]' attribute to your type\.$ -//Cannot override inherited member 'B1::M' because it is sealed$ \ No newline at end of file +//Cannot override inherited member 'CSLib5.B1::M' because it is sealed$ \ No newline at end of file diff --git a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_Sealed_Member_Override03.fsx b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_Sealed_Member_Override03.fsx index 9414401cb12..5767cfa602e 100644 --- a/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_Sealed_Member_Override03.fsx +++ b/tests/fsharpqa/Source/Conformance/ObjectOrientedTypeDefinitions/ClassTypes/MemberDeclarations/E_Sealed_Member_Override03.fsx @@ -14,5 +14,5 @@ type T2() = override x.M(o : obj) = 12 override x.M(i : int) = 2 // ERROR {expected} -//Cannot override inherited member 'B1::M' because it is sealed$ -//Cannot override inherited member 'B1::M' because it is sealed$ \ No newline at end of file +//Cannot override inherited member 'CSLib.B1::M' because it is sealed$ +//Cannot override inherited member 'CSLib2.B1::M' because it is sealed$ \ No newline at end of file diff --git a/tests/fsharpqa/Source/Import/E_SealedMethod.fs b/tests/fsharpqa/Source/Import/E_SealedMethod.fs index c3e4790d3dd..2abecd67045 100644 --- a/tests/fsharpqa/Source/Import/E_SealedMethod.fs +++ b/tests/fsharpqa/Source/Import/E_SealedMethod.fs @@ -1,6 +1,6 @@ // #Regression #NoMT #Import // Dev11 Bug 90642 -//Cannot override inherited member 'Class2::F' because it is sealed$ +//Cannot override inherited member 'ClassLibrary1.Class2::F' because it is sealed$ type MyClass() = inherit ClassLibrary1.Class2() From a2f144886db5a480043bb1d32ee402188e00f7f6 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 28 Nov 2018 17:51:20 +0000 Subject: [PATCH 044/137] fix test --- src/fsharp/FSharp.Core/prim-types.fs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index 938a3798d51..c744092dbde 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3768,9 +3768,16 @@ namespace Microsoft.FSharp.Core let inline ParseUInt16 (s:string) = (# "conv.ovf.u2" (ParseUInt32 s) : uint16 #) let inline ParseIntPtr (s:string) = (# "conv.ovf.i" (ParseInt64 s) : nativeint #) let inline ParseUIntPtr (s:string) = (# "conv.ovf.u" (ParseInt64 s) : unativeint #) - let inline ParseDouble (s:string) = Double.Parse(removeUnderscores s,NumberStyles.Float, CultureInfo.InvariantCulture) - let inline ParseSingle (s:string) = Single.Parse(removeUnderscores s,NumberStyles.Float, CultureInfo.InvariantCulture) - + + let inline ParseDouble (s:string) = + if System.Object.ReferenceEquals(s,null) then + raise( new System.ArgumentNullException("s") ) + Double.Parse(removeUnderscores s,NumberStyles.Float, CultureInfo.InvariantCulture) + + let inline ParseSingle (s:string) = + if System.Object.ReferenceEquals(s,null) then + raise( new System.ArgumentNullException("s") ) + Single.Parse(removeUnderscores s,NumberStyles.Float, CultureInfo.InvariantCulture) [] [] From fab2a47c6278e2fa296f2f0090fa4311850c52c0 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 5 Dec 2018 09:18:49 -0800 Subject: [PATCH 045/137] Merge master to nullness (#5968) * Reduce memory allocations (#5965) * reduce memory allocations * remove memory allocations * Smal fixes for https://github.com/Microsoft/visualfsharp/pull/5940 (#5943) * small fixes * fix test --- src/absil/il.fs | 2 +- src/absil/ilprint.fs | 25 +++++++++++++------- src/absil/ilread.fs | 2 +- src/absil/ilreflect.fs | 11 ++++----- src/absil/ilwrite.fs | 4 ++-- src/fsharp/AttributeChecking.fs | 4 ++-- src/fsharp/FindUnsolved.fs | 4 ++-- src/fsharp/IlxGen.fs | 8 +++---- src/fsharp/NameResolution.fs | 10 ++++---- src/fsharp/PostInferenceChecks.fs | 4 ++-- src/fsharp/TastPickle.fs | 39 ++++++++++++++++++++++--------- src/fsharp/TastPickle.fsi | 2 +- src/fsharp/TypeChecker.fs | 2 +- src/fsharp/fsc.fs | 8 +++---- 14 files changed, 75 insertions(+), 50 deletions(-) diff --git a/src/absil/il.fs b/src/absil/il.fs index 4e7f2c66b78..a7949a8e84e 100644 --- a/src/absil/il.fs +++ b/src/absil/il.fs @@ -3975,7 +3975,7 @@ and refs_of_token s x = and refs_of_custom_attr s (cattr: ILAttribute) = refs_of_mspec s cattr.Method -and refs_of_custom_attrs s (cas : ILAttributes) = List.iter (refs_of_custom_attr s) cas.AsList +and refs_of_custom_attrs s (cas : ILAttributes) = Array.iter (refs_of_custom_attr s) cas.AsArray and refs_of_varargs s tyso = Option.iter (refs_of_tys s) tyso and refs_of_instr s x = match x with diff --git a/src/absil/ilprint.fs b/src/absil/ilprint.fs index 0ae779c6f60..391b49ba349 100644 --- a/src/absil/ilprint.fs +++ b/src/absil/ilprint.fs @@ -98,6 +98,13 @@ let output_seq sep f os (a:seq<_>) = output_string os sep; f os e.Current +let output_array sep f os (a:_ []) = + if not (Array.isEmpty a) then + for i in 0..a.Length-2 do + f os a.[i] + output_string os sep + f os (a.[a.Length - 1]) + let output_parens f os a = output_string os "("; f os a; output_string os ")" let output_angled f os a = output_string os "<"; f os a; output_string os ">" let output_bracks f os a = output_string os "["; f os a; output_string os "]" @@ -437,12 +444,12 @@ let output_option f os = function None -> () | Some x -> f os x let goutput_alternative_ref env os (alt: IlxUnionAlternative) = output_id os alt.Name; - alt.FieldDefs |> Array.toList |> output_parens (output_seq "," (fun os fdef -> goutput_typ env os fdef.Type)) os + alt.FieldDefs |> output_parens (output_array "," (fun os fdef -> goutput_typ env os fdef.Type)) os let goutput_curef env os (IlxUnionRef(_,tref,alts,_,_)) = output_string os " .classunion import "; goutput_tref env os tref; - output_parens (output_seq "," (goutput_alternative_ref env)) os (Array.toList alts) + output_parens (output_array "," (goutput_alternative_ref env)) os alts let goutput_cuspec env os (IlxUnionSpec(IlxUnionRef(_,tref,_,_,_),i)) = output_string os "class /* classunion */ "; @@ -477,7 +484,7 @@ let goutput_custom_attr env os (attr: ILAttribute) = output_custom_attr_data os data let goutput_custom_attrs env os (attrs : ILAttributes) = - List.iter (fun attr -> goutput_custom_attr env os attr; output_string os "\n" ) attrs.AsList + Array.iter (fun attr -> goutput_custom_attr env os attr; output_string os "\n" ) attrs.AsArray let goutput_fdef _tref env os (fd: ILFieldDef) = output_string os " .field " @@ -704,7 +711,7 @@ let rec goutput_instr env os inst = goutput_dlocref env os (mkILArrTy(typ,shape)); output_string os ".ctor"; let rank = shape.Rank - output_parens (output_seq "," (goutput_typ env)) os (Array.toList (Array.create ( rank) EcmaMscorlibILGlobals.typ_Int32)) + output_parens (output_array "," (goutput_typ env)) os (Array.create ( rank) EcmaMscorlibILGlobals.typ_Int32) | I_stelem_any (shape,dt) -> if shape = ILArrayShape.SingleDimensional then output_string os "stelem.any "; goutput_typ env os dt @@ -713,7 +720,9 @@ let rec goutput_instr env os inst = goutput_dlocref env os (mkILArrTy(dt,shape)); output_string os "Set"; let rank = shape.Rank - output_parens (output_seq "," (goutput_typ env)) os (Array.toList (Array.create ( rank) EcmaMscorlibILGlobals.typ_Int32) @ [dt]) + let arr = Array.create (rank + 1) EcmaMscorlibILGlobals.typ_Int32 + arr.[rank] <- dt + output_parens (output_array "," (goutput_typ env)) os arr | I_ldelem_any (shape,tok) -> if shape = ILArrayShape.SingleDimensional then output_string os "ldelem.any "; goutput_typ env os tok @@ -724,7 +733,7 @@ let rec goutput_instr env os inst = goutput_dlocref env os (mkILArrTy(tok,shape)); output_string os "Get"; let rank = shape.Rank - output_parens (output_seq "," (goutput_typ env)) os (Array.toList (Array.create ( rank) EcmaMscorlibILGlobals.typ_Int32)) + output_parens (output_array "," (goutput_typ env)) os (Array.create ( rank) EcmaMscorlibILGlobals.typ_Int32) | I_ldelema (ro,_,shape,tok) -> if ro = ReadonlyAddress then output_string os "readonly. "; if shape = ILArrayShape.SingleDimensional then @@ -736,7 +745,7 @@ let rec goutput_instr env os inst = goutput_dlocref env os (mkILArrTy(tok,shape)); output_string os "Address"; let rank = shape.Rank - output_parens (output_seq "," (goutput_typ env)) os (Array.toList (Array.create ( rank) EcmaMscorlibILGlobals.typ_Int32)) + output_parens (output_array "," (goutput_typ env)) os (Array.create ( rank) EcmaMscorlibILGlobals.typ_Int32) | I_box tok -> output_string os "box "; goutput_typ env os tok | I_unbox tok -> output_string os "unbox "; goutput_typ env os tok @@ -890,7 +899,7 @@ let splitTypeLayout = function let goutput_fdefs tref env os (fdefs: ILFieldDefs) = List.iter (fun f -> (goutput_fdef tref env) os f; output_string os "\n" ) fdefs.AsList let goutput_mdefs env os (mdefs: ILMethodDefs) = - List.iter (fun f -> (goutput_mdef env) os f; output_string os "\n" ) mdefs.AsList + Array.iter (fun f -> (goutput_mdef env) os f; output_string os "\n" ) mdefs.AsArray let goutput_pdefs env os (pdefs: ILPropertyDefs) = List.iter (fun f -> (goutput_pdef env) os f; output_string os "\n" ) pdefs.AsList diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index 7d9e506951a..73935167667 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -2118,7 +2118,7 @@ and sigptrGetTy (ctxt: ILMetadataReader) numtypars bytes sigptr = let dim i = (if i < numLoBounded then Some (List.item i lobounds) else None), (if i < numSized then Some (List.item i sizes) else None) - ILArrayShape (Array.toList (Array.init rank dim)) + ILArrayShape (List.init rank dim) mkILArrTy (ty, shape), sigptr elif b0 = et_VOID then ILType.Void, sigptr diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs index cee2604a931..6d83227b67f 100644 --- a/src/absil/ilreflect.fs +++ b/src/absil/ilreflect.fs @@ -289,6 +289,7 @@ module Zmap = let equalTypes (s:Type) (t:Type) = s.Equals(t) let equalTypeLists ss tt = List.lengthsEqAndForall2 equalTypes ss tt +let equalTypeArrays ss tt = Array.lengthsEqAndForall2 equalTypes ss tt let getGenericArgumentsOfType (typT : Type) = if typT.IsGenericType then typT.GetGenericArguments() else [| |] @@ -1437,7 +1438,7 @@ let convCustomAttr cenv emEnv (cattr: ILAttribute) = (methInfo, data) let emitCustomAttr cenv emEnv add cattr = add (convCustomAttr cenv emEnv cattr) -let emitCustomAttrs cenv emEnv add (cattrs : ILAttributes) = List.iter (emitCustomAttr cenv emEnv add) cattrs.AsList +let emitCustomAttrs cenv emEnv add (cattrs : ILAttributes) = Array.iter (emitCustomAttr cenv emEnv add) cattrs.AsArray //---------------------------------------------------------------------------- // buildGenParams @@ -1611,9 +1612,7 @@ let rec buildMethodPass3 cenv tref modB (typB:TypeBuilder) emEnv (mdef : ILMetho (getGenericArgumentsOfType (typB.AsType())) (getGenericArgumentsOfMethod methB)) - match mdef.Return.CustomAttrs.AsList with - | [] -> () - | _ -> + if not (Array.isEmpty mdef.Return.CustomAttrs.AsArray) then let retB = methB.DefineParameterAndLog(0, System.Reflection.ParameterAttributes.Retval, null) emitCustomAttrs cenv emEnv (wrapCustomAttr retB.SetCustomAttribute) mdef.Return.CustomAttrs @@ -1839,7 +1838,7 @@ let rec buildTypeDefPass2 cenv nesting emEnv (tdef : ILTypeDef) = // add interface impls tdef.Implements |> convTypes cenv emEnv |> List.iter (fun implT -> typB.AddInterfaceImplementationAndLog(implT)); // add methods, properties - let emEnv = List.fold (buildMethodPass2 cenv tref typB) emEnv tdef.Methods.AsList + let emEnv = Array.fold (buildMethodPass2 cenv tref typB) emEnv tdef.Methods.AsArray let emEnv = List.fold (buildFieldPass2 cenv tref typB) emEnv tdef.Fields.AsList let emEnv = List.fold (buildPropertyPass2 cenv tref typB) emEnv tdef.Properties.AsList let emEnv = envPopTyvars emEnv @@ -1956,7 +1955,7 @@ let createTypeRef (visited : Dictionary<_, _>, created : Dictionary<_, _>) emEnv traverseType CollectTypes.All cx if verbose2 then dprintf "buildTypeDefPass4: Doing method constraints of %s\n" tdef.Name - for md in tdef.Methods.AsList do + for md in tdef.Methods.AsArray do for gp in md.GenericParams do for cx in gp.Constraints do traverseType CollectTypes.All cx diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs index cd9e1ac41f3..12541d5089e 100644 --- a/src/absil/ilwrite.fs +++ b/src/absil/ilwrite.fs @@ -1401,7 +1401,7 @@ and GenCustomAttrPass3Or4 cenv hca attr = AddUnsharedRow cenv TableNames.CustomAttribute (GetCustomAttrRow cenv hca attr) |> ignore and GenCustomAttrsPass3Or4 cenv hca (attrs: ILAttributes) = - attrs.AsList |> List.iter (GenCustomAttrPass3Or4 cenv hca) + attrs.AsArray |> Array.iter (GenCustomAttrPass3Or4 cenv hca) // -------------------------------------------------------------------- // ILSecurityDecl --> DeclSecurity rows @@ -2463,7 +2463,7 @@ let GenReturnAsParamRow (returnv : ILReturn) = StringE 0 |] let GenReturnPass3 cenv (returnv: ILReturn) = - if Option.isSome returnv.Marshal || not (isNil returnv.CustomAttrs.AsList) then + if Option.isSome returnv.Marshal || not (Array.isEmpty returnv.CustomAttrs.AsArray) then let pidx = AddUnsharedRow cenv TableNames.Param (GenReturnAsParamRow returnv) GenCustomAttrsPass3Or4 cenv (hca_ParamDef, pidx) returnv.CustomAttrs match returnv.Marshal with diff --git a/src/fsharp/AttributeChecking.fs b/src/fsharp/AttributeChecking.fs index 3be4a3a0705..a28598d9708 100644 --- a/src/fsharp/AttributeChecking.fs +++ b/src/fsharp/AttributeChecking.fs @@ -449,8 +449,8 @@ let MethInfoIsUnseen g m ty minfo = // We are only interested in filtering out the method on System.Object, so it is sufficient // just to look at the attributes on IL methods. if tcref.IsILTycon then - tcref.ILTyconRawMetadata.CustomAttrs.AsList - |> List.exists (fun attr -> attr.Method.DeclaringType.TypeSpec.Name = typeof.FullName) + tcref.ILTyconRawMetadata.CustomAttrs.AsArray + |> Array.exists (fun attr -> attr.Method.DeclaringType.TypeSpec.Name = typeof.FullName) else false #else diff --git a/src/fsharp/FindUnsolved.fs b/src/fsharp/FindUnsolved.fs index 45435601b3c..6f644c7a48d 100644 --- a/src/fsharp/FindUnsolved.fs +++ b/src/fsharp/FindUnsolved.fs @@ -199,9 +199,9 @@ let accTycon cenv env (tycon:Tycon) = abstractSlotValsOfTycons [tycon] |> List.iter (accVal cenv env) tycon.AllFieldsArray |> Array.iter (accTyconRecdField cenv env tycon) if tycon.IsUnionTycon then (* This covers finite unions. *) - tycon.UnionCasesAsList |> List.iter (fun uc -> + tycon.UnionCasesArray |> Array.iter (fun uc -> accAttribs cenv env uc.Attribs - uc.RecdFields |> List.iter (accTyconRecdField cenv env tycon)) + uc.RecdFieldsArray |> Array.iter (accTyconRecdField cenv env tycon)) let accTycons cenv env tycons = List.iter (accTycon cenv env) tycons diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs index ca33e8c231d..014eab37c9d 100644 --- a/src/fsharp/IlxGen.fs +++ b/src/fsharp/IlxGen.fs @@ -1163,7 +1163,7 @@ and TypeDefsBuilder() = || not tdef.Fields.AsList.IsEmpty || not tdef.Events.AsList.IsEmpty || not tdef.Properties.AsList.IsEmpty - || not tdef.Methods.AsList.IsEmpty then + || not (Array.isEmpty tdef.Methods.AsArray) then yield tdef ] member b.FindTypeDefBuilder(nm) = @@ -6528,7 +6528,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = (match ilTypeDefKind with ILTypeDefKind.ValueType -> true | _ -> false) && // All structs are sequential by default // Structs with no instance fields get size 1, pack 0 - tycon.AllFieldsAsList |> List.forall (fun f -> f.IsStatic) + tycon.AllFieldsArray |> Array.forall (fun f -> f.IsStatic) isEmptyStruct && cenv.opts.workAroundReflectionEmitBugs && not tycon.TyparsNoRange.IsEmpty @@ -6536,7 +6536,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = let isCLIMutable = (TryFindFSharpBoolAttribute g g.attrib_CLIMutableAttribute tycon.Attribs = Some true) let fieldSummaries = - [ for fspec in tycon.AllFieldsAsList do + [ for fspec in tycon.AllFieldsArray do let useGenuineField = useGenuineField tycon fspec @@ -6854,7 +6854,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon:Tycon) = // All structs are sequential by default // Structs with no instance fields get size 1, pack 0 - if tycon.AllFieldsAsList |> List.exists (fun f -> not f.IsStatic) || + if tycon.AllFieldsArray |> Array.exists (fun f -> not f.IsStatic) || // Reflection emit doesn't let us emit 'pack' and 'size' for generic structs. // In that case we generate a dummy field instead (cenv.opts.workAroundReflectionEmitBugs && not tycon.TyparsNoRange.IsEmpty) diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs index 47b76348932..731912bf440 100644 --- a/src/fsharp/NameResolution.fs +++ b/src/fsharp/NameResolution.fs @@ -1540,11 +1540,11 @@ type TcResultsSinkImpl(g, ?source: string) = let positions = [| yield 0 - for i in 0..source.Length-1 do - let c = source.[i] - if c = '\r' && i + 1 < source.Length && source.[i+1] = '\n' then () - elif c = '\r' then yield i + 1 - if c = '\n' then yield i + 1 + for i in 1..source.Length do + let c = source.[i-1] + if c = '\r' && i < source.Length && source.[i] = '\n' then () + elif c = '\r' then yield i + elif c = '\n' then yield i yield source.Length |] { Source = source diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index 8c56e326239..617808b8beb 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -2142,9 +2142,9 @@ let CheckEntityDefn cenv env (tycon:Entity) = superOfTycon g tycon |> CheckTypeNoByrefs cenv env m if tycon.IsUnionTycon then - tycon.UnionCasesAsList |> List.iter (fun uc -> + tycon.UnionCasesArray |> Array.iter (fun uc -> CheckAttribs cenv env uc.Attribs - uc.RecdFields |> List.iter (CheckRecdField true cenv env tycon)) + uc.RecdFieldsArray |> Array.iter (CheckRecdField true cenv env tycon)) // Access checks let access = AdjustAccess (IsHiddenTycon env.sigToImplRemapInfo tycon) (fun () -> tycon.CompilationPath) tycon.Accessibility diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index 4564de9a0a3..a03141f3147 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -36,16 +36,16 @@ type PickledDataWithReferences<'rawData> = { /// The data that uses a collection of CcuThunks internally RawData: 'rawData /// The assumptions that need to be fixed up - FixupThunks: list } + FixupThunks: CcuThunk [] } member x.Fixup loader = - x.FixupThunks |> List.iter (fun reqd -> reqd.Fixup(loader reqd.AssemblyName)) + x.FixupThunks |> Array.iter (fun reqd -> reqd.Fixup(loader reqd.AssemblyName)) x.RawData /// Like Fixup but loader may return None, in which case there is no fixup. member x.OptionalFixup loader = x.FixupThunks - |> List.iter(fun reqd-> + |> Array.iter(fun reqd-> match loader reqd.AssemblyName with | Some(loaded) -> reqd.Fixup(loaded) | None -> reqd.FixupOrphaned() ) @@ -484,12 +484,26 @@ let p_array_ext extraf f (x: 'T[]) st = | Some f -> f st p_array_core f x st - -let p_list f x st = p_array f (Array.ofList x) st +let p_list_core f (xs: 'T list) st = + for x in xs do + f x st + +let p_list f x st = + p_int (List.length x) st + p_list_core f x st -let p_listB f x st = p_arrayB f (Array.ofList x) st +let p_listB f x st = + p_intB (List.length x) st + p_list_core f x st -let p_list_ext extraf f x st = p_array_ext extraf f (Array.ofList x) st +let p_list_ext extraf f x st = + let n = List.length x + let n = if Option.isSome extraf then n ||| 0x80000000 else n + p_int n st + match extraf with + | None -> () + | Some f -> f st + p_list_core f x st let p_List f (x: 'T list) st = p_list f x st @@ -607,7 +621,10 @@ let u_array_revi f st = res // Mark up default constraints with a priority in reverse order: last gets 0 etc. See comment on TyparConstraint.DefaultsTo -let u_list_revi f st = Array.toList (u_array_revi f st) +let u_list_revi f st = + let n = u_int st + [ for i = 0 to n-1 do + yield f st (n-1-i) ] let u_wrap (f: 'U -> 'T) (u : 'U unpickler) : 'T unpickler = (fun st -> f (u st)) @@ -863,7 +880,7 @@ let unpickleObjWithDanglingCcus file ilscope (iILModule:ILModuleDef option) u (p check ilscope st1.itypars res - {RawData=data; FixupThunks=Array.toList ccuTab.itbl_rows } + {RawData=data; FixupThunks=ccuTab.itbl_rows } //========================================================================= @@ -1866,7 +1883,7 @@ and p_tycon_repr x st = // The leading "p_byte 1" and "p_byte 0" come from the F# 2.0 format, which used an option value at this point. match x with | TRecdRepr fs -> p_byte 1 st; p_byte 0 st; p_rfield_table fs st; false - | TUnionRepr x -> p_byte 1 st; p_byte 1 st; p_list p_unioncase_spec (Array.toList x.CasesTable.CasesByIndex) st; false + | TUnionRepr x -> p_byte 1 st; p_byte 1 st; p_array p_unioncase_spec (x.CasesTable.CasesByIndex) st; false | TAsmRepr ilty -> p_byte 1 st; p_byte 2 st; p_ILType ilty st; false | TFSharpObjectRepr r -> p_byte 1 st; p_byte 3 st; p_tycon_objmodel_data r st; false | TMeasureableRepr ty -> p_byte 1 st; p_byte 4 st; p_ty ty st; false @@ -1926,7 +1943,7 @@ and p_recdfield_spec x st = p_access x.rfield_access st and p_rfield_table x st = - p_list p_recdfield_spec (Array.toList x.FieldsByIndex) st + p_array p_recdfield_spec (x.FieldsByIndex) st and p_entity_spec_data (x:Entity) st = p_tyar_specs (x.entity_typars.Force(x.entity_range)) st diff --git a/src/fsharp/TastPickle.fsi b/src/fsharp/TastPickle.fsi index ebfefe9f249..bcf0955cbcc 100644 --- a/src/fsharp/TastPickle.fsi +++ b/src/fsharp/TastPickle.fsi @@ -18,7 +18,7 @@ type PickledDataWithReferences<'RawData> = { /// The data that uses a collection of CcuThunks internally RawData: 'RawData /// The assumptions that need to be fixed up - FixupThunks: list } + FixupThunks: CcuThunk [] } member Fixup : (CcuReference -> CcuThunk) -> 'RawData /// Like Fixup but loader may return None, in which case there is no fixup. diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index 9aedffe5d92..e2dcc8595f2 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -15977,7 +15977,7 @@ module EstablishTypeDefinitionCores = let fspecs = if structTycon.IsUnionTycon then [ for uc in structTycon.UnionCasesArray do - for c in uc.FieldTable.AllFieldsAsList do + for c in uc.FieldTable.FieldsByIndex do yield c] else structTycon.AllFieldsAsList diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs index 16bc225ca93..f21750b7834 100644 --- a/src/fsharp/fsc.fs +++ b/src/fsharp/fsc.fs @@ -329,9 +329,9 @@ module XmlDocWriter = if (hasDoc tc.XmlDoc) then tc.XmlDocSig <- XmlDocSigOfTycon [ptext; tc.CompiledName] for vref in tc.MembersOfFSharpTyconSorted do doValSig ptext vref.Deref - for uc in tc.UnionCasesAsList do + for uc in tc.UnionCasesArray do if (hasDoc uc.XmlDoc) then uc.XmlDocSig <- XmlDocSigOfUnionCase [ptext; tc.CompiledName; uc.Id.idText] - for rf in tc.AllFieldsAsList do + for rf in tc.AllFieldsArray do if (hasDoc rf.XmlDoc) then rf.XmlDocSig <- if tc.IsRecordTycon && (not rf.IsStatic) then @@ -380,9 +380,9 @@ module XmlDocWriter = addMember tc.XmlDocSig tc.XmlDoc for vref in tc.MembersOfFSharpTyconSorted do doVal vref.Deref - for uc in tc.UnionCasesAsList do + for uc in tc.UnionCasesArray do doUnionCase uc - for rf in tc.AllFieldsAsList do + for rf in tc.AllFieldsArray do doField rf let modulMember (m:ModuleOrNamespace) = addMember m.XmlDocSig m.XmlDoc From 638d78b5b789b14970c8c2e34584d0e568707230 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 14 Dec 2018 14:05:57 +0000 Subject: [PATCH 046/137] switch direction for function types --- src/fsharp/ConstraintSolver.fs | 5 +++-- src/fsharp/FSharp.Build/Fsc.fs | 2 +- src/fsharp/FSharp.Core/array.fs | 1 - src/fsharp/FSharp.Core/array2.fs | 1 - src/fsharp/FSharp.Core/list.fs | 1 - src/fsharp/FSharp.Core/option.fs | 6 ++---- src/fsharp/FSharp.Core/option.fsi | 12 ++++++------ src/fsharp/FSharp.Core/prim-types.fs | 8 ++++---- src/fsharp/FSharp.Core/prim-types.fsi | 13 +++++++------ src/fsharp/FSharp.Core/seq.fs | 1 - src/fsharp/FSharp.Core/seqcore.fs | 1 - src/fsharp/TypeChecker.fs | 12 ++++++++++-- src/fsharp/fsi/console.fs | 10 +++++----- .../BraceCompletionSessionProvider.fs | 2 +- vsintegration/src/FSharp.Editor/Common/Logging.fs | 2 +- .../src/FSharp.Editor/Common/RoslynHelpers.fs | 2 +- .../Navigation/NavigableSymbolsService.fs | 5 +++-- .../FSharp.Editor/QuickInfo/QuickInfoProvider.fs | 2 +- 18 files changed, 45 insertions(+), 41 deletions(-) diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 5c6dfddd3c7..20fb76049e4 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -1034,8 +1034,9 @@ and SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln origl1 origl2 = loop origl1 origl2 and SolveFunTypeEqn csenv ndeep m2 trace cxsln d1 d2 r1 r2 = trackErrors { - // TODO NULLNESS: consider flipping the actual and expected in argument position - do! SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln d1 d2 + // TODO NULLNESS: consider whether flipping the actual and expected in argument position + // causes other problems, e.g. better/worse diagnostics + do! SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln d2 d1 return! SolveTypeEqualsTypeKeepAbbrevsWithCxsln csenv ndeep m2 trace cxsln r1 r2 } diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs index 9002e075def..cac49646421 100644 --- a/src/fsharp/FSharp.Build/Fsc.fs +++ b/src/fsharp/FSharp.Build/Fsc.fs @@ -597,7 +597,7 @@ type public Fsc () as this = match dotnetFscCompilerPath with | null | "" -> () | NonNull dotnetFscCompilerPath -> - builder.AppendSwitch(dotnetFscCompilerPath) // TODO NULLNESS: why is this explicit instantiation needed? + builder.AppendSwitch(dotnetFscCompilerPath) builder.ToString() override fsc.GenerateResponseFileCommands() = diff --git a/src/fsharp/FSharp.Core/array.fs b/src/fsharp/FSharp.Core/array.fs index 74a104dbd40..53782d91d6a 100644 --- a/src/fsharp/FSharp.Core/array.fs +++ b/src/fsharp/FSharp.Core/array.fs @@ -13,7 +13,6 @@ namespace Microsoft.FSharp.Collections #if FX_RESHAPED_REFLECTION open System.Reflection #endif - #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this? /// Basic operations on arrays [] diff --git a/src/fsharp/FSharp.Core/array2.fs b/src/fsharp/FSharp.Core/array2.fs index 18f5f581791..d6836475f7e 100644 --- a/src/fsharp/FSharp.Core/array2.fs +++ b/src/fsharp/FSharp.Core/array2.fs @@ -9,7 +9,6 @@ namespace Microsoft.FSharp.Collections open Microsoft.FSharp.Core.Operators.Checked #nowarn "3218" // mismatch of parameter name where 'count1' --> 'length1' would shadow function in module of same name - #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this? [] [] diff --git a/src/fsharp/FSharp.Core/list.fs b/src/fsharp/FSharp.Core/list.fs index 1ab12649e63..6092567f1f4 100644 --- a/src/fsharp/FSharp.Core/list.fs +++ b/src/fsharp/FSharp.Core/list.fs @@ -12,7 +12,6 @@ namespace Microsoft.FSharp.Collections #if FX_RESHAPED_REFLECTION open System.Reflection #endif - #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this? [] [] diff --git a/src/fsharp/FSharp.Core/option.fs b/src/fsharp/FSharp.Core/option.fs index fbd8e764960..1c8907810b5 100644 --- a/src/fsharp/FSharp.Core/option.fs +++ b/src/fsharp/FSharp.Core/option.fs @@ -86,7 +86,6 @@ module Option = let ofNullable (value:System.Nullable<'T>) = if value.HasValue then Some value.Value else None #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE -// TODO NULLNESS: assess this change - is it a breaking change? [] let ofObj value = match value with null -> None | _ -> Some value @@ -98,7 +97,7 @@ module Option = match value with null -> None | _ -> Some value [] - let toObj (value: 'T option) : 'T? when 'T: not struct and 'T : not null = + let toObj (value: 'T option) : 'T? when 'T: not struct (* and 'T : not null *) = match value with None -> null | Some x -> x #endif @@ -183,7 +182,6 @@ module ValueOption = let ofNullable (value:System.Nullable<'T>) = if value.HasValue then ValueSome value.Value else ValueNone #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - // TODO NULLNESS: assess this change - is it a breaking change? [] let ofObj value = match value with null -> ValueNone | _ -> ValueSome value @@ -195,6 +193,6 @@ module ValueOption = match value with null -> ValueNone | _ -> ValueSome value [] - let toObj (value : 'T voption) : 'T? when 'T: not struct and 'T : not null = + let toObj (value : 'T voption) : 'T? when 'T: not struct (* and 'T : not null *) = match value with ValueNone -> null | ValueSome x -> x #endif \ No newline at end of file diff --git a/src/fsharp/FSharp.Core/option.fsi b/src/fsharp/FSharp.Core/option.fsi index 0ab76897b3c..2e5a4ed2e3f 100644 --- a/src/fsharp/FSharp.Core/option.fsi +++ b/src/fsharp/FSharp.Core/option.fsi @@ -191,9 +191,9 @@ module Option = /// The result option. [] #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - // TODO NULLNESS: assess this change - is it a breaking change? val ofObj: value: 'T -> 'T option when 'T : null #else + // TODO NULLNESS: assess this change - is it a breaking change? val ofObj: value: 'T? -> 'T option when 'T : not struct and 'T : not null #endif @@ -202,10 +202,10 @@ module Option = /// The result value, which is null if the input was None. [] #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - // TODO NULLNESS: assess this change - is it a breaking change? val toObj: value: 'T option -> 'T when 'T : null #else - val toObj: value: 'T option -> 'T? when 'T : not struct and 'T : not null + // TODO NULLNESS: assess this change - is it a breaking change? + val toObj: value: 'T option -> 'T? when 'T : not struct (* and 'T : not null *) #endif /// Basic operations on value options. @@ -390,9 +390,9 @@ module ValueOption = /// The result value option. [] #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - // TODO NULLNESS: assess this change - is it a breaking change? val ofObj: value: 'T -> 'T voption when 'T : null #else + // TODO NULLNESS: assess this change - is it a breaking change? val ofObj: value: 'T? -> 'T voption when 'T : not struct and 'T : not null #endif @@ -401,8 +401,8 @@ module ValueOption = /// The result value, which is null if the input was ValueNone. [] #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - // TODO NULLNESS: assess this change - is it a breaking change? val toObj: value: 'T voption -> 'T when 'T : null #else - val toObj: value: 'T voption -> 'T? when 'T : not struct and 'T : not null + // TODO NULLNESS: assess this change - is it a breaking change? + val toObj: value: 'T voption -> 'T? when 'T : not struct (* and 'T : not null *) #endif diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index c744092dbde..1a9440afe99 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3360,7 +3360,7 @@ namespace Microsoft.FSharp.Core let inline isNullV (value : Nullable<'T>) = not value.HasValue [] - let inline nonNull (value : 'T? when 'T : not struct) = + let inline nonNull (value : 'T? when 'T : not struct and 'T : not null) = match box value with | null -> raise (System.NullReferenceException()) | _ -> (# "" value : 'T #) @@ -3373,7 +3373,7 @@ namespace Microsoft.FSharp.Core raise (System.NullReferenceException()) [] - let inline (|Null|NotNull|) (value : 'T?) = + let inline (|Null|NotNull|) (value : 'T? when 'T : not null) = match value with | null -> Null () | _ -> NotNull (# "" value : 'T #) @@ -3384,7 +3384,7 @@ namespace Microsoft.FSharp.Core else NullV () [] - let inline (|NonNull|) (value : 'T?) = + let inline (|NonNull|) (value : 'T? when 'T : not null) = match box value with | null -> raise (System.NullReferenceException()) | _ -> (# "" value : 'T #) @@ -3447,7 +3447,7 @@ namespace Microsoft.FSharp.Core #if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE [] - let inline nullArgCheck (argumentName:string) (value: 'T? when 'T : not struct) = + let inline nullArgCheck (argumentName:string) (value: 'T? when 'T : not struct and 'T : not null) = match value with | null -> raise (new System.ArgumentNullException(argumentName)) | _ -> (# "" value : 'T #) diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index 2d8754578e8..b27853b4d8f 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -2280,14 +2280,15 @@ namespace Microsoft.FSharp.Core /// The value to check. /// True when value is null, false otherwise. [] - val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null // TODO NULLNESS addition of 'T : not struct is compat? + // TODO NULLNESS: assess this change - is it a breaking change? + val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null #if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE /// Determines whether the given value is null. /// The value to check. /// A choice indicating whether the value is null or not-null. [] - val inline (|Null|NotNull|) : value: 'T? -> Choice + val inline (|Null|NotNull|) : value: 'T? -> Choice when 'T : not null /// Determines whether the given value is null. /// The value to check. @@ -2299,7 +2300,7 @@ namespace Microsoft.FSharp.Core /// The value to check. /// The non-null value. [] - val inline (|NonNull|) : value: 'T? -> 'T + val inline (|NonNull|) : value: 'T? -> 'T when 'T : not null /// When used in a pattern checks the given value is not null. /// The value to check. @@ -2330,7 +2331,7 @@ namespace Microsoft.FSharp.Core /// The value to check. /// True when value is null, false otherwise. [] - val inline nonNull : value: 'T? -> 'T when 'T : not struct + val inline nonNull : value: 'T? -> 'T when 'T : not struct and 'T : not null /// Asserts that the value is non-null. /// The value to check. @@ -2342,7 +2343,7 @@ namespace Microsoft.FSharp.Core /// The value to check. /// True when value is null, false otherwise. [] - val inline withNull : value:'T -> 'T? when 'T : not struct + val inline withNull : value:'T -> 'T? when 'T : not struct (* and 'T : not null *) /// Asserts that the value is non-null. /// The value to check. @@ -2376,7 +2377,7 @@ namespace Microsoft.FSharp.Core /// The argument name. /// The result value. [] - val inline nullArgCheck : argumentName:string -> 'T? -> 'T when 'T : not struct + val inline nullArgCheck : argumentName:string -> 'T? -> 'T when 'T : not struct and 'T : not null #endif /// Throw a System.InvalidOperationException exception diff --git a/src/fsharp/FSharp.Core/seq.fs b/src/fsharp/FSharp.Core/seq.fs index db97d3a51d2..a5b6fd34387 100644 --- a/src/fsharp/FSharp.Core/seq.fs +++ b/src/fsharp/FSharp.Core/seq.fs @@ -2,7 +2,6 @@ namespace Microsoft.FSharp.Collections #nowarn "52" // The value has been copied to ensure the original is not mutated by this operation - #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this? open System open System.Diagnostics diff --git a/src/fsharp/FSharp.Core/seqcore.fs b/src/fsharp/FSharp.Core/seqcore.fs index cdaeb2b4dd7..71bfc1601ca 100644 --- a/src/fsharp/FSharp.Core/seqcore.fs +++ b/src/fsharp/FSharp.Core/seqcore.fs @@ -2,7 +2,6 @@ namespace Microsoft.FSharp.Collections #nowarn "52" // The value has been copied to ensure the original is not mutated by this operation - #nowarn "3245" // nullness on box-match-null TODO NULLNESS: don't give a warning on this? open System open System.Diagnostics diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index e2dcc8595f2..28fd232b430 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -4725,8 +4725,16 @@ and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscoped innerTyC, tpenv | Some innerTyCWithNull -> - // The inner type is not allowed to support null or use null as a representation value - AddCxTypeDefnNotSupportsNull env.DisplayEnv cenv.css m NoTrace innerTyC + // The inner type is not allowed to support null or use null as a representation value. + // For example "int option?" is not allowed, not "string??". + // + // For variable types in FSharp.Core we make an exception because we must allow + // val toObj: value: 'T option -> 'T? when 'T : not struct (* and 'T : not null *) + // wihout implying 'T is not null. This is because it is legitimate to use this + // function to "collapse" null and obj-null-coming-from-option using such a function. + + if g.compilingFslib && not (isTyparTy g innerTyC) then + AddCxTypeDefnNotSupportsNull env.DisplayEnv cenv.css m NoTrace innerTyC innerTyCWithNull, tpenv diff --git a/src/fsharp/fsi/console.fs b/src/fsharp/fsi/console.fs index 2ff0759224c..ba90744f285 100644 --- a/src/fsharp/fsi/console.fs +++ b/src/fsharp/fsi/console.fs @@ -55,23 +55,23 @@ type internal History() = member x.Clear() = list.Clear(); current <- -1 #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - member x.Add (line: string) = // TODO NULLNESS: explicit type annotation shouldn't be needed + member x.Add (line: string) = #else - member x.Add (line: string?) = // TODO NULLNESS: explicit type annotation shouldn't be needed + member x.Add (line: string?) = #endif match line with | null | "" -> () | NonNull line -> list.Add(line) #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - member x.AddLast (line: string) = // TODO NULLNESS: explicit type annotation shouldn't be needed + member x.AddLast (line: string) = #else - member x.AddLast (line: string?) = // TODO NULLNESS: explicit type annotation shouldn't be needed + member x.AddLast (line: string?) = #endif match line with | null | "" -> () | NonNull line -> - list.Add(line) // TODO NULLNESS: explicit instantiation shouldn't be needed + list.Add(line) current <- list.Count member x.Previous() = diff --git a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs index 8e58944eeaf..f4dd4d29dfd 100644 --- a/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs +++ b/vsintegration/src/FSharp.Editor/AutomaticCompletion/BraceCompletionSessionProvider.fs @@ -530,7 +530,7 @@ type BraceCompletionSessionProvider let! sessionFactory = document.TryGetLanguageService() let! session = sessionFactory.TryCreateSession(document, openingPoint.Position, openingBrace, CancellationToken.None) - |> Option.ofObj + |> Option.ofObj let undoHistory = undoManager.GetTextBufferUndoManager(textView.TextBuffer).TextBufferUndoHistory return BraceCompletionSession( diff --git a/vsintegration/src/FSharp.Editor/Common/Logging.fs b/vsintegration/src/FSharp.Editor/Common/Logging.fs index 768c8835672..ef3f72481e0 100644 --- a/vsintegration/src/FSharp.Editor/Common/Logging.fs +++ b/vsintegration/src/FSharp.Editor/Common/Logging.fs @@ -31,7 +31,7 @@ type [] Logger [] ([)>] serviceProvider: IServiceProvider) = let outputWindow = serviceProvider.GetService() - |> Option.ofObj // TODO NULLNESS - this explicit annotation should not be needed + |> Option.ofObj let createPane () = outputWindow |> Option.iter (fun x -> diff --git a/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs b/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs index cd095767cc4..a3d499da0c8 100644 --- a/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs +++ b/vsintegration/src/FSharp.Editor/Common/RoslynHelpers.fs @@ -141,7 +141,7 @@ module internal RoslynHelpers = // Normalize the error message into the same format that we will receive it from the compiler. // This ensures that IntelliSense and Compiler errors in the 'Error List' are de-duplicated. // (i.e the same error does not appear twice, where the only difference is the line endings.) - let normalizedMessage = error.Message |> withNull |> ErrorLogger.NormalizeErrorString |> ErrorLogger.NewlineifyErrorString + let normalizedMessage = error.Message |> ErrorLogger.NormalizeErrorString |> ErrorLogger.NewlineifyErrorString let id = "FS" + error.ErrorNumber.ToString("0000") let emptyString = LocalizableString.op_Implicit("") diff --git a/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs b/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs index 6624e75a2d7..933b43e20b3 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/NavigableSymbolsService.fs @@ -17,7 +17,6 @@ open Microsoft.VisualStudio.Shell.Interop open Microsoft.VisualStudio.Utilities open Microsoft.VisualStudio.Shell -[] type internal FSharpNavigableSymbol(item: INavigableItem, span: SnapshotSpan, gtd: GoToDefinition, statusBar: StatusBar) = interface INavigableSymbol with member __.Navigate(_: INavigableRelationship) = @@ -80,7 +79,9 @@ type internal FSharpNavigableSymbolSource(checkerProvider: FSharpCheckerProvider // The NavigableSymbols API accepts 'null' when there's nothing to navigate to. return null } - |> Async.map Option.toObj // TODO NULLNESS - why is this annotation needed? + // Async + // --> Async + |> Async.map Option.toObj |> RoslynHelpers.StartAsyncAsTask cancellationToken member __.Dispose() = diff --git a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs index 6d4a155184a..f9d7af372c4 100644 --- a/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs +++ b/vsintegration/src/FSharp.Editor/QuickInfo/QuickInfoProvider.fs @@ -249,7 +249,7 @@ type internal FSharpAsyncQuickInfoSource let content = QuickInfoViewProvider.provideContent(imageId, mainDescription, docs, navigation) let span = getTrackingSpan targetQuickInfo.Span return QuickInfoItem(span, content) - } |> Async.map Option.toObj // TODO NULLNESS - why is this annotation needed? + } |> Async.map Option.toObj |> RoslynHelpers.StartAsyncAsTask cancellationToken [)>] From 36fac8395d9975c6393200b90f1123079c36ff72 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 14 Dec 2018 14:33:43 +0000 Subject: [PATCH 047/137] update baselines --- tests/fsharp/typecheck/sigs/neg04.bsl | 4 ++-- tests/fsharp/typecheck/sigs/neg20.bsl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/fsharp/typecheck/sigs/neg04.bsl b/tests/fsharp/typecheck/sigs/neg04.bsl index 058e3226a02..791b2cc2e61 100644 --- a/tests/fsharp/typecheck/sigs/neg04.bsl +++ b/tests/fsharp/typecheck/sigs/neg04.bsl @@ -31,7 +31,7 @@ neg04.fs(47,30,47,51): typecheck error FS0001: Type mismatch. Expecting a 'seq<'a> -> 'f' but given a ''g list -> 'h' -The type 'seq<'a>' does not match the type ''f list' +The type ''a list' does not match the type 'seq<'b>' neg04.fs(47,49,47,51): typecheck error FS0784: This numeric literal requires that a module 'NumericLiteralN' defining functions FromZero, FromOne, FromInt32, FromInt64 and FromString be in scope @@ -39,7 +39,7 @@ neg04.fs(47,30,47,51): typecheck error FS0001: Type mismatch. Expecting a 'seq<'a> -> 'f' but given a ''g list -> 'h' -The type 'seq<'a>' does not match the type ''f list' +The type ''a list' does not match the type 'seq<'c>' neg04.fs(61,25,61,40): typecheck error FS0001: This expression was expected to have type 'ClassType1' diff --git a/tests/fsharp/typecheck/sigs/neg20.bsl b/tests/fsharp/typecheck/sigs/neg20.bsl index f9ec6909780..61fae1bba36 100644 --- a/tests/fsharp/typecheck/sigs/neg20.bsl +++ b/tests/fsharp/typecheck/sigs/neg20.bsl @@ -135,19 +135,19 @@ neg20.fs(108,12,108,16): typecheck error FS0001: Type mismatch. Expecting a 'B * B -> 'a' but given a 'A * A -> Data' -The type 'B' does not match the type 'A' +The type 'A' does not match the type 'B' neg20.fs(109,12,109,16): typecheck error FS0001: Type mismatch. Expecting a 'A * B -> 'a' but given a 'A * A -> Data' -The type 'B' does not match the type 'A' +The type 'A' does not match the type 'B' neg20.fs(110,12,110,16): typecheck error FS0001: Type mismatch. Expecting a 'B * A -> 'a' but given a 'A * A -> Data' -The type 'B' does not match the type 'A' +The type 'A' does not match the type 'B' neg20.fs(128,19,128,22): typecheck error FS0001: This expression was expected to have type 'string' From fc2efc6f45a8297ca7d98ff58bab0216932a6ee3 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 14 Dec 2018 15:01:14 +0000 Subject: [PATCH 048/137] integrate master --- FSharp.Profiles.props | 3 +++ src/fsharp/FSharp.Build/FSharp.Build.fsproj | 2 +- src/fsharp/FSharp.Build/Fsi.fs | 19 ++++++++++++++----- .../FSharp.Compiler.Private.fsproj | 2 +- .../FSharp.Compiler.Server.Shared.fsproj | 2 +- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 1 - src/fsharp/fsi/Fsi.fsproj | 2 +- src/utils/reshapedreflection.fs | 2 +- 8 files changed, 22 insertions(+), 11 deletions(-) diff --git a/FSharp.Profiles.props b/FSharp.Profiles.props index 2e2edb73702..496dc2e4d20 100644 --- a/FSharp.Profiles.props +++ b/FSharp.Profiles.props @@ -1,6 +1,9 @@ + + BUILDING_WITH_LKG;$(DefineConstants) + $(DefineConstants);CROSS_PLATFORM_COMPILER diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index a68d7a356c8..f3789f7d77c 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -9,7 +9,7 @@ $(NoWarn);45;55;62;75;1204 true {702A7979-BCF9-4C41-853E-3ADFC9897890} - $(OtherFlags) --checknulls + $(OtherFlags) --checknulls $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 true diff --git a/src/fsharp/FSharp.Build/Fsi.fs b/src/fsharp/FSharp.Build/Fsi.fs index f30a5bb2fb3..abad77bdeef 100644 --- a/src/fsharp/FSharp.Build/Fsi.fs +++ b/src/fsharp/FSharp.Build/Fsi.fs @@ -15,6 +15,12 @@ open Internal.Utilities open Microsoft.FSharp.Core.ReflectionAdapters #endif +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE +[] +module UtilsFsi = + let inline (|NonNull|) x = match x with null -> raise (NullReferenceException()) | v -> v +#endif + //There are a lot of flags on fsi.exe. //For now, not all of them are represented in the "Fsi class" object model. //The goal is to have the most common/important flags available via the Fsi class, and the @@ -95,7 +101,7 @@ type public Fsi () as this = // NoWarn match disabledWarnings with | null -> () - | _ -> builder.AppendSwitchIfNotNull("--nowarn:", disabledWarnings.Split([|' '; ';'; ','; '\r'; '\n'|], StringSplitOptions.RemoveEmptyEntries), ",") + | NonNull disabledWarnings -> builder.AppendSwitchesIfNotNull("--nowarn:", disabledWarnings.Split([|' '; ';'; ','; '\r'; '\n'|], StringSplitOptions.RemoveEmptyEntries), ",") builder.AppendSwitchIfNotNull("--warn:", warningLevel) @@ -105,13 +111,13 @@ type public Fsi () as this = let warningsAsErrorsArray = match warningsAsErrors with | null -> [| "76" |] - | _ -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) + | NonNull warningsAsErrors -> (warningsAsErrors + " 76 ").Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries) - builder.AppendSwitchIfNotNull("--warnaserror:", warningsAsErrorsArray, ",") + builder.AppendSwitchesIfNotNull("--warnaserror:", warningsAsErrorsArray, ",") match warningsNotAsErrors with | null -> () - | _ -> builder.AppendSwitchIfNotNull("--warnaserror-:", warningsNotAsErrors.Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",") + | NonNull warningsNotAsErrors -> builder.AppendSwitchesIfNotNull("--warnaserror-:", warningsNotAsErrors.Split([|' '; ';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",") builder.AppendSwitchIfNotNull("--LCID:", vslcid) @@ -315,7 +321,10 @@ type public Fsi () as this = override fsi.GenerateCommandLineCommands() = let builder = new FSharpCommandLineBuilder() - if not (String.IsNullOrEmpty(dotnetFsiCompilerPath)) then builder.AppendSwitch(dotnetFsiCompilerPath) + match dotnetFsiCompilerPath with + | null | "" -> () + | NonNull dotnetFsiCompilerPath -> + builder.AppendSwitch(dotnetFsiCompilerPath) builder.ToString() override fsi.GenerateResponseFileCommands() = diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index 94b3486de37..aae6bd75951 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -11,7 +11,7 @@ 0x06800000 $(OtherFlags) /warnon:1182 $(OtherFlags) --maxerrors:10000 - $(OtherFlags) /checknulls + $(OtherFlags) --checknulls $(DefineConstants);COMPILER $(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1 true diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 6ee4b373b85..e3aa05f9554 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -6,7 +6,7 @@ net46 FSharp.Compiler.Server.Shared v4.6 - $(OtherFlags) --checknulls + $(OtherFlags) --checknulls true diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index bb6ca2d0bf4..d98625e347e 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -18,7 +18,6 @@ $(OtherFlags) --compiling-fslib-40 $(DefineConstants);FSHARP_CORE - BUILDING_WITH_LKG;$(DefineConstants) $(OtherFlags) --warnon:1182 --compiling-fslib --compiling-fslib-40 --maxerrors:20 --extraoptimizationloops:1 diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj index 0e6d9965e62..9600ea8035f 100644 --- a/src/fsharp/fsi/Fsi.fsproj +++ b/src/fsharp/fsi/Fsi.fsproj @@ -9,7 +9,7 @@ fsi $(NoWarn);45;55;62;75;1204 true - $(OtherFlags) --warnon:1182 --checknulls + $(OtherFlags) --checknulls $(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1 fsi.res true diff --git a/src/utils/reshapedreflection.fs b/src/utils/reshapedreflection.fs index 22d5955f922..8d5aedec90d 100644 --- a/src/utils/reshapedreflection.fs +++ b/src/utils/reshapedreflection.fs @@ -406,7 +406,7 @@ module internal ReflectionAdapters = let s = this.FullyQualifiedName s.GetHashCode() -#if COMPILER // This part includes global state in globalLoadContext. Only include this support "once", i.e. when compiling FSharp.Compiler.Private.dll, FSharp.Compiler.Service.dll, fsc-proto.exe +#if COMPILER // This part includes global state in globalLoadContext. Only include this support "once", i.e. when compiling FSharp.Compiler.Private.dll, FSharp.Compiler.Service.dll type CustomAssemblyResolver() = inherit System.Runtime.Loader.AssemblyLoadContext() From 994d74c185de65e23e7604859c6049092b7c0bea Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 14 Dec 2018 15:21:53 +0000 Subject: [PATCH 049/137] fix baseline --- .../Conformance/Expressions/BindingExpressions/Binding/in05.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs b/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs index eaefd989c14..3f1a3b3695d 100644 --- a/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs +++ b/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs @@ -4,7 +4,7 @@ // I'm adding these cases to make sure we do not accidentally change the behavior from version to version // Eventually, we will deprecated them - and the specs will be updated. //The type 'int' does not match the type 'unit'$ -//Type mismatch\. Expecting a. ''a -> 'b' .but given a. ''a -> unit' .The type 'int' does not match the type 'unit'$ +//Type mismatch\. Expecting a. ''a -> unit' .but given a. ''a -> 'b' .The type 'int' does not match the type 'unit'$ //The result of this expression has type 'bool' and is implicitly ignored\. Consider using 'ignore' to discard this value explicitly, e\.g\. 'expr \|> ignore', or 'let' to bind the result to a name, e\.g\. 'let result = expr'.$ module E = let a = 3 in From f8d814ee2c2ec095ea7749413dbcc3d7017274f1 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 9 Jan 2019 13:31:24 +0000 Subject: [PATCH 050/137] update files --- .../FSharp.Compiler.Private/FSComp.fs | 1282 ++++++++--------- .../FSharp.Compiler.Private/FSComp.resx | 60 +- 2 files changed, 629 insertions(+), 713 deletions(-) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index 6fe336ced15..d857a04d533 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -2611,1830 +2611,1794 @@ type internal SR private() = /// Reference an assembly (Short form: -r) /// (Originally from ..\FSComp.txt:843) static member optsReference() = (GetStringFunc("optsReference",",,,") ) - /// Specify a Win32 resource file (.res) + /// Reference an assembly or diretory containing a design time tool (Short form: -t) /// (Originally from ..\FSComp.txt:844) + static member optsCompilerTool() = (GetStringFunc("optsCompilerTool",",,,") ) + /// Specify a Win32 resource file (.res) + /// (Originally from ..\FSComp.txt:845) static member optsWin32res() = (GetStringFunc("optsWin32res",",,,") ) /// Specify a Win32 manifest file - /// (Originally from ..\FSComp.txt:845) + /// (Originally from ..\FSComp.txt:846) static member optsWin32manifest() = (GetStringFunc("optsWin32manifest",",,,") ) /// Do not include the default Win32 manifest - /// (Originally from ..\FSComp.txt:846) + /// (Originally from ..\FSComp.txt:847) static member optsNowin32manifest() = (GetStringFunc("optsNowin32manifest",",,,") ) /// Embed all source files in the portable PDB file - /// (Originally from ..\FSComp.txt:847) + /// (Originally from ..\FSComp.txt:848) static member optsEmbedAllSource() = (GetStringFunc("optsEmbedAllSource",",,,") ) /// Embed specific source files in the portable PDB file - /// (Originally from ..\FSComp.txt:848) + /// (Originally from ..\FSComp.txt:849) static member optsEmbedSource() = (GetStringFunc("optsEmbedSource",",,,") ) /// Source link information file to embed in the portable PDB file - /// (Originally from ..\FSComp.txt:849) + /// (Originally from ..\FSComp.txt:850) static member optsSourceLink() = (GetStringFunc("optsSourceLink",",,,") ) /// --embed switch only supported when emitting a Portable PDB (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:850) + /// (Originally from ..\FSComp.txt:851) static member optsEmbeddedSourceRequirePortablePDBs() = (1501, GetStringFunc("optsEmbeddedSourceRequirePortablePDBs",",,,") ) /// --sourcelink switch only supported when emitting a Portable PDB (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:851) + /// (Originally from ..\FSComp.txt:852) static member optsSourceLinkRequirePortablePDBs() = (1502, GetStringFunc("optsSourceLinkRequirePortablePDBs",",,,") ) /// Source file is too large to embed in a portable PDB - /// (Originally from ..\FSComp.txt:852) + /// (Originally from ..\FSComp.txt:853) static member srcFileTooLarge() = (GetStringFunc("srcFileTooLarge",",,,") ) /// Embed the specified managed resource - /// (Originally from ..\FSComp.txt:853) + /// (Originally from ..\FSComp.txt:854) static member optsResource() = (GetStringFunc("optsResource",",,,") ) /// Link the specified resource to this assembly where the resinfo format is [,[,public|private]] - /// (Originally from ..\FSComp.txt:854) + /// (Originally from ..\FSComp.txt:855) static member optsLinkresource() = (GetStringFunc("optsLinkresource",",,,") ) /// Emit debug information (Short form: -g) - /// (Originally from ..\FSComp.txt:855) + /// (Originally from ..\FSComp.txt:856) static member optsDebugPM() = (GetStringFunc("optsDebugPM",",,,") ) /// Specify debugging type: full, portable, embedded, pdbonly. ('%s' is the default if no debuggging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - /// (Originally from ..\FSComp.txt:856) + /// (Originally from ..\FSComp.txt:857) static member optsDebug(a0 : System.String) = (GetStringFunc("optsDebug",",,,%s,,,") a0) /// Enable optimizations (Short form: -O) - /// (Originally from ..\FSComp.txt:857) + /// (Originally from ..\FSComp.txt:858) static member optsOptimize() = (GetStringFunc("optsOptimize",",,,") ) /// Enable or disable tailcalls - /// (Originally from ..\FSComp.txt:858) + /// (Originally from ..\FSComp.txt:859) static member optsTailcalls() = (GetStringFunc("optsTailcalls",",,,") ) /// Produce a deterministic assembly (including module version GUID and timestamp) - /// (Originally from ..\FSComp.txt:859) + /// (Originally from ..\FSComp.txt:860) static member optsDeterministic() = (GetStringFunc("optsDeterministic",",,,") ) /// Enable or disable cross-module optimizations - /// (Originally from ..\FSComp.txt:860) + /// (Originally from ..\FSComp.txt:861) static member optsCrossoptimize() = (GetStringFunc("optsCrossoptimize",",,,") ) /// Report all warnings as errors - /// (Originally from ..\FSComp.txt:861) + /// (Originally from ..\FSComp.txt:862) static member optsWarnaserrorPM() = (GetStringFunc("optsWarnaserrorPM",",,,") ) /// Report specific warnings as errors - /// (Originally from ..\FSComp.txt:862) + /// (Originally from ..\FSComp.txt:863) static member optsWarnaserror() = (GetStringFunc("optsWarnaserror",",,,") ) /// Set a warning level (0-5) - /// (Originally from ..\FSComp.txt:863) + /// (Originally from ..\FSComp.txt:864) static member optsWarn() = (GetStringFunc("optsWarn",",,,") ) /// Disable specific warning messages - /// (Originally from ..\FSComp.txt:864) + /// (Originally from ..\FSComp.txt:865) static member optsNowarn() = (GetStringFunc("optsNowarn",",,,") ) /// Enable specific warnings that may be off by default - /// (Originally from ..\FSComp.txt:865) + /// (Originally from ..\FSComp.txt:866) static member optsWarnOn() = (GetStringFunc("optsWarnOn",",,,") ) /// Generate overflow checks - /// (Originally from ..\FSComp.txt:866) + /// (Originally from ..\FSComp.txt:867) static member optsChecked() = (GetStringFunc("optsChecked",",,,") ) /// Define conditional compilation symbols (Short form: -d) - /// (Originally from ..\FSComp.txt:867) + /// (Originally from ..\FSComp.txt:868) static member optsDefine() = (GetStringFunc("optsDefine",",,,") ) /// Ignore ML compatibility warnings - /// (Originally from ..\FSComp.txt:868) + /// (Originally from ..\FSComp.txt:869) static member optsMlcompatibility() = (GetStringFunc("optsMlcompatibility",",,,") ) /// Suppress compiler copyright message - /// (Originally from ..\FSComp.txt:869) + /// (Originally from ..\FSComp.txt:870) static member optsNologo() = (GetStringFunc("optsNologo",",,,") ) /// Display this usage message (Short form: -?) - /// (Originally from ..\FSComp.txt:870) + /// (Originally from ..\FSComp.txt:871) static member optsHelp() = (GetStringFunc("optsHelp",",,,") ) /// Read response file for more options - /// (Originally from ..\FSComp.txt:871) + /// (Originally from ..\FSComp.txt:872) static member optsResponseFile() = (GetStringFunc("optsResponseFile",",,,") ) /// Specify the codepage used to read source files - /// (Originally from ..\FSComp.txt:872) + /// (Originally from ..\FSComp.txt:873) static member optsCodepage() = (GetStringFunc("optsCodepage",",,,") ) /// Output messages in UTF-8 encoding - /// (Originally from ..\FSComp.txt:873) + /// (Originally from ..\FSComp.txt:874) static member optsUtf8output() = (GetStringFunc("optsUtf8output",",,,") ) /// Output messages with fully qualified paths - /// (Originally from ..\FSComp.txt:874) + /// (Originally from ..\FSComp.txt:875) static member optsFullpaths() = (GetStringFunc("optsFullpaths",",,,") ) /// Specify a directory for the include path which is used to resolve source files and assemblies (Short form: -I) - /// (Originally from ..\FSComp.txt:875) + /// (Originally from ..\FSComp.txt:876) static member optsLib() = (GetStringFunc("optsLib",",,,") ) /// Base address for the library to be built - /// (Originally from ..\FSComp.txt:876) + /// (Originally from ..\FSComp.txt:877) static member optsBaseaddress() = (GetStringFunc("optsBaseaddress",",,,") ) /// Do not reference the default CLI assemblies by default - /// (Originally from ..\FSComp.txt:877) + /// (Originally from ..\FSComp.txt:878) static member optsNoframework() = (GetStringFunc("optsNoframework",",,,") ) /// Statically link the F# library and all referenced DLLs that depend on it into the assembly being generated - /// (Originally from ..\FSComp.txt:878) + /// (Originally from ..\FSComp.txt:879) static member optsStandalone() = (GetStringFunc("optsStandalone",",,,") ) /// Statically link the given assembly and all referenced DLLs that depend on this assembly. Use an assembly name e.g. mylib, not a DLL name. - /// (Originally from ..\FSComp.txt:879) + /// (Originally from ..\FSComp.txt:880) static member optsStaticlink() = (GetStringFunc("optsStaticlink",",,,") ) /// Use a resident background compilation service to improve compiler startup times. - /// (Originally from ..\FSComp.txt:880) + /// (Originally from ..\FSComp.txt:881) static member optsResident() = (GetStringFunc("optsResident",",,,") ) /// Name the output debug file - /// (Originally from ..\FSComp.txt:881) + /// (Originally from ..\FSComp.txt:882) static member optsPdb() = (GetStringFunc("optsPdb",",,,") ) /// Resolve assembly references using directory-based rules rather than MSBuild resolution - /// (Originally from ..\FSComp.txt:882) + /// (Originally from ..\FSComp.txt:883) static member optsSimpleresolution() = (GetStringFunc("optsSimpleresolution",",,,") ) /// Unrecognized target '%s', expected 'exe', 'winexe', 'library' or 'module' - /// (Originally from ..\FSComp.txt:883) + /// (Originally from ..\FSComp.txt:884) static member optsUnrecognizedTarget(a0 : System.String) = (1048, GetStringFunc("optsUnrecognizedTarget",",,,%s,,,") a0) /// Unrecognized debug type '%s', expected 'pdbonly' or 'full' - /// (Originally from ..\FSComp.txt:884) + /// (Originally from ..\FSComp.txt:885) static member optsUnrecognizedDebugType(a0 : System.String) = (1049, GetStringFunc("optsUnrecognizedDebugType",",,,%s,,,") a0) /// Invalid warning level '%d' - /// (Originally from ..\FSComp.txt:885) + /// (Originally from ..\FSComp.txt:886) static member optsInvalidWarningLevel(a0 : System.Int32) = (1050, GetStringFunc("optsInvalidWarningLevel",",,,%d,,,") a0) /// Short form of '%s' - /// (Originally from ..\FSComp.txt:886) + /// (Originally from ..\FSComp.txt:887) static member optsShortFormOf(a0 : System.String) = (GetStringFunc("optsShortFormOf",",,,%s,,,") a0) /// The command-line option '--cliroot' has been deprecated. Use an explicit reference to a specific copy of mscorlib.dll instead. - /// (Originally from ..\FSComp.txt:887) + /// (Originally from ..\FSComp.txt:888) static member optsClirootDeprecatedMsg() = (GetStringFunc("optsClirootDeprecatedMsg",",,,") ) /// Use to override where the compiler looks for mscorlib.dll and framework components - /// (Originally from ..\FSComp.txt:888) + /// (Originally from ..\FSComp.txt:889) static member optsClirootDescription() = (GetStringFunc("optsClirootDescription",",,,") ) /// - OUTPUT FILES - - /// (Originally from ..\FSComp.txt:889) + /// (Originally from ..\FSComp.txt:890) static member optsHelpBannerOutputFiles() = (GetStringFunc("optsHelpBannerOutputFiles",",,,") ) /// - INPUT FILES - - /// (Originally from ..\FSComp.txt:890) + /// (Originally from ..\FSComp.txt:891) static member optsHelpBannerInputFiles() = (GetStringFunc("optsHelpBannerInputFiles",",,,") ) /// - RESOURCES - - /// (Originally from ..\FSComp.txt:891) + /// (Originally from ..\FSComp.txt:892) static member optsHelpBannerResources() = (GetStringFunc("optsHelpBannerResources",",,,") ) /// - CODE GENERATION - - /// (Originally from ..\FSComp.txt:892) + /// (Originally from ..\FSComp.txt:893) static member optsHelpBannerCodeGen() = (GetStringFunc("optsHelpBannerCodeGen",",,,") ) /// - ADVANCED - - /// (Originally from ..\FSComp.txt:893) + /// (Originally from ..\FSComp.txt:894) static member optsHelpBannerAdvanced() = (GetStringFunc("optsHelpBannerAdvanced",",,,") ) /// - MISCELLANEOUS - - /// (Originally from ..\FSComp.txt:894) + /// (Originally from ..\FSComp.txt:895) static member optsHelpBannerMisc() = (GetStringFunc("optsHelpBannerMisc",",,,") ) /// - LANGUAGE - - /// (Originally from ..\FSComp.txt:895) + /// (Originally from ..\FSComp.txt:896) static member optsHelpBannerLanguage() = (GetStringFunc("optsHelpBannerLanguage",",,,") ) /// - ERRORS AND WARNINGS - - /// (Originally from ..\FSComp.txt:896) + /// (Originally from ..\FSComp.txt:897) static member optsHelpBannerErrsAndWarns() = (GetStringFunc("optsHelpBannerErrsAndWarns",",,,") ) /// Unknown --test argument: '%s' - /// (Originally from ..\FSComp.txt:897) + /// (Originally from ..\FSComp.txt:898) static member optsUnknownArgumentToTheTestSwitch(a0 : System.String) = (1063, GetStringFunc("optsUnknownArgumentToTheTestSwitch",",,,%s,,,") a0) /// Unrecognized platform '%s', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu' - /// (Originally from ..\FSComp.txt:898) + /// (Originally from ..\FSComp.txt:899) static member optsUnknownPlatform(a0 : System.String) = (1064, GetStringFunc("optsUnknownPlatform",",,,%s,,,") a0) /// The command-line option '%s' is for test purposes only - /// (Originally from ..\FSComp.txt:899) + /// (Originally from ..\FSComp.txt:900) static member optsInternalNoDescription(a0 : System.String) = (GetStringFunc("optsInternalNoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated - /// (Originally from ..\FSComp.txt:900) + /// (Originally from ..\FSComp.txt:901) static member optsDCLONoDescription(a0 : System.String) = (GetStringFunc("optsDCLONoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated. Use '%s' instead. - /// (Originally from ..\FSComp.txt:901) + /// (Originally from ..\FSComp.txt:902) static member optsDCLODeprecatedSuggestAlternative(a0 : System.String, a1 : System.String) = (GetStringFunc("optsDCLODeprecatedSuggestAlternative",",,,%s,,,%s,,,") a0 a1) /// The command-line option '%s' has been deprecated. HTML document generation is now part of the F# Power Pack, via the tool FsHtmlDoc.exe. - /// (Originally from ..\FSComp.txt:902) + /// (Originally from ..\FSComp.txt:903) static member optsDCLOHtmlDoc(a0 : System.String) = (GetStringFunc("optsDCLOHtmlDoc",",,,%s,,,") a0) /// Output warning and error messages in color - /// (Originally from ..\FSComp.txt:903) + /// (Originally from ..\FSComp.txt:904) static member optsConsoleColors() = (GetStringFunc("optsConsoleColors",",,,") ) /// Enable high-entropy ASLR - /// (Originally from ..\FSComp.txt:904) + /// (Originally from ..\FSComp.txt:905) static member optsUseHighEntropyVA() = (GetStringFunc("optsUseHighEntropyVA",",,,") ) /// Specify subsystem version of this assembly - /// (Originally from ..\FSComp.txt:905) + /// (Originally from ..\FSComp.txt:906) static member optsSubSystemVersion() = (GetStringFunc("optsSubSystemVersion",",,,") ) /// Specify target framework profile of this assembly. Valid values are mscorlib, netcore or netstandard. Default - mscorlib - /// (Originally from ..\FSComp.txt:906) + /// (Originally from ..\FSComp.txt:907) static member optsTargetProfile() = (GetStringFunc("optsTargetProfile",",,,") ) /// Emit debug information in quotations - /// (Originally from ..\FSComp.txt:907) + /// (Originally from ..\FSComp.txt:908) static member optsEmitDebugInfoInQuotations() = (GetStringFunc("optsEmitDebugInfoInQuotations",",,,") ) /// Specify the preferred output language culture name (e.g. es-ES, ja-JP) - /// (Originally from ..\FSComp.txt:908) + /// (Originally from ..\FSComp.txt:909) static member optsPreferredUiLang() = (GetStringFunc("optsPreferredUiLang",",,,") ) /// Don't copy FSharp.Core.dll along the produced binaries - /// (Originally from ..\FSComp.txt:909) + /// (Originally from ..\FSComp.txt:910) static member optsNoCopyFsharpCore() = (GetStringFunc("optsNoCopyFsharpCore",",,,") ) /// Invalid version '%s' for '--subsystemversion'. The version must be 4.00 or greater. - /// (Originally from ..\FSComp.txt:910) + /// (Originally from ..\FSComp.txt:911) static member optsInvalidSubSystemVersion(a0 : System.String) = (1051, GetStringFunc("optsInvalidSubSystemVersion",",,,%s,,,") a0) /// Invalid value '%s' for '--targetprofile', valid values are 'mscorlib', 'netcore' or 'netstandard'. - /// (Originally from ..\FSComp.txt:911) + /// (Originally from ..\FSComp.txt:912) static member optsInvalidTargetProfile(a0 : System.String) = (1052, GetStringFunc("optsInvalidTargetProfile",",,,%s,,,") a0) /// Full name - /// (Originally from ..\FSComp.txt:912) + /// (Originally from ..\FSComp.txt:913) static member typeInfoFullName() = (GetStringFunc("typeInfoFullName",",,,") ) /// and %d other overloads - /// (Originally from ..\FSComp.txt:916) + /// (Originally from ..\FSComp.txt:917) static member typeInfoOtherOverloads(a0 : System.Int32) = (GetStringFunc("typeInfoOtherOverloads",",,,%d,,,") a0) /// union case - /// (Originally from ..\FSComp.txt:917) + /// (Originally from ..\FSComp.txt:918) static member typeInfoUnionCase() = (GetStringFunc("typeInfoUnionCase",",,,") ) /// active pattern result - /// (Originally from ..\FSComp.txt:918) + /// (Originally from ..\FSComp.txt:919) static member typeInfoActivePatternResult() = (GetStringFunc("typeInfoActivePatternResult",",,,") ) /// active recognizer - /// (Originally from ..\FSComp.txt:919) + /// (Originally from ..\FSComp.txt:920) static member typeInfoActiveRecognizer() = (GetStringFunc("typeInfoActiveRecognizer",",,,") ) /// field - /// (Originally from ..\FSComp.txt:920) + /// (Originally from ..\FSComp.txt:921) static member typeInfoField() = (GetStringFunc("typeInfoField",",,,") ) /// event - /// (Originally from ..\FSComp.txt:921) + /// (Originally from ..\FSComp.txt:922) static member typeInfoEvent() = (GetStringFunc("typeInfoEvent",",,,") ) /// property - /// (Originally from ..\FSComp.txt:922) + /// (Originally from ..\FSComp.txt:923) static member typeInfoProperty() = (GetStringFunc("typeInfoProperty",",,,") ) /// extension - /// (Originally from ..\FSComp.txt:923) + /// (Originally from ..\FSComp.txt:924) static member typeInfoExtension() = (GetStringFunc("typeInfoExtension",",,,") ) /// custom operation - /// (Originally from ..\FSComp.txt:924) + /// (Originally from ..\FSComp.txt:925) static member typeInfoCustomOperation() = (GetStringFunc("typeInfoCustomOperation",",,,") ) /// argument - /// (Originally from ..\FSComp.txt:925) + /// (Originally from ..\FSComp.txt:926) static member typeInfoArgument() = (GetStringFunc("typeInfoArgument",",,,") ) /// anonymous record field - /// (Originally from ..\FSComp.txt:926) + /// (Originally from ..\FSComp.txt:927) static member typeInfoAnonRecdField() = (GetStringFunc("typeInfoAnonRecdField",",,,") ) /// patvar - /// (Originally from ..\FSComp.txt:927) + /// (Originally from ..\FSComp.txt:928) static member typeInfoPatternVariable() = (GetStringFunc("typeInfoPatternVariable",",,,") ) /// namespace - /// (Originally from ..\FSComp.txt:928) + /// (Originally from ..\FSComp.txt:929) static member typeInfoNamespace() = (GetStringFunc("typeInfoNamespace",",,,") ) /// module - /// (Originally from ..\FSComp.txt:929) + /// (Originally from ..\FSComp.txt:930) static member typeInfoModule() = (GetStringFunc("typeInfoModule",",,,") ) /// namespace/module - /// (Originally from ..\FSComp.txt:930) + /// (Originally from ..\FSComp.txt:931) static member typeInfoNamespaceOrModule() = (GetStringFunc("typeInfoNamespaceOrModule",",,,") ) /// from %s - /// (Originally from ..\FSComp.txt:931) + /// (Originally from ..\FSComp.txt:932) static member typeInfoFromFirst(a0 : System.String) = (GetStringFunc("typeInfoFromFirst",",,,%s,,,") a0) /// also from %s - /// (Originally from ..\FSComp.txt:932) + /// (Originally from ..\FSComp.txt:933) static member typeInfoFromNext(a0 : System.String) = (GetStringFunc("typeInfoFromNext",",,,%s,,,") a0) /// generated property - /// (Originally from ..\FSComp.txt:933) + /// (Originally from ..\FSComp.txt:934) static member typeInfoGeneratedProperty() = (GetStringFunc("typeInfoGeneratedProperty",",,,") ) /// generated type - /// (Originally from ..\FSComp.txt:934) + /// (Originally from ..\FSComp.txt:935) static member typeInfoGeneratedType() = (GetStringFunc("typeInfoGeneratedType",",,,") ) /// Found by AssemblyFolders registry key - /// (Originally from ..\FSComp.txt:935) + /// (Originally from ..\FSComp.txt:936) static member assemblyResolutionFoundByAssemblyFoldersKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersKey",",,,") ) /// Found by AssemblyFoldersEx registry key - /// (Originally from ..\FSComp.txt:936) + /// (Originally from ..\FSComp.txt:937) static member assemblyResolutionFoundByAssemblyFoldersExKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersExKey",",,,") ) /// .NET Framework - /// (Originally from ..\FSComp.txt:937) + /// (Originally from ..\FSComp.txt:938) static member assemblyResolutionNetFramework() = (GetStringFunc("assemblyResolutionNetFramework",",,,") ) /// Global Assembly Cache - /// (Originally from ..\FSComp.txt:938) + /// (Originally from ..\FSComp.txt:939) static member assemblyResolutionGAC() = (GetStringFunc("assemblyResolutionGAC",",,,") ) /// Recursive class hierarchy in type '%s' - /// (Originally from ..\FSComp.txt:939) + /// (Originally from ..\FSComp.txt:940) static member recursiveClassHierarchy(a0 : System.String) = (1089, GetStringFunc("recursiveClassHierarchy",",,,%s,,,") a0) /// Invalid recursive reference to an abstract slot - /// (Originally from ..\FSComp.txt:940) + /// (Originally from ..\FSComp.txt:941) static member InvalidRecursiveReferenceToAbstractSlot() = (1090, GetStringFunc("InvalidRecursiveReferenceToAbstractSlot",",,,") ) /// The event '%s' has a non-standard type. If this event is declared in another CLI language, you may need to access this event using the explicit %s and %s methods for the event. If this event is declared in F#, make the type of the event an instantiation of either 'IDelegateEvent<_>' or 'IEvent<_,_>'. - /// (Originally from ..\FSComp.txt:941) + /// (Originally from ..\FSComp.txt:942) static member eventHasNonStandardType(a0 : System.String, a1 : System.String, a2 : System.String) = (1091, GetStringFunc("eventHasNonStandardType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:942) + /// (Originally from ..\FSComp.txt:943) static member typeIsNotAccessible(a0 : System.String) = (1092, GetStringFunc("typeIsNotAccessible",",,,%s,,,") a0) /// The union cases or fields of the type '%s' are not accessible from this code location - /// (Originally from ..\FSComp.txt:943) + /// (Originally from ..\FSComp.txt:944) static member unionCasesAreNotAccessible(a0 : System.String) = (1093, GetStringFunc("unionCasesAreNotAccessible",",,,%s,,,") a0) /// The value '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:944) + /// (Originally from ..\FSComp.txt:945) static member valueIsNotAccessible(a0 : System.String) = (1094, GetStringFunc("valueIsNotAccessible",",,,%s,,,") a0) /// The union case '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:945) + /// (Originally from ..\FSComp.txt:946) static member unionCaseIsNotAccessible(a0 : System.String) = (1095, GetStringFunc("unionCaseIsNotAccessible",",,,%s,,,") a0) /// The record, struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:946) + /// (Originally from ..\FSComp.txt:947) static member fieldIsNotAccessible(a0 : System.String) = (1096, GetStringFunc("fieldIsNotAccessible",",,,%s,,,") a0) /// The struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:947) + /// (Originally from ..\FSComp.txt:948) static member structOrClassFieldIsNotAccessible(a0 : System.String) = (1097, GetStringFunc("structOrClassFieldIsNotAccessible",",,,%s,,,") a0) /// This construct is experimental - /// (Originally from ..\FSComp.txt:948) + /// (Originally from ..\FSComp.txt:949) static member experimentalConstruct() = (GetStringFunc("experimentalConstruct",",,,") ) /// No Invoke methods found for delegate type - /// (Originally from ..\FSComp.txt:949) + /// (Originally from ..\FSComp.txt:950) static member noInvokeMethodsFound() = (1099, GetStringFunc("noInvokeMethodsFound",",,,") ) /// More than one Invoke method found for delegate type - /// (Originally from ..\FSComp.txt:950) + /// (Originally from ..\FSComp.txt:951) static member moreThanOneInvokeMethodFound() = (GetStringFunc("moreThanOneInvokeMethodFound",",,,") ) /// Delegates are not allowed to have curried signatures - /// (Originally from ..\FSComp.txt:951) + /// (Originally from ..\FSComp.txt:952) static member delegatesNotAllowedToHaveCurriedSignatures() = (1101, GetStringFunc("delegatesNotAllowedToHaveCurriedSignatures",",,,") ) /// Unexpected Expr.TyChoose - /// (Originally from ..\FSComp.txt:952) + /// (Originally from ..\FSComp.txt:953) static member tlrUnexpectedTExpr() = (1102, GetStringFunc("tlrUnexpectedTExpr",",,,") ) /// Note: Lambda-lifting optimizations have not been applied because of the use of this local constrained generic function as a first class value. Adding type constraints may resolve this condition. - /// (Originally from ..\FSComp.txt:953) + /// (Originally from ..\FSComp.txt:954) static member tlrLambdaLiftingOptimizationsNotApplied() = (1103, GetStringFunc("tlrLambdaLiftingOptimizationsNotApplied",",,,") ) /// Identifiers containing '@' are reserved for use in F# code generation - /// (Originally from ..\FSComp.txt:954) + /// (Originally from ..\FSComp.txt:955) static member lexhlpIdentifiersContainingAtSymbolReserved() = (1104, GetStringFunc("lexhlpIdentifiersContainingAtSymbolReserved",",,,") ) /// The identifier '%s' is reserved for future use by F# - /// (Originally from ..\FSComp.txt:955) + /// (Originally from ..\FSComp.txt:956) static member lexhlpIdentifierReserved(a0 : System.String) = (GetStringFunc("lexhlpIdentifierReserved",",,,%s,,,") a0) /// Missing variable '%s' - /// (Originally from ..\FSComp.txt:956) + /// (Originally from ..\FSComp.txt:957) static member patcMissingVariable(a0 : System.String) = (1106, GetStringFunc("patcMissingVariable",",,,%s,,,") a0) /// Partial active patterns may only generate one result - /// (Originally from ..\FSComp.txt:957) + /// (Originally from ..\FSComp.txt:958) static member patcPartialActivePatternsGenerateOneResult() = (1107, GetStringFunc("patcPartialActivePatternsGenerateOneResult",",,,") ) /// The type '%s' is required here and is unavailable. You must add a reference to assembly '%s'. - /// (Originally from ..\FSComp.txt:958) + /// (Originally from ..\FSComp.txt:959) static member impTypeRequiredUnavailable(a0 : System.String, a1 : System.String) = (1108, GetStringFunc("impTypeRequiredUnavailable",",,,%s,,,%s,,,") a0 a1) /// A reference to the type '%s' in assembly '%s' was found, but the type could not be found in that assembly - /// (Originally from ..\FSComp.txt:959) + /// (Originally from ..\FSComp.txt:960) static member impReferencedTypeCouldNotBeFoundInAssembly(a0 : System.String, a1 : System.String) = (1109, GetStringFunc("impReferencedTypeCouldNotBeFoundInAssembly",",,,%s,,,%s,,,") a0 a1) /// Internal error or badly formed metadata: not enough type parameters were in scope while importing - /// (Originally from ..\FSComp.txt:960) + /// (Originally from ..\FSComp.txt:961) static member impNotEnoughTypeParamsInScopeWhileImporting() = (1110, GetStringFunc("impNotEnoughTypeParamsInScopeWhileImporting",",,,") ) /// A reference to the DLL %s is required by assembly %s. The imported type %s is located in the first assembly and could not be resolved. - /// (Originally from ..\FSComp.txt:961) + /// (Originally from ..\FSComp.txt:962) static member impReferenceToDllRequiredByAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (1111, GetStringFunc("impReferenceToDllRequiredByAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// An imported assembly uses the type '%s' but that type is not public - /// (Originally from ..\FSComp.txt:962) + /// (Originally from ..\FSComp.txt:963) static member impImportedAssemblyUsesNotPublicType(a0 : System.String) = (1112, GetStringFunc("impImportedAssemblyUsesNotPublicType",",,,%s,,,") a0) /// The value '%s' was marked inline but its implementation makes use of an internal or private function which is not sufficiently accessible - /// (Originally from ..\FSComp.txt:963) + /// (Originally from ..\FSComp.txt:964) static member optValueMarkedInlineButIncomplete(a0 : System.String) = (1113, GetStringFunc("optValueMarkedInlineButIncomplete",",,,%s,,,") a0) /// The value '%s' was marked inline but was not bound in the optimization environment - /// (Originally from ..\FSComp.txt:964) + /// (Originally from ..\FSComp.txt:965) static member optValueMarkedInlineButWasNotBoundInTheOptEnv(a0 : System.String) = (1114, GetStringFunc("optValueMarkedInlineButWasNotBoundInTheOptEnv",",,,%s,,,") a0) /// Local value %s not found during optimization - /// (Originally from ..\FSComp.txt:965) + /// (Originally from ..\FSComp.txt:966) static member optLocalValueNotFoundDuringOptimization(a0 : System.String) = (1115, GetStringFunc("optLocalValueNotFoundDuringOptimization",",,,%s,,,") a0) /// A value marked as 'inline' has an unexpected value - /// (Originally from ..\FSComp.txt:966) + /// (Originally from ..\FSComp.txt:967) static member optValueMarkedInlineHasUnexpectedValue() = (1116, GetStringFunc("optValueMarkedInlineHasUnexpectedValue",",,,") ) /// A value marked as 'inline' could not be inlined - /// (Originally from ..\FSComp.txt:967) + /// (Originally from ..\FSComp.txt:968) static member optValueMarkedInlineCouldNotBeInlined() = (1117, GetStringFunc("optValueMarkedInlineCouldNotBeInlined",",,,") ) /// Failed to inline the value '%s' marked 'inline', perhaps because a recursive value was marked 'inline' - /// (Originally from ..\FSComp.txt:968) + /// (Originally from ..\FSComp.txt:969) static member optFailedToInlineValue(a0 : System.String) = (1118, GetStringFunc("optFailedToInlineValue",",,,%s,,,") a0) /// Recursive ValValue %s - /// (Originally from ..\FSComp.txt:969) + /// (Originally from ..\FSComp.txt:970) static member optRecursiveValValue(a0 : System.String) = (1119, GetStringFunc("optRecursiveValValue",",,,%s,,,") a0) /// The indentation of this 'in' token is incorrect with respect to the corresponding 'let' - /// (Originally from ..\FSComp.txt:970) + /// (Originally from ..\FSComp.txt:971) static member lexfltIncorrentIndentationOfIn() = (GetStringFunc("lexfltIncorrentIndentationOfIn",",,,") ) /// Possible incorrect indentation: this token is offside of context started at position %s. Try indenting this token further or using standard formatting conventions. - /// (Originally from ..\FSComp.txt:971) + /// (Originally from ..\FSComp.txt:972) static member lexfltTokenIsOffsideOfContextStartedEarlier(a0 : System.String) = (GetStringFunc("lexfltTokenIsOffsideOfContextStartedEarlier",",,,%s,,,") a0) /// The '|' tokens separating rules of this pattern match are misaligned by one column. Consider realigning your code or using further indentation. - /// (Originally from ..\FSComp.txt:972) + /// (Originally from ..\FSComp.txt:973) static member lexfltSeparatorTokensOfPatternMatchMisaligned() = (GetStringFunc("lexfltSeparatorTokensOfPatternMatchMisaligned",",,,") ) /// Invalid module/expression/type - /// (Originally from ..\FSComp.txt:973) + /// (Originally from ..\FSComp.txt:974) static member nrInvalidModuleExprType() = (1123, GetStringFunc("nrInvalidModuleExprType",",,,") ) /// Multiple types exist called '%s', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. '%s'. - /// (Originally from ..\FSComp.txt:974) + /// (Originally from ..\FSComp.txt:975) static member nrTypeInstantiationNeededToDisambiguateTypesWithSameName(a0 : System.String, a1 : System.String) = (1124, GetStringFunc("nrTypeInstantiationNeededToDisambiguateTypesWithSameName",",,,%s,,,%s,,,") a0 a1) /// The instantiation of the generic type '%s' is missing and can't be inferred from the arguments or return type of this member. Consider providing a type instantiation when accessing this type, e.g. '%s'. - /// (Originally from ..\FSComp.txt:975) + /// (Originally from ..\FSComp.txt:976) static member nrTypeInstantiationIsMissingAndCouldNotBeInferred(a0 : System.String, a1 : System.String) = (1125, GetStringFunc("nrTypeInstantiationIsMissingAndCouldNotBeInferred",",,,%s,,,%s,,,") a0 a1) /// 'global' may only be used as the first name in a qualified path - /// (Originally from ..\FSComp.txt:976) + /// (Originally from ..\FSComp.txt:977) static member nrGlobalUsedOnlyAsFirstName() = (1126, GetStringFunc("nrGlobalUsedOnlyAsFirstName",",,,") ) /// This is not a constructor or literal, or a constructor is being used incorrectly - /// (Originally from ..\FSComp.txt:977) + /// (Originally from ..\FSComp.txt:978) static member nrIsNotConstructorOrLiteral() = (1127, GetStringFunc("nrIsNotConstructorOrLiteral",",,,") ) /// Unexpected empty long identifier - /// (Originally from ..\FSComp.txt:978) + /// (Originally from ..\FSComp.txt:979) static member nrUnexpectedEmptyLongId() = (1128, GetStringFunc("nrUnexpectedEmptyLongId",",,,") ) /// The record type '%s' does not contain a label '%s'. - /// (Originally from ..\FSComp.txt:979) + /// (Originally from ..\FSComp.txt:980) static member nrRecordDoesNotContainSuchLabel(a0 : System.String, a1 : System.String) = (1129, GetStringFunc("nrRecordDoesNotContainSuchLabel",",,,%s,,,%s,,,") a0 a1) /// Invalid field label - /// (Originally from ..\FSComp.txt:980) + /// (Originally from ..\FSComp.txt:981) static member nrInvalidFieldLabel() = (1130, GetStringFunc("nrInvalidFieldLabel",",,,") ) /// Invalid expression '%s' - /// (Originally from ..\FSComp.txt:981) + /// (Originally from ..\FSComp.txt:982) static member nrInvalidExpression(a0 : System.String) = (1132, GetStringFunc("nrInvalidExpression",",,,%s,,,") a0) /// No constructors are available for the type '%s' - /// (Originally from ..\FSComp.txt:982) + /// (Originally from ..\FSComp.txt:983) static member nrNoConstructorsAvailableForType(a0 : System.String) = (1133, GetStringFunc("nrNoConstructorsAvailableForType",",,,%s,,,") a0) /// The union type for union case '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the union type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:983) + /// (Originally from ..\FSComp.txt:984) static member nrUnionTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1134, GetStringFunc("nrUnionTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// The record type for the record field '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the record type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:984) + /// (Originally from ..\FSComp.txt:985) static member nrRecordTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1135, GetStringFunc("nrRecordTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// Unexpected error creating debug information file '%s' - /// (Originally from ..\FSComp.txt:985) + /// (Originally from ..\FSComp.txt:986) static member ilwriteErrorCreatingPdb(a0 : System.String) = (1136, GetStringFunc("ilwriteErrorCreatingPdb",",,,%s,,,") a0) /// This number is outside the allowable range for this integer type - /// (Originally from ..\FSComp.txt:986) + /// (Originally from ..\FSComp.txt:987) static member lexOutsideIntegerRange() = (1138, GetStringFunc("lexOutsideIntegerRange",",,,") ) /// '%s' is not permitted as a character in operator names and is reserved for future use - /// (Originally from ..\FSComp.txt:990) + /// (Originally from ..\FSComp.txt:991) static member lexCharNotAllowedInOperatorNames(a0 : System.String) = (GetStringFunc("lexCharNotAllowedInOperatorNames",",,,%s,,,") a0) /// Unexpected character '%s' - /// (Originally from ..\FSComp.txt:991) + /// (Originally from ..\FSComp.txt:992) static member lexUnexpectedChar(a0 : System.String) = (GetStringFunc("lexUnexpectedChar",",,,%s,,,") a0) /// This byte array literal contains characters that do not encode as a single byte - /// (Originally from ..\FSComp.txt:992) + /// (Originally from ..\FSComp.txt:993) static member lexByteArrayCannotEncode() = (1140, GetStringFunc("lexByteArrayCannotEncode",",,,") ) /// Identifiers followed by '%s' are reserved for future use - /// (Originally from ..\FSComp.txt:993) + /// (Originally from ..\FSComp.txt:994) static member lexIdentEndInMarkReserved(a0 : System.String) = (1141, GetStringFunc("lexIdentEndInMarkReserved",",,,%s,,,") a0) /// This number is outside the allowable range for 8-bit signed integers - /// (Originally from ..\FSComp.txt:994) + /// (Originally from ..\FSComp.txt:995) static member lexOutsideEightBitSigned() = (1142, GetStringFunc("lexOutsideEightBitSigned",",,,") ) /// This number is outside the allowable range for hexadecimal 8-bit signed integers - /// (Originally from ..\FSComp.txt:995) + /// (Originally from ..\FSComp.txt:996) static member lexOutsideEightBitSignedHex() = (1143, GetStringFunc("lexOutsideEightBitSignedHex",",,,") ) /// This number is outside the allowable range for 8-bit unsigned integers - /// (Originally from ..\FSComp.txt:996) + /// (Originally from ..\FSComp.txt:997) static member lexOutsideEightBitUnsigned() = (1144, GetStringFunc("lexOutsideEightBitUnsigned",",,,") ) /// This number is outside the allowable range for 16-bit signed integers - /// (Originally from ..\FSComp.txt:997) + /// (Originally from ..\FSComp.txt:998) static member lexOutsideSixteenBitSigned() = (1145, GetStringFunc("lexOutsideSixteenBitSigned",",,,") ) /// This number is outside the allowable range for 16-bit unsigned integers - /// (Originally from ..\FSComp.txt:998) + /// (Originally from ..\FSComp.txt:999) static member lexOutsideSixteenBitUnsigned() = (1146, GetStringFunc("lexOutsideSixteenBitUnsigned",",,,") ) /// This number is outside the allowable range for 32-bit signed integers - /// (Originally from ..\FSComp.txt:999) + /// (Originally from ..\FSComp.txt:1000) static member lexOutsideThirtyTwoBitSigned() = (1147, GetStringFunc("lexOutsideThirtyTwoBitSigned",",,,") ) /// This number is outside the allowable range for 32-bit unsigned integers - /// (Originally from ..\FSComp.txt:1000) + /// (Originally from ..\FSComp.txt:1001) static member lexOutsideThirtyTwoBitUnsigned() = (1148, GetStringFunc("lexOutsideThirtyTwoBitUnsigned",",,,") ) /// This number is outside the allowable range for 64-bit signed integers - /// (Originally from ..\FSComp.txt:1001) + /// (Originally from ..\FSComp.txt:1002) static member lexOutsideSixtyFourBitSigned() = (1149, GetStringFunc("lexOutsideSixtyFourBitSigned",",,,") ) /// This number is outside the allowable range for 64-bit unsigned integers - /// (Originally from ..\FSComp.txt:1002) + /// (Originally from ..\FSComp.txt:1003) static member lexOutsideSixtyFourBitUnsigned() = (1150, GetStringFunc("lexOutsideSixtyFourBitUnsigned",",,,") ) /// This number is outside the allowable range for signed native integers - /// (Originally from ..\FSComp.txt:1003) + /// (Originally from ..\FSComp.txt:1004) static member lexOutsideNativeSigned() = (1151, GetStringFunc("lexOutsideNativeSigned",",,,") ) /// This number is outside the allowable range for unsigned native integers - /// (Originally from ..\FSComp.txt:1004) + /// (Originally from ..\FSComp.txt:1005) static member lexOutsideNativeUnsigned() = (1152, GetStringFunc("lexOutsideNativeUnsigned",",,,") ) /// Invalid floating point number - /// (Originally from ..\FSComp.txt:1005) + /// (Originally from ..\FSComp.txt:1006) static member lexInvalidFloat() = (1153, GetStringFunc("lexInvalidFloat",",,,") ) /// This number is outside the allowable range for decimal literals - /// (Originally from ..\FSComp.txt:1006) + /// (Originally from ..\FSComp.txt:1007) static member lexOusideDecimal() = (1154, GetStringFunc("lexOusideDecimal",",,,") ) /// This number is outside the allowable range for 32-bit floats - /// (Originally from ..\FSComp.txt:1007) + /// (Originally from ..\FSComp.txt:1008) static member lexOusideThirtyTwoBitFloat() = (1155, GetStringFunc("lexOusideThirtyTwoBitFloat",",,,") ) /// This is not a valid numeric literal. Valid numeric literals include 1, 0x1, 0b0001 (int), 1u (uint32), 1L (int64), 1UL (uint64), 1s (int16), 1y (sbyte), 1uy (byte), 1.0 (float), 1.0f (float32), 1.0m (decimal), 1I (BigInteger). - /// (Originally from ..\FSComp.txt:1008) + /// (Originally from ..\FSComp.txt:1009) static member lexInvalidNumericLiteral() = (1156, GetStringFunc("lexInvalidNumericLiteral",",,,") ) /// This is not a valid byte literal - /// (Originally from ..\FSComp.txt:1009) + /// (Originally from ..\FSComp.txt:1010) static member lexInvalidByteLiteral() = (1157, GetStringFunc("lexInvalidByteLiteral",",,,") ) /// This is not a valid character literal - /// (Originally from ..\FSComp.txt:1010) + /// (Originally from ..\FSComp.txt:1011) static member lexInvalidCharLiteral() = (1158, GetStringFunc("lexInvalidCharLiteral",",,,") ) /// This Unicode encoding is only valid in string literals - /// (Originally from ..\FSComp.txt:1011) + /// (Originally from ..\FSComp.txt:1012) static member lexThisUnicodeOnlyInStringLiterals() = (1159, GetStringFunc("lexThisUnicodeOnlyInStringLiterals",",,,") ) /// This token is reserved for future use - /// (Originally from ..\FSComp.txt:1012) + /// (Originally from ..\FSComp.txt:1013) static member lexTokenReserved() = (1160, GetStringFunc("lexTokenReserved",",,,") ) /// TABs are not allowed in F# code unless the #indent \"off\" option is used - /// (Originally from ..\FSComp.txt:1013) + /// (Originally from ..\FSComp.txt:1014) static member lexTabsNotAllowed() = (1161, GetStringFunc("lexTabsNotAllowed",",,,") ) /// Invalid line number: '%s' - /// (Originally from ..\FSComp.txt:1014) + /// (Originally from ..\FSComp.txt:1015) static member lexInvalidLineNumber(a0 : System.String) = (1162, GetStringFunc("lexInvalidLineNumber",",,,%s,,,") a0) /// #if directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1015) + /// (Originally from ..\FSComp.txt:1016) static member lexHashIfMustBeFirst() = (1163, GetStringFunc("lexHashIfMustBeFirst",",,,") ) /// #else has no matching #if - /// (Originally from ..\FSComp.txt:1016) + /// (Originally from ..\FSComp.txt:1017) static member lexHashElseNoMatchingIf() = (GetStringFunc("lexHashElseNoMatchingIf",",,,") ) /// #endif required for #else - /// (Originally from ..\FSComp.txt:1017) + /// (Originally from ..\FSComp.txt:1018) static member lexHashEndifRequiredForElse() = (GetStringFunc("lexHashEndifRequiredForElse",",,,") ) /// #else directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1018) + /// (Originally from ..\FSComp.txt:1019) static member lexHashElseMustBeFirst() = (1166, GetStringFunc("lexHashElseMustBeFirst",",,,") ) /// #endif has no matching #if - /// (Originally from ..\FSComp.txt:1019) + /// (Originally from ..\FSComp.txt:1020) static member lexHashEndingNoMatchingIf() = (GetStringFunc("lexHashEndingNoMatchingIf",",,,") ) /// #endif directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1020) + /// (Originally from ..\FSComp.txt:1021) static member lexHashEndifMustBeFirst() = (1168, GetStringFunc("lexHashEndifMustBeFirst",",,,") ) /// #if directive should be immediately followed by an identifier - /// (Originally from ..\FSComp.txt:1021) + /// (Originally from ..\FSComp.txt:1022) static member lexHashIfMustHaveIdent() = (1169, GetStringFunc("lexHashIfMustHaveIdent",",,,") ) /// Syntax error. Wrong nested #endif, unexpected tokens before it. - /// (Originally from ..\FSComp.txt:1022) + /// (Originally from ..\FSComp.txt:1023) static member lexWrongNestedHashEndif() = (1170, GetStringFunc("lexWrongNestedHashEndif",",,,") ) /// #! may only appear as the first line at the start of a file. - /// (Originally from ..\FSComp.txt:1023) + /// (Originally from ..\FSComp.txt:1024) static member lexHashBangMustBeFirstInFile() = (GetStringFunc("lexHashBangMustBeFirstInFile",",,,") ) /// Expected single line comment or end of line - /// (Originally from ..\FSComp.txt:1024) + /// (Originally from ..\FSComp.txt:1025) static member pplexExpectedSingleLineComment() = (1171, GetStringFunc("pplexExpectedSingleLineComment",",,,") ) /// Infix operator member '%s' has no arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1025) + /// (Originally from ..\FSComp.txt:1026) static member memberOperatorDefinitionWithNoArguments(a0 : System.String) = (1172, GetStringFunc("memberOperatorDefinitionWithNoArguments",",,,%s,,,") a0) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1026) + /// (Originally from ..\FSComp.txt:1027) static member memberOperatorDefinitionWithNonPairArgument(a0 : System.String, a1 : System.Int32) = (1173, GetStringFunc("memberOperatorDefinitionWithNonPairArgument",",,,%s,,,%d,,,") a0 a1) /// Infix operator member '%s' has extra curried arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1027) + /// (Originally from ..\FSComp.txt:1028) static member memberOperatorDefinitionWithCurriedArguments(a0 : System.String) = (1174, GetStringFunc("memberOperatorDefinitionWithCurriedArguments",",,,%s,,,") a0) /// All record, union and struct types in FSharp.Core.dll must be explicitly labelled with 'StructuralComparison' or 'NoComparison' - /// (Originally from ..\FSComp.txt:1028) + /// (Originally from ..\FSComp.txt:1029) static member tcFSharpCoreRequiresExplicit() = (1175, GetStringFunc("tcFSharpCoreRequiresExplicit",",,,") ) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the type parameter '%s' does not satisfy the 'comparison' constraint. Consider adding the 'comparison' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1029) + /// (Originally from ..\FSComp.txt:1030) static member tcStructuralComparisonNotSatisfied1(a0 : System.String, a1 : System.String) = (1176, GetStringFunc("tcStructuralComparisonNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the component type '%s' does not satisfy the 'comparison' constraint - /// (Originally from ..\FSComp.txt:1030) + /// (Originally from ..\FSComp.txt:1031) static member tcStructuralComparisonNotSatisfied2(a0 : System.String, a1 : System.String) = (1177, GetStringFunc("tcStructuralComparisonNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' is not structurally comparable because the type parameter %s does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1031) + /// (Originally from ..\FSComp.txt:1032) static member tcNoComparisonNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' is not structurally comparable because the type '%s' does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1032) + /// (Originally from ..\FSComp.txt:1033) static member tcNoComparisonNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type parameter %s does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1033) + /// (Originally from ..\FSComp.txt:1034) static member tcNoEqualityNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type '%s' does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1034) + /// (Originally from ..\FSComp.txt:1035) static member tcNoEqualityNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the type parameter '%s' does not satisfy the 'equality' constraint. Consider adding the 'equality' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1035) + /// (Originally from ..\FSComp.txt:1036) static member tcStructuralEqualityNotSatisfied1(a0 : System.String, a1 : System.String) = (1179, GetStringFunc("tcStructuralEqualityNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the component type '%s' does not satisfy the 'equality' constraint - /// (Originally from ..\FSComp.txt:1036) + /// (Originally from ..\FSComp.txt:1037) static member tcStructuralEqualityNotSatisfied2(a0 : System.String, a1 : System.String) = (1180, GetStringFunc("tcStructuralEqualityNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// Each argument of the primary constructor for a struct must be given a type, for example 'type S(x1:int, x2: int) = ...'. These arguments determine the fields of the struct. - /// (Originally from ..\FSComp.txt:1037) + /// (Originally from ..\FSComp.txt:1038) static member tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly() = (1181, GetStringFunc("tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly",",,,") ) /// The value '%s' is unused - /// (Originally from ..\FSComp.txt:1038) + /// (Originally from ..\FSComp.txt:1039) static member chkUnusedValue(a0 : System.String) = (1182, GetStringFunc("chkUnusedValue",",,,%s,,,") a0) /// The recursive object reference '%s' is unused. The presence of a recursive object reference adds runtime initialization checks to members in this and derived types. Consider removing this recursive object reference. - /// (Originally from ..\FSComp.txt:1039) + /// (Originally from ..\FSComp.txt:1040) static member chkUnusedThisVariable(a0 : System.String) = (1183, GetStringFunc("chkUnusedThisVariable",",,,%s,,,") a0) /// A getter property may have at most one argument group - /// (Originally from ..\FSComp.txt:1040) + /// (Originally from ..\FSComp.txt:1041) static member parsGetterAtMostOneArgument() = (1184, GetStringFunc("parsGetterAtMostOneArgument",",,,") ) /// A setter property may have at most two argument groups - /// (Originally from ..\FSComp.txt:1041) + /// (Originally from ..\FSComp.txt:1042) static member parsSetterAtMostTwoArguments() = (1185, GetStringFunc("parsSetterAtMostTwoArguments",",,,") ) /// Invalid property getter or setter - /// (Originally from ..\FSComp.txt:1042) + /// (Originally from ..\FSComp.txt:1043) static member parsInvalidProperty() = (1186, GetStringFunc("parsInvalidProperty",",,,") ) /// An indexer property must be given at least one argument - /// (Originally from ..\FSComp.txt:1043) + /// (Originally from ..\FSComp.txt:1044) static member parsIndexerPropertyRequiresAtLeastOneArgument() = (1187, GetStringFunc("parsIndexerPropertyRequiresAtLeastOneArgument",",,,") ) /// This operation accesses a mutable top-level value defined in another assembly in an unsupported way. The value cannot be accessed through its address. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...', and if necessary assigning the value back after the completion of the operation - /// (Originally from ..\FSComp.txt:1044) + /// (Originally from ..\FSComp.txt:1045) static member tastInvalidAddressOfMutableAcrossAssemblyBoundary() = (1188, GetStringFunc("tastInvalidAddressOfMutableAcrossAssemblyBoundary",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"type C<'T>\", not type \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1045) + /// (Originally from ..\FSComp.txt:1046) static member parsNonAdjacentTypars() = (1189, GetStringFunc("parsNonAdjacentTypars",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"C<'T>\", not \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1046) + /// (Originally from ..\FSComp.txt:1047) static member parsNonAdjacentTyargs() = (1190, GetStringFunc("parsNonAdjacentTyargs",",,,") ) /// The use of the type syntax 'int C' and 'C ' is not permitted here. Consider adjusting this type to be written in the form 'C' - /// (Originally from ..\FSComp.txt:1047) + /// (Originally from ..\FSComp.txt:1048) static member parsNonAtomicType() = (GetStringFunc("parsNonAtomicType",",,,") ) /// The module/namespace '%s' from compilation unit '%s' did not contain the module/namespace '%s' - /// (Originally from ..\FSComp.txt:1050) + /// (Originally from ..\FSComp.txt:1051) static member tastUndefinedItemRefModuleNamespace(a0 : System.String, a1 : System.String, a2 : System.String) = (1193, GetStringFunc("tastUndefinedItemRefModuleNamespace",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the val '%s' - /// (Originally from ..\FSComp.txt:1051) + /// (Originally from ..\FSComp.txt:1052) static member tastUndefinedItemRefVal(a0 : System.String, a1 : System.String, a2 : System.String) = (1194, GetStringFunc("tastUndefinedItemRefVal",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the namespace, module or type '%s' - /// (Originally from ..\FSComp.txt:1052) + /// (Originally from ..\FSComp.txt:1053) static member tastUndefinedItemRefModuleNamespaceType(a0 : System.String, a1 : System.String, a2 : System.String) = (1195, GetStringFunc("tastUndefinedItemRefModuleNamespaceType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The 'UseNullAsTrueValue' attribute flag may only be used with union types that have one nullary case and at least one non-nullary case - /// (Originally from ..\FSComp.txt:1053) + /// (Originally from ..\FSComp.txt:1054) static member tcInvalidUseNullAsTrueValue() = (1196, GetStringFunc("tcInvalidUseNullAsTrueValue",",,,") ) /// The parameter '%s' was inferred to have byref type. Parameters of byref type must be given an explicit type annotation, e.g. 'x1: byref'. When used, a byref parameter is implicitly dereferenced. - /// (Originally from ..\FSComp.txt:1054) + /// (Originally from ..\FSComp.txt:1055) static member tcParameterInferredByref(a0 : System.String) = (1197, GetStringFunc("tcParameterInferredByref",",,,%s,,,") a0) /// The generic member '%s' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints. - /// (Originally from ..\FSComp.txt:1055) + /// (Originally from ..\FSComp.txt:1056) static member tcNonUniformMemberUse(a0 : System.String) = (1198, GetStringFunc("tcNonUniformMemberUse",",,,%s,,,") a0) /// The attribute '%s' appears in both the implementation and the signature, but the attribute arguments differ. Only the attribute from the signature will be included in the compiled code. - /// (Originally from ..\FSComp.txt:1056) + /// (Originally from ..\FSComp.txt:1057) static member tcAttribArgsDiffer(a0 : System.String) = (1200, GetStringFunc("tcAttribArgsDiffer",",,,%s,,,") a0) /// Cannot call an abstract base member: '%s' - /// (Originally from ..\FSComp.txt:1057) + /// (Originally from ..\FSComp.txt:1058) static member tcCannotCallAbstractBaseMember(a0 : System.String) = (1201, GetStringFunc("tcCannotCallAbstractBaseMember",",,,%s,,,") a0) /// Could not resolve the ambiguity in the use of a generic construct with an 'unmanaged' constraint at or near this position - /// (Originally from ..\FSComp.txt:1058) + /// (Originally from ..\FSComp.txt:1059) static member typrelCannotResolveAmbiguityInUnmanaged() = (1202, GetStringFunc("typrelCannotResolveAmbiguityInUnmanaged",",,,") ) /// This construct is for ML compatibility. %s. You can disable this warning by using '--mlcompatibility' or '--nowarn:62'. - /// (Originally from ..\FSComp.txt:1061) + /// (Originally from ..\FSComp.txt:1062) static member mlCompatMessage(a0 : System.String) = (GetStringFunc("mlCompatMessage",",,,%s,,,") a0) /// The type '%s' has been marked as having an Explicit layout, but the field '%s' has not been marked with the 'FieldOffset' attribute - /// (Originally from ..\FSComp.txt:1063) + /// (Originally from ..\FSComp.txt:1064) static member ilFieldDoesNotHaveValidOffsetForStructureLayout(a0 : System.String, a1 : System.String) = (1206, GetStringFunc("ilFieldDoesNotHaveValidOffsetForStructureLayout",",,,%s,,,%s,,,") a0 a1) /// Interfaces inherited by other interfaces should be declared using 'inherit ...' instead of 'interface ...' - /// (Originally from ..\FSComp.txt:1064) + /// (Originally from ..\FSComp.txt:1065) static member tcInterfacesShouldUseInheritNotInterface() = (1207, GetStringFunc("tcInterfacesShouldUseInheritNotInterface",",,,") ) /// Invalid prefix operator - /// (Originally from ..\FSComp.txt:1065) + /// (Originally from ..\FSComp.txt:1066) static member parsInvalidPrefixOperator() = (1208, GetStringFunc("parsInvalidPrefixOperator",",,,") ) /// Invalid operator definition. Prefix operator definitions must use a valid prefix operator name. - /// (Originally from ..\FSComp.txt:1066) + /// (Originally from ..\FSComp.txt:1067) static member parsInvalidPrefixOperatorDefinition() = (1208, GetStringFunc("parsInvalidPrefixOperatorDefinition",",,,") ) /// The file extensions '.ml' and '.mli' are for ML compatibility - /// (Originally from ..\FSComp.txt:1067) + /// (Originally from ..\FSComp.txt:1068) static member buildCompilingExtensionIsForML() = (GetStringFunc("buildCompilingExtensionIsForML",",,,") ) /// Consider using a file with extension '.ml' or '.mli' instead - /// (Originally from ..\FSComp.txt:1068) + /// (Originally from ..\FSComp.txt:1069) static member lexIndentOffForML() = (GetStringFunc("lexIndentOffForML",",,,") ) /// Active pattern '%s' is not a function - /// (Originally from ..\FSComp.txt:1069) + /// (Originally from ..\FSComp.txt:1070) static member activePatternIdentIsNotFunctionTyped(a0 : System.String) = (1209, GetStringFunc("activePatternIdentIsNotFunctionTyped",",,,%s,,,") a0) /// Active pattern '%s' has a result type containing type variables that are not determined by the input. The common cause is a when a result case is not mentioned, e.g. 'let (|A|B|) (x:int) = A x'. This can be fixed with a type constraint, e.g. 'let (|A|B|) (x:int) : Choice = A x' - /// (Originally from ..\FSComp.txt:1070) + /// (Originally from ..\FSComp.txt:1071) static member activePatternChoiceHasFreeTypars(a0 : System.String) = (1210, GetStringFunc("activePatternChoiceHasFreeTypars",",,,%s,,,") a0) /// The FieldOffset attribute can only be placed on members of types marked with the StructLayout(LayoutKind.Explicit) - /// (Originally from ..\FSComp.txt:1071) + /// (Originally from ..\FSComp.txt:1072) static member ilFieldHasOffsetForSequentialLayout() = (1211, GetStringFunc("ilFieldHasOffsetForSequentialLayout",",,,") ) /// Optional arguments must come at the end of the argument list, after any non-optional arguments - /// (Originally from ..\FSComp.txt:1072) + /// (Originally from ..\FSComp.txt:1073) static member tcOptionalArgsMustComeAfterNonOptionalArgs() = (1212, GetStringFunc("tcOptionalArgsMustComeAfterNonOptionalArgs",",,,") ) /// Attribute 'System.Diagnostics.ConditionalAttribute' is only valid on methods or attribute classes - /// (Originally from ..\FSComp.txt:1073) + /// (Originally from ..\FSComp.txt:1074) static member tcConditionalAttributeUsage() = (1213, GetStringFunc("tcConditionalAttributeUsage",",,,") ) /// Extension members cannot provide operator overloads. Consider defining the operator as part of the type definition instead. - /// (Originally from ..\FSComp.txt:1075) + /// (Originally from ..\FSComp.txt:1076) static member tcMemberOperatorDefinitionInExtrinsic() = (1215, GetStringFunc("tcMemberOperatorDefinitionInExtrinsic",",,,") ) /// The name of the MDB file must be .mdb. The --pdb option will be ignored. - /// (Originally from ..\FSComp.txt:1076) + /// (Originally from ..\FSComp.txt:1077) static member ilwriteMDBFileNameCannotBeChangedWarning() = (1216, GetStringFunc("ilwriteMDBFileNameCannotBeChangedWarning",",,,") ) /// MDB generation failed. Could not find compatible member %s - /// (Originally from ..\FSComp.txt:1077) + /// (Originally from ..\FSComp.txt:1078) static member ilwriteMDBMemberMissing(a0 : System.String) = (1217, GetStringFunc("ilwriteMDBMemberMissing",",,,%s,,,") a0) /// Cannot generate MDB debug information. Failed to load the 'MonoSymbolWriter' type from the 'Mono.CompilerServices.SymbolWriter.dll' assembly. - /// (Originally from ..\FSComp.txt:1078) + /// (Originally from ..\FSComp.txt:1079) static member ilwriteErrorCreatingMdb() = (1218, GetStringFunc("ilwriteErrorCreatingMdb",",,,") ) /// The union case named '%s' conflicts with the generated type '%s' - /// (Originally from ..\FSComp.txt:1079) + /// (Originally from ..\FSComp.txt:1080) static member tcUnionCaseNameConflictsWithGeneratedType(a0 : System.String, a1 : System.String) = (1219, GetStringFunc("tcUnionCaseNameConflictsWithGeneratedType",",,,%s,,,%s,,,") a0 a1) /// ReflectedDefinitionAttribute may not be applied to an instance member on a struct type, because the instance member takes an implicit 'this' byref parameter - /// (Originally from ..\FSComp.txt:1080) + /// (Originally from ..\FSComp.txt:1081) static member chkNoReflectedDefinitionOnStructMember() = (1220, GetStringFunc("chkNoReflectedDefinitionOnStructMember",",,,") ) /// DLLImport bindings must be static members in a class or function definitions in a module - /// (Originally from ..\FSComp.txt:1081) + /// (Originally from ..\FSComp.txt:1082) static member tcDllImportNotAllowed() = (1221, GetStringFunc("tcDllImportNotAllowed",",,,") ) /// When mscorlib.dll or FSharp.Core.dll is explicitly referenced the %s option must also be passed - /// (Originally from ..\FSComp.txt:1082) + /// (Originally from ..\FSComp.txt:1083) static member buildExplicitCoreLibRequiresNoFramework(a0 : System.String) = (1222, GetStringFunc("buildExplicitCoreLibRequiresNoFramework",",,,%s,,,") a0) /// FSharp.Core.sigdata not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1083) + /// (Originally from ..\FSComp.txt:1084) static member buildExpectedSigdataFile(a0 : System.String) = (1223, GetStringFunc("buildExpectedSigdataFile",",,,%s,,,") a0) /// File '%s' not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1084) + /// (Originally from ..\FSComp.txt:1085) static member buildExpectedFileAlongSideFSharpCore(a0 : System.String, a1 : System.String) = (1225, GetStringFunc("buildExpectedFileAlongSideFSharpCore",",,,%s,,,%s,,,") a0 a1) /// Filename '%s' contains invalid character '%s' - /// (Originally from ..\FSComp.txt:1085) + /// (Originally from ..\FSComp.txt:1086) static member buildUnexpectedFileNameCharacter(a0 : System.String, a1 : System.String) = (1227, GetStringFunc("buildUnexpectedFileNameCharacter",",,,%s,,,%s,,,") a0 a1) /// 'use!' bindings must be of the form 'use! = ' - /// (Originally from ..\FSComp.txt:1086) + /// (Originally from ..\FSComp.txt:1087) static member tcInvalidUseBangBinding() = (1228, GetStringFunc("tcInvalidUseBangBinding",",,,") ) /// Inner generic functions are not permitted in quoted expressions. Consider adding some type constraints until this function is no longer generic. - /// (Originally from ..\FSComp.txt:1087) + /// (Originally from ..\FSComp.txt:1088) static member crefNoInnerGenericsInQuotations() = (1230, GetStringFunc("crefNoInnerGenericsInQuotations",",,,") ) /// The type '%s' is not a valid enumerator type , i.e. does not have a 'MoveNext()' method returning a bool, and a 'Current' property - /// (Originally from ..\FSComp.txt:1088) + /// (Originally from ..\FSComp.txt:1089) static member tcEnumTypeCannotBeEnumerated(a0 : System.String) = (1231, GetStringFunc("tcEnumTypeCannotBeEnumerated",",,,%s,,,") a0) /// End of file in triple-quote string begun at or before here - /// (Originally from ..\FSComp.txt:1089) + /// (Originally from ..\FSComp.txt:1090) static member parsEofInTripleQuoteString() = (1232, GetStringFunc("parsEofInTripleQuoteString",",,,") ) /// End of file in triple-quote string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:1090) + /// (Originally from ..\FSComp.txt:1091) static member parsEofInTripleQuoteStringInComment() = (1233, GetStringFunc("parsEofInTripleQuoteStringInComment",",,,") ) /// This type test or downcast will ignore the unit-of-measure '%s' - /// (Originally from ..\FSComp.txt:1091) + /// (Originally from ..\FSComp.txt:1092) static member tcTypeTestLosesMeasures(a0 : System.String) = (1240, GetStringFunc("tcTypeTestLosesMeasures",",,,%s,,,") a0) /// Expected type argument or static argument - /// (Originally from ..\FSComp.txt:1092) + /// (Originally from ..\FSComp.txt:1093) static member parsMissingTypeArgs() = (1241, GetStringFunc("parsMissingTypeArgs",",,,") ) /// Unmatched '<'. Expected closing '>' - /// (Originally from ..\FSComp.txt:1093) + /// (Originally from ..\FSComp.txt:1094) static member parsMissingGreaterThan() = (1242, GetStringFunc("parsMissingGreaterThan",",,,") ) /// Unexpected quotation operator '<@' in type definition. If you intend to pass a verbatim string as a static argument to a type provider, put a space between the '<' and '@' characters. - /// (Originally from ..\FSComp.txt:1094) + /// (Originally from ..\FSComp.txt:1095) static member parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString() = (1243, GetStringFunc("parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString",",,,") ) /// Attempted to parse this as an operator name, but failed - /// (Originally from ..\FSComp.txt:1095) + /// (Originally from ..\FSComp.txt:1096) static member parsErrorParsingAsOperatorName() = (1244, GetStringFunc("parsErrorParsingAsOperatorName",",,,") ) /// \U%s is not a valid Unicode character escape sequence - /// (Originally from ..\FSComp.txt:1096) + /// (Originally from ..\FSComp.txt:1097) static member lexInvalidUnicodeLiteral(a0 : System.String) = (1245, GetStringFunc("lexInvalidUnicodeLiteral",",,,%s,,,") a0) /// '%s' must be applied to an argument of type '%s', but has been applied to an argument of type '%s' - /// (Originally from ..\FSComp.txt:1097) + /// (Originally from ..\FSComp.txt:1098) static member tcCallerInfoWrongType(a0 : System.String, a1 : System.String, a2 : System.String) = (1246, GetStringFunc("tcCallerInfoWrongType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// '%s' can only be applied to optional arguments - /// (Originally from ..\FSComp.txt:1098) + /// (Originally from ..\FSComp.txt:1099) static member tcCallerInfoNotOptional(a0 : System.String) = (1247, GetStringFunc("tcCallerInfoNotOptional",",,,%s,,,") a0) /// The specified .NET Framework version '%s' is not supported. Please specify a value from the enumeration Microsoft.Build.Utilities.TargetDotNetFrameworkVersion. - /// (Originally from ..\FSComp.txt:1100) + /// (Originally from ..\FSComp.txt:1101) static member toolLocationHelperUnsupportedFrameworkVersion(a0 : System.String) = (1300, GetStringFunc("toolLocationHelperUnsupportedFrameworkVersion",",,,%s,,,") a0) /// Invalid Magic value in CLR Header - /// (Originally from ..\FSComp.txt:1104) + /// (Originally from ..\FSComp.txt:1105) static member ilSignInvalidMagicValue() = (1301, GetStringFunc("ilSignInvalidMagicValue",",,,") ) /// Bad image format - /// (Originally from ..\FSComp.txt:1105) + /// (Originally from ..\FSComp.txt:1106) static member ilSignBadImageFormat() = (1302, GetStringFunc("ilSignBadImageFormat",",,,") ) /// Private key expected - /// (Originally from ..\FSComp.txt:1106) + /// (Originally from ..\FSComp.txt:1107) static member ilSignPrivateKeyExpected() = (1303, GetStringFunc("ilSignPrivateKeyExpected",",,,") ) /// RSA key expected - /// (Originally from ..\FSComp.txt:1107) + /// (Originally from ..\FSComp.txt:1108) static member ilSignRsaKeyExpected() = (1304, GetStringFunc("ilSignRsaKeyExpected",",,,") ) /// Invalid bit Length - /// (Originally from ..\FSComp.txt:1108) + /// (Originally from ..\FSComp.txt:1109) static member ilSignInvalidBitLen() = (1305, GetStringFunc("ilSignInvalidBitLen",",,,") ) /// Invalid RSAParameters structure - '{0}' expected - /// (Originally from ..\FSComp.txt:1109) + /// (Originally from ..\FSComp.txt:1110) static member ilSignInvalidRSAParams() = (1306, GetStringFunc("ilSignInvalidRSAParams",",,,") ) /// Invalid algId - 'Exponent' expected - /// (Originally from ..\FSComp.txt:1110) + /// (Originally from ..\FSComp.txt:1111) static member ilSignInvalidAlgId() = (1307, GetStringFunc("ilSignInvalidAlgId",",,,") ) /// Invalid signature size - /// (Originally from ..\FSComp.txt:1111) + /// (Originally from ..\FSComp.txt:1112) static member ilSignInvalidSignatureSize() = (1308, GetStringFunc("ilSignInvalidSignatureSize",",,,") ) /// No signature directory - /// (Originally from ..\FSComp.txt:1112) + /// (Originally from ..\FSComp.txt:1113) static member ilSignNoSignatureDirectory() = (1309, GetStringFunc("ilSignNoSignatureDirectory",",,,") ) /// Invalid Public Key blob - /// (Originally from ..\FSComp.txt:1113) + /// (Originally from ..\FSComp.txt:1114) static member ilSignInvalidPKBlob() = (1310, GetStringFunc("ilSignInvalidPKBlob",",,,") ) /// Exiting - too many errors - /// (Originally from ..\FSComp.txt:1115) + /// (Originally from ..\FSComp.txt:1116) static member fscTooManyErrors() = (GetStringFunc("fscTooManyErrors",",,,") ) /// The documentation file has no .xml suffix - /// (Originally from ..\FSComp.txt:1116) + /// (Originally from ..\FSComp.txt:1117) static member docfileNoXmlSuffix() = (2001, GetStringFunc("docfileNoXmlSuffix",",,,") ) /// No implementation files specified - /// (Originally from ..\FSComp.txt:1117) + /// (Originally from ..\FSComp.txt:1118) static member fscNoImplementationFiles() = (2002, GetStringFunc("fscNoImplementationFiles",",,,") ) /// The attribute %s specified version '%s', but this value is invalid and has been ignored - /// (Originally from ..\FSComp.txt:1118) + /// (Originally from ..\FSComp.txt:1119) static member fscBadAssemblyVersion(a0 : System.String, a1 : System.String) = (2003, GetStringFunc("fscBadAssemblyVersion",",,,%s,,,%s,,,") a0 a1) /// Conflicting options specified: 'win32manifest' and 'win32res'. Only one of these can be used. - /// (Originally from ..\FSComp.txt:1119) + /// (Originally from ..\FSComp.txt:1120) static member fscTwoResourceManifests() = (2004, GetStringFunc("fscTwoResourceManifests",",,,") ) /// The code in assembly '%s' makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1120) + /// (Originally from ..\FSComp.txt:1121) static member fscQuotationLiteralsStaticLinking(a0 : System.String) = (2005, GetStringFunc("fscQuotationLiteralsStaticLinking",",,,%s,,,") a0) /// Code in this assembly makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1121) + /// (Originally from ..\FSComp.txt:1122) static member fscQuotationLiteralsStaticLinking0() = (2006, GetStringFunc("fscQuotationLiteralsStaticLinking0",",,,") ) /// Static linking may not include a .EXE - /// (Originally from ..\FSComp.txt:1122) + /// (Originally from ..\FSComp.txt:1123) static member fscStaticLinkingNoEXE() = (2007, GetStringFunc("fscStaticLinkingNoEXE",",,,") ) /// Static linking may not include a mixed managed/unmanaged DLL - /// (Originally from ..\FSComp.txt:1123) + /// (Originally from ..\FSComp.txt:1124) static member fscStaticLinkingNoMixedDLL() = (2008, GetStringFunc("fscStaticLinkingNoMixedDLL",",,,") ) /// Ignoring mixed managed/unmanaged assembly '%s' during static linking - /// (Originally from ..\FSComp.txt:1124) + /// (Originally from ..\FSComp.txt:1125) static member fscIgnoringMixedWhenLinking(a0 : System.String) = (2009, GetStringFunc("fscIgnoringMixedWhenLinking",",,,%s,,,") a0) /// Assembly '%s' was referenced transitively and the assembly could not be resolved automatically. Static linking will assume this DLL has no dependencies on the F# library or other statically linked DLLs. Consider adding an explicit reference to this DLL. - /// (Originally from ..\FSComp.txt:1125) + /// (Originally from ..\FSComp.txt:1126) static member fscAssumeStaticLinkContainsNoDependencies(a0 : System.String) = (2011, GetStringFunc("fscAssumeStaticLinkContainsNoDependencies",",,,%s,,,") a0) /// Assembly '%s' not found in dependency set of target binary. Statically linked roots should be specified using an assembly name, without a DLL or EXE extension. If this assembly was referenced explicitly then it is possible the assembly was not actually required by the generated binary, in which case it should not be statically linked. - /// (Originally from ..\FSComp.txt:1126) + /// (Originally from ..\FSComp.txt:1127) static member fscAssemblyNotFoundInDependencySet(a0 : System.String) = (2012, GetStringFunc("fscAssemblyNotFoundInDependencySet",",,,%s,,,") a0) /// The key file '%s' could not be opened - /// (Originally from ..\FSComp.txt:1127) + /// (Originally from ..\FSComp.txt:1128) static member fscKeyFileCouldNotBeOpened(a0 : System.String) = (2013, GetStringFunc("fscKeyFileCouldNotBeOpened",",,,%s,,,") a0) /// A problem occurred writing the binary '%s': %s - /// (Originally from ..\FSComp.txt:1128) + /// (Originally from ..\FSComp.txt:1129) static member fscProblemWritingBinary(a0 : System.String, a1 : System.String) = (2014, GetStringFunc("fscProblemWritingBinary",",,,%s,,,%s,,,") a0 a1) /// The 'AssemblyVersionAttribute' has been ignored because a version was given using a command line option - /// (Originally from ..\FSComp.txt:1129) + /// (Originally from ..\FSComp.txt:1130) static member fscAssemblyVersionAttributeIgnored() = (2015, GetStringFunc("fscAssemblyVersionAttributeIgnored",",,,") ) /// Error emitting 'System.Reflection.AssemblyCultureAttribute' attribute -- 'Executables cannot be satellite assemblies, Culture should always be empty' - /// (Originally from ..\FSComp.txt:1130) + /// (Originally from ..\FSComp.txt:1131) static member fscAssemblyCultureAttributeError() = (2016, GetStringFunc("fscAssemblyCultureAttributeError",",,,") ) /// Option '--delaysign' overrides attribute 'System.Reflection.AssemblyDelaySignAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1131) + /// (Originally from ..\FSComp.txt:1132) static member fscDelaySignWarning() = (2017, GetStringFunc("fscDelaySignWarning",",,,") ) /// Option '--keyfile' overrides attribute 'System.Reflection.AssemblyKeyFileAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1132) + /// (Originally from ..\FSComp.txt:1133) static member fscKeyFileWarning() = (2018, GetStringFunc("fscKeyFileWarning",",,,") ) /// Option '--keycontainer' overrides attribute 'System.Reflection.AssemblyNameAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1133) + /// (Originally from ..\FSComp.txt:1134) static member fscKeyNameWarning() = (2019, GetStringFunc("fscKeyNameWarning",",,,") ) /// The assembly '%s' is listed on the command line. Assemblies should be referenced using a command line flag such as '-r'. - /// (Originally from ..\FSComp.txt:1134) + /// (Originally from ..\FSComp.txt:1135) static member fscReferenceOnCommandLine(a0 : System.String) = (2020, GetStringFunc("fscReferenceOnCommandLine",",,,%s,,,") a0) /// The resident compilation service was not used because a problem occured in communicating with the server. - /// (Originally from ..\FSComp.txt:1135) + /// (Originally from ..\FSComp.txt:1136) static member fscRemotingError() = (2021, GetStringFunc("fscRemotingError",",,,") ) /// Problem with filename '%s': Illegal characters in path. - /// (Originally from ..\FSComp.txt:1136) + /// (Originally from ..\FSComp.txt:1137) static member pathIsInvalid(a0 : System.String) = (2022, GetStringFunc("pathIsInvalid",",,,%s,,,") a0) /// Passing a .resx file (%s) as a source file to the compiler is deprecated. Use resgen.exe to transform the .resx file into a .resources file to pass as a --resource option. If you are using MSBuild, this can be done via an item in the .fsproj project file. - /// (Originally from ..\FSComp.txt:1137) + /// (Originally from ..\FSComp.txt:1138) static member fscResxSourceFileDeprecated(a0 : System.String) = (2023, GetStringFunc("fscResxSourceFileDeprecated",",,,%s,,,") a0) /// Static linking may not be used on an assembly referencing mscorlib (e.g. a .NET Framework assembly) when generating an assembly that references System.Runtime (e.g. a .NET Core or Portable assembly). - /// (Originally from ..\FSComp.txt:1138) + /// (Originally from ..\FSComp.txt:1139) static member fscStaticLinkingNoProfileMismatches() = (2024, GetStringFunc("fscStaticLinkingNoProfileMismatches",",,,") ) /// An %s specified version '%s', but this value is a wildcard, and you have requested a deterministic build, these are in conflict. - /// (Originally from ..\FSComp.txt:1139) + /// (Originally from ..\FSComp.txt:1140) static member fscAssemblyWildcardAndDeterminism(a0 : System.String, a1 : System.String) = (2025, GetStringFunc("fscAssemblyWildcardAndDeterminism",",,,%s,,,%s,,,") a0 a1) /// Determinstic builds only support portable PDBs (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:1140) + /// (Originally from ..\FSComp.txt:1141) static member fscDeterministicDebugRequiresPortablePdb() = (2026, GetStringFunc("fscDeterministicDebugRequiresPortablePdb",",,,") ) /// Character '%s' is not allowed in provided namespace name '%s' - /// (Originally from ..\FSComp.txt:1141) + /// (Originally from ..\FSComp.txt:1142) static member etIllegalCharactersInNamespaceName(a0 : System.String, a1 : System.String) = (3000, GetStringFunc("etIllegalCharactersInNamespaceName",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' returned a member with a null or empty member name - /// (Originally from ..\FSComp.txt:1142) + /// (Originally from ..\FSComp.txt:1143) static member etNullOrEmptyMemberName(a0 : System.String) = (3001, GetStringFunc("etNullOrEmptyMemberName",",,,%s,,,") a0) /// The provided type '%s' returned a null member - /// (Originally from ..\FSComp.txt:1143) + /// (Originally from ..\FSComp.txt:1144) static member etNullMember(a0 : System.String) = (3002, GetStringFunc("etNullMember",",,,%s,,,") a0) /// The provided type '%s' member info '%s' has null declaring type - /// (Originally from ..\FSComp.txt:1144) + /// (Originally from ..\FSComp.txt:1145) static member etNullMemberDeclaringType(a0 : System.String, a1 : System.String) = (3003, GetStringFunc("etNullMemberDeclaringType",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' has member '%s' which has declaring type '%s'. Expected declaring type to be the same as provided type. - /// (Originally from ..\FSComp.txt:1145) + /// (Originally from ..\FSComp.txt:1146) static member etNullMemberDeclaringTypeDifferentFromProvidedType(a0 : System.String, a1 : System.String, a2 : System.String) = (3004, GetStringFunc("etNullMemberDeclaringTypeDifferentFromProvidedType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Referenced assembly '%s' has assembly level attribute '%s' but no public type provider classes were found - /// (Originally from ..\FSComp.txt:1146) + /// (Originally from ..\FSComp.txt:1147) static member etHostingAssemblyFoundWithoutHosts(a0 : System.String, a1 : System.String) = (3005, GetStringFunc("etHostingAssemblyFoundWithoutHosts",",,,%s,,,%s,,,") a0 a1) /// Type '%s' from type provider '%s' has an empty namespace. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1147) + /// (Originally from ..\FSComp.txt:1148) static member etEmptyNamespaceOfTypeNotAllowed(a0 : System.String, a1 : System.String) = (3006, GetStringFunc("etEmptyNamespaceOfTypeNotAllowed",",,,%s,,,%s,,,") a0 a1) /// Empty namespace found from the type provider '%s'. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1148) + /// (Originally from ..\FSComp.txt:1149) static member etEmptyNamespaceNotAllowed(a0 : System.String) = (3007, GetStringFunc("etEmptyNamespaceNotAllowed",",,,%s,,,") a0) /// Provided type '%s' has 'IsGenericType' as true, but generic types are not supported. - /// (Originally from ..\FSComp.txt:1149) + /// (Originally from ..\FSComp.txt:1150) static member etMustNotBeGeneric(a0 : System.String) = (3011, GetStringFunc("etMustNotBeGeneric",",,,%s,,,") a0) /// Provided type '%s' has 'IsArray' as true, but array types are not supported. - /// (Originally from ..\FSComp.txt:1150) + /// (Originally from ..\FSComp.txt:1151) static member etMustNotBeAnArray(a0 : System.String) = (3013, GetStringFunc("etMustNotBeAnArray",",,,%s,,,") a0) /// Invalid member '%s' on provided type '%s'. Provided type members must be public, and not be generic, virtual, or abstract. - /// (Originally from ..\FSComp.txt:1151) + /// (Originally from ..\FSComp.txt:1152) static member etMethodHasRequirements(a0 : System.String, a1 : System.String) = (3014, GetStringFunc("etMethodHasRequirements",",,,%s,,,%s,,,") a0 a1) /// Invalid member '%s' on provided type '%s'. Only properties, methods and constructors are allowed - /// (Originally from ..\FSComp.txt:1152) + /// (Originally from ..\FSComp.txt:1153) static member etUnsupportedMemberKind(a0 : System.String, a1 : System.String) = (3015, GetStringFunc("etUnsupportedMemberKind",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=true but there was no value from GetGetMethod() - /// (Originally from ..\FSComp.txt:1153) + /// (Originally from ..\FSComp.txt:1154) static member etPropertyCanReadButHasNoGetter(a0 : System.String, a1 : System.String) = (3016, GetStringFunc("etPropertyCanReadButHasNoGetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=false but GetGetMethod() returned a method - /// (Originally from ..\FSComp.txt:1154) + /// (Originally from ..\FSComp.txt:1155) static member etPropertyHasGetterButNoCanRead(a0 : System.String, a1 : System.String) = (3017, GetStringFunc("etPropertyHasGetterButNoCanRead",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=true but there was no value from GetSetMethod() - /// (Originally from ..\FSComp.txt:1155) + /// (Originally from ..\FSComp.txt:1156) static member etPropertyCanWriteButHasNoSetter(a0 : System.String, a1 : System.String) = (3018, GetStringFunc("etPropertyCanWriteButHasNoSetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=false but GetSetMethod() returned a method - /// (Originally from ..\FSComp.txt:1156) + /// (Originally from ..\FSComp.txt:1157) static member etPropertyHasSetterButNoCanWrite(a0 : System.String, a1 : System.String) = (3019, GetStringFunc("etPropertyHasSetterButNoCanWrite",",,,%s,,,%s,,,") a0 a1) /// One or more errors seen during provided type setup - /// (Originally from ..\FSComp.txt:1157) + /// (Originally from ..\FSComp.txt:1158) static member etOneOrMoreErrorsSeenDuringExtensionTypeSetting() = (3020, GetStringFunc("etOneOrMoreErrorsSeenDuringExtensionTypeSetting",",,,") ) /// Unexpected exception from provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1158) + /// (Originally from ..\FSComp.txt:1159) static member etUnexpectedExceptionFromProvidedTypeMember(a0 : System.String, a1 : System.String, a2 : System.String) = (3021, GetStringFunc("etUnexpectedExceptionFromProvidedTypeMember",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Unsupported constant type '%s'. Quotations provided by type providers can only contain simple constants. The implementation of the type provider may need to be adjusted by moving a value declared outside a provided quotation literal to be a 'let' binding inside the quotation literal. - /// (Originally from ..\FSComp.txt:1159) + /// (Originally from ..\FSComp.txt:1160) static member etUnsupportedConstantType(a0 : System.String) = (3022, GetStringFunc("etUnsupportedConstantType",",,,%s,,,") a0) /// Unsupported expression '%s' from type provider. If you are the author of this type provider, consider adjusting it to provide a different provided expression. - /// (Originally from ..\FSComp.txt:1160) + /// (Originally from ..\FSComp.txt:1161) static member etUnsupportedProvidedExpression(a0 : System.String) = (3025, GetStringFunc("etUnsupportedProvidedExpression",",,,%s,,,") a0) /// Expected provided type named '%s' but provided type has 'Name' with value '%s' - /// (Originally from ..\FSComp.txt:1161) + /// (Originally from ..\FSComp.txt:1162) static member etProvidedTypeHasUnexpectedName(a0 : System.String, a1 : System.String) = (3028, GetStringFunc("etProvidedTypeHasUnexpectedName",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetAddMethod() - /// (Originally from ..\FSComp.txt:1162) + /// (Originally from ..\FSComp.txt:1163) static member etEventNoAdd(a0 : System.String, a1 : System.String) = (3029, GetStringFunc("etEventNoAdd",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetRemoveMethod() - /// (Originally from ..\FSComp.txt:1163) + /// (Originally from ..\FSComp.txt:1164) static member etEventNoRemove(a0 : System.String, a1 : System.String) = (3030, GetStringFunc("etEventNoRemove",",,,%s,,,%s,,,") a0 a1) /// Assembly attribute '%s' refers to a designer assembly '%s' which cannot be loaded or doesn't exist. %s - /// (Originally from ..\FSComp.txt:1164) + /// (Originally from ..\FSComp.txt:1165) static member etProviderHasWrongDesignerAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (3031, GetStringFunc("etProviderHasWrongDesignerAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider does not have a valid constructor. A constructor taking either no arguments or one argument of type 'TypeProviderConfig' was expected. - /// (Originally from ..\FSComp.txt:1165) + /// (Originally from ..\FSComp.txt:1166) static member etProviderDoesNotHaveValidConstructor() = (3032, GetStringFunc("etProviderDoesNotHaveValidConstructor",",,,") ) /// The type provider '%s' reported an error: %s - /// (Originally from ..\FSComp.txt:1166) + /// (Originally from ..\FSComp.txt:1167) static member etProviderError(a0 : System.String, a1 : System.String) = (3033, GetStringFunc("etProviderError",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' used an invalid parameter in the ParameterExpression: %s - /// (Originally from ..\FSComp.txt:1167) + /// (Originally from ..\FSComp.txt:1168) static member etIncorrectParameterExpression(a0 : System.String, a1 : System.String) = (3034, GetStringFunc("etIncorrectParameterExpression",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' provided a method with a name '%s' and metadata token '%d', which is not reported among its methods of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1168) + /// (Originally from ..\FSComp.txt:1169) static member etIncorrectProvidedMethod(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.String) = (3035, GetStringFunc("etIncorrectProvidedMethod",",,,%s,,,%s,,,%d,,,%s,,,") a0 a1 a2 a3) /// The type provider '%s' provided a constructor which is not reported among the constructors of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1169) + /// (Originally from ..\FSComp.txt:1170) static member etIncorrectProvidedConstructor(a0 : System.String, a1 : System.String) = (3036, GetStringFunc("etIncorrectProvidedConstructor",",,,%s,,,%s,,,") a0 a1) /// A direct reference to the generated type '%s' is not permitted. Instead, use a type definition, e.g. 'type TypeAlias = '. This indicates that a type provider adds generated types to your assembly. - /// (Originally from ..\FSComp.txt:1170) + /// (Originally from ..\FSComp.txt:1171) static member etDirectReferenceToGeneratedTypeNotAllowed(a0 : System.String) = (3039, GetStringFunc("etDirectReferenceToGeneratedTypeNotAllowed",",,,%s,,,") a0) /// Expected provided type with path '%s' but provided type has path '%s' - /// (Originally from ..\FSComp.txt:1171) + /// (Originally from ..\FSComp.txt:1172) static member etProvidedTypeHasUnexpectedPath(a0 : System.String, a1 : System.String) = (3041, GetStringFunc("etProvidedTypeHasUnexpectedPath",",,,%s,,,%s,,,") a0 a1) /// Unexpected 'null' return value from provided type '%s' member '%s' - /// (Originally from ..\FSComp.txt:1172) + /// (Originally from ..\FSComp.txt:1173) static member etUnexpectedNullFromProvidedTypeMember(a0 : System.String, a1 : System.String) = (3042, GetStringFunc("etUnexpectedNullFromProvidedTypeMember",",,,%s,,,%s,,,") a0 a1) /// Unexpected exception from member '%s' of provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1173) + /// (Originally from ..\FSComp.txt:1174) static member etUnexpectedExceptionFromProvidedMemberMember(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3043, GetStringFunc("etUnexpectedExceptionFromProvidedMemberMember",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// Nested provided types do not take static arguments or generic parameters - /// (Originally from ..\FSComp.txt:1174) + /// (Originally from ..\FSComp.txt:1175) static member etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters() = (3044, GetStringFunc("etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters",",,,") ) /// Invalid static argument to provided type. Expected an argument of kind '%s'. - /// (Originally from ..\FSComp.txt:1175) + /// (Originally from ..\FSComp.txt:1176) static member etInvalidStaticArgument(a0 : System.String) = (3045, GetStringFunc("etInvalidStaticArgument",",,,%s,,,") a0) /// An error occured applying the static arguments to a provided type - /// (Originally from ..\FSComp.txt:1176) + /// (Originally from ..\FSComp.txt:1177) static member etErrorApplyingStaticArgumentsToType() = (3046, GetStringFunc("etErrorApplyingStaticArgumentsToType",",,,") ) /// Unknown static argument kind '%s' when resolving a reference to a provided type or method '%s' - /// (Originally from ..\FSComp.txt:1177) + /// (Originally from ..\FSComp.txt:1178) static member etUnknownStaticArgumentKind(a0 : System.String, a1 : System.String) = (3047, GetStringFunc("etUnknownStaticArgumentKind",",,,%s,,,%s,,,") a0 a1) /// invalid namespace for provided type - /// (Originally from ..\FSComp.txt:1178) + /// (Originally from ..\FSComp.txt:1179) static member invalidNamespaceForProvidedType() = (GetStringFunc("invalidNamespaceForProvidedType",",,,") ) /// invalid full name for provided type - /// (Originally from ..\FSComp.txt:1179) + /// (Originally from ..\FSComp.txt:1180) static member invalidFullNameForProvidedType() = (GetStringFunc("invalidFullNameForProvidedType",",,,") ) /// The type provider returned 'null', which is not a valid return value from '%s' - /// (Originally from ..\FSComp.txt:1181) + /// (Originally from ..\FSComp.txt:1182) static member etProviderReturnedNull(a0 : System.String) = (3051, GetStringFunc("etProviderReturnedNull",",,,%s,,,") a0) /// The type provider constructor has thrown an exception: %s - /// (Originally from ..\FSComp.txt:1182) + /// (Originally from ..\FSComp.txt:1183) static member etTypeProviderConstructorException(a0 : System.String) = (3053, GetStringFunc("etTypeProviderConstructorException",",,,%s,,,") a0) /// Type provider '%s' returned null from GetInvokerExpression. - /// (Originally from ..\FSComp.txt:1183) + /// (Originally from ..\FSComp.txt:1184) static member etNullProvidedExpression(a0 : System.String) = (3056, GetStringFunc("etNullProvidedExpression",",,,%s,,,") a0) /// The type provider '%s' returned an invalid type from 'ApplyStaticArguments'. A type with name '%s' was expected, but a type with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1184) + /// (Originally from ..\FSComp.txt:1185) static member etProvidedAppliedTypeHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3057, GetStringFunc("etProvidedAppliedTypeHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider '%s' returned an invalid method from 'ApplyStaticArgumentsForMethod'. A method with name '%s' was expected, but a method with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1185) + /// (Originally from ..\FSComp.txt:1186) static member etProvidedAppliedMethodHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3058, GetStringFunc("etProvidedAppliedMethodHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// This type test or downcast will erase the provided type '%s' to the type '%s' - /// (Originally from ..\FSComp.txt:1186) + /// (Originally from ..\FSComp.txt:1187) static member tcTypeTestLossy(a0 : System.String, a1 : System.String) = (3060, GetStringFunc("tcTypeTestLossy",",,,%s,,,%s,,,") a0 a1) /// This downcast will erase the provided type '%s' to the type '%s'. - /// (Originally from ..\FSComp.txt:1187) + /// (Originally from ..\FSComp.txt:1188) static member tcTypeCastErased(a0 : System.String, a1 : System.String) = (3061, GetStringFunc("tcTypeCastErased",",,,%s,,,%s,,,") a0 a1) /// This type test with a provided type '%s' is not allowed because this provided type will be erased to '%s' at runtime. - /// (Originally from ..\FSComp.txt:1188) + /// (Originally from ..\FSComp.txt:1189) static member tcTypeTestErased(a0 : System.String, a1 : System.String) = (3062, GetStringFunc("tcTypeTestErased",",,,%s,,,%s,,,") a0 a1) /// Cannot inherit from erased provided type - /// (Originally from ..\FSComp.txt:1189) + /// (Originally from ..\FSComp.txt:1190) static member tcCannotInheritFromErasedType() = (3063, GetStringFunc("tcCannotInheritFromErasedType",",,,") ) /// Assembly '%s' hase TypeProviderAssembly attribute with invalid value '%s'. The value should be a valid assembly name - /// (Originally from ..\FSComp.txt:1190) + /// (Originally from ..\FSComp.txt:1191) static member etInvalidTypeProviderAssemblyName(a0 : System.String, a1 : System.String) = (3065, GetStringFunc("etInvalidTypeProviderAssemblyName",",,,%s,,,%s,,,") a0 a1) /// Invalid member name. Members may not have name '.ctor' or '.cctor' - /// (Originally from ..\FSComp.txt:1191) + /// (Originally from ..\FSComp.txt:1192) static member tcInvalidMemberNameCtor() = (3066, GetStringFunc("tcInvalidMemberNameCtor",",,,") ) /// The function or member '%s' is used in a way that requires further type annotations at its definition to ensure consistency of inferred types. The inferred signature is '%s'. - /// (Originally from ..\FSComp.txt:1192) + /// (Originally from ..\FSComp.txt:1193) static member tcInferredGenericTypeGivesRiseToInconsistency(a0 : System.String, a1 : System.String) = (3068, GetStringFunc("tcInferredGenericTypeGivesRiseToInconsistency",",,,%s,,,%s,,,") a0 a1) /// The number of type arguments did not match: '%d' given, '%d' expected. This may be related to a previously reported error. - /// (Originally from ..\FSComp.txt:1193) + /// (Originally from ..\FSComp.txt:1194) static member tcInvalidTypeArgumentCount(a0 : System.Int32, a1 : System.Int32) = (3069, GetStringFunc("tcInvalidTypeArgumentCount",",,,%d,,,%d,,,") a0 a1) /// Cannot override inherited member '%s' because it is sealed - /// (Originally from ..\FSComp.txt:1194) + /// (Originally from ..\FSComp.txt:1195) static member tcCannotOverrideSealedMethod(a0 : System.String) = (3070, GetStringFunc("tcCannotOverrideSealedMethod",",,,%s,,,") a0) /// The type provider '%s' reported an error in the context of provided type '%s', member '%s'. The error: %s - /// (Originally from ..\FSComp.txt:1195) + /// (Originally from ..\FSComp.txt:1196) static member etProviderErrorWithContext(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3071, GetStringFunc("etProviderErrorWithContext",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// An exception occurred when accessing the '%s' of a provided type: %s - /// (Originally from ..\FSComp.txt:1196) + /// (Originally from ..\FSComp.txt:1197) static member etProvidedTypeWithNameException(a0 : System.String, a1 : System.String) = (3072, GetStringFunc("etProvidedTypeWithNameException",",,,%s,,,%s,,,") a0 a1) /// The '%s' of a provided type was null or empty. - /// (Originally from ..\FSComp.txt:1197) + /// (Originally from ..\FSComp.txt:1198) static member etProvidedTypeWithNullOrEmptyName(a0 : System.String) = (3073, GetStringFunc("etProvidedTypeWithNullOrEmptyName",",,,%s,,,") a0) /// Character '%s' is not allowed in provided type name '%s' - /// (Originally from ..\FSComp.txt:1198) + /// (Originally from ..\FSComp.txt:1199) static member etIllegalCharactersInTypeName(a0 : System.String, a1 : System.String) = (3075, GetStringFunc("etIllegalCharactersInTypeName",",,,%s,,,%s,,,") a0 a1) /// In queries, '%s' must use a simple pattern - /// (Originally from ..\FSComp.txt:1199) + /// (Originally from ..\FSComp.txt:1200) static member tcJoinMustUseSimplePattern(a0 : System.String) = (3077, GetStringFunc("tcJoinMustUseSimplePattern",",,,%s,,,") a0) /// A custom query operation for '%s' is required but not specified - /// (Originally from ..\FSComp.txt:1200) + /// (Originally from ..\FSComp.txt:1201) static member tcMissingCustomOperation(a0 : System.String) = (3078, GetStringFunc("tcMissingCustomOperation",",,,%s,,,") a0) /// Named static arguments must come after all unnamed static arguments - /// (Originally from ..\FSComp.txt:1201) + /// (Originally from ..\FSComp.txt:1202) static member etBadUnnamedStaticArgs() = (3080, GetStringFunc("etBadUnnamedStaticArgs",",,,") ) /// The static parameter '%s' of the provided type or method '%s' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. '%s<%s=...>'. - /// (Originally from ..\FSComp.txt:1202) + /// (Originally from ..\FSComp.txt:1203) static member etStaticParameterRequiresAValue(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3081, GetStringFunc("etStaticParameterRequiresAValue",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// No static parameter exists with name '%s' - /// (Originally from ..\FSComp.txt:1203) + /// (Originally from ..\FSComp.txt:1204) static member etNoStaticParameterWithName(a0 : System.String) = (3082, GetStringFunc("etNoStaticParameterWithName",",,,%s,,,") a0) /// The static parameter '%s' has already been given a value - /// (Originally from ..\FSComp.txt:1204) + /// (Originally from ..\FSComp.txt:1205) static member etStaticParameterAlreadyHasValue(a0 : System.String) = (3083, GetStringFunc("etStaticParameterAlreadyHasValue",",,,%s,,,") a0) /// Multiple static parameters exist with name '%s' - /// (Originally from ..\FSComp.txt:1205) + /// (Originally from ..\FSComp.txt:1206) static member etMultipleStaticParameterWithName(a0 : System.String) = (3084, GetStringFunc("etMultipleStaticParameterWithName",",,,%s,,,") a0) /// A custom operation may not be used in conjunction with a non-value or recursive 'let' binding in another part of this computation expression - /// (Originally from ..\FSComp.txt:1206) + /// (Originally from ..\FSComp.txt:1207) static member tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings() = (3085, GetStringFunc("tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings",",,,") ) /// A custom operation may not be used in conjunction with 'use', 'try/with', 'try/finally', 'if/then/else' or 'match' operators within this computation expression - /// (Originally from ..\FSComp.txt:1207) + /// (Originally from ..\FSComp.txt:1208) static member tcCustomOperationMayNotBeUsedHere() = (3086, GetStringFunc("tcCustomOperationMayNotBeUsedHere",",,,") ) /// The custom operation '%s' refers to a method which is overloaded. The implementations of custom operations may not be overloaded. - /// (Originally from ..\FSComp.txt:1208) + /// (Originally from ..\FSComp.txt:1209) static member tcCustomOperationMayNotBeOverloaded(a0 : System.String) = (3087, GetStringFunc("tcCustomOperationMayNotBeOverloaded",",,,%s,,,") a0) /// An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead. - /// (Originally from ..\FSComp.txt:1209) + /// (Originally from ..\FSComp.txt:1210) static member tcIfThenElseMayNotBeUsedWithinQueries() = (3090, GetStringFunc("tcIfThenElseMayNotBeUsedWithinQueries",",,,") ) /// Invalid argument to 'methodhandleof' during codegen - /// (Originally from ..\FSComp.txt:1210) + /// (Originally from ..\FSComp.txt:1211) static member ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen() = (3091, GetStringFunc("ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen",",,,") ) /// A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1211) + /// (Originally from ..\FSComp.txt:1212) static member etProvidedTypeReferenceMissingArgument(a0 : System.String) = (3092, GetStringFunc("etProvidedTypeReferenceMissingArgument",",,,%s,,,") a0) /// A reference to a provided type had an invalid value '%s' for a static parameter. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1212) + /// (Originally from ..\FSComp.txt:1213) static member etProvidedTypeReferenceInvalidText(a0 : System.String) = (3093, GetStringFunc("etProvidedTypeReferenceInvalidText",",,,%s,,,") a0) /// '%s' is not used correctly. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1213) + /// (Originally from ..\FSComp.txt:1214) static member tcCustomOperationNotUsedCorrectly(a0 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly",",,,%s,,,") a0) /// '%s' is not used correctly. Usage: %s. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1214) + /// (Originally from ..\FSComp.txt:1215) static member tcCustomOperationNotUsedCorrectly2(a0 : System.String, a1 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly2",",,,%s,,,%s,,,") a0 a1) /// %s var in collection %s (outerKey = innerKey). Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1215) + /// (Originally from ..\FSComp.txt:1216) static member customOperationTextLikeJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection %s (outerKey = innerKey) into group. Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1216) + /// (Originally from ..\FSComp.txt:1217) static member customOperationTextLikeGroupJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeGroupJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection - /// (Originally from ..\FSComp.txt:1217) + /// (Originally from ..\FSComp.txt:1218) static member customOperationTextLikeZip(a0 : System.String) = (GetStringFunc("customOperationTextLikeZip",",,,%s,,,") a0) /// '%s' must be followed by a variable name. Usage: %s. - /// (Originally from ..\FSComp.txt:1218) + /// (Originally from ..\FSComp.txt:1219) static member tcBinaryOperatorRequiresVariable(a0 : System.String, a1 : System.String) = (3096, GetStringFunc("tcBinaryOperatorRequiresVariable",",,,%s,,,%s,,,") a0 a1) /// Incorrect syntax for '%s'. Usage: %s. - /// (Originally from ..\FSComp.txt:1219) + /// (Originally from ..\FSComp.txt:1220) static member tcOperatorIncorrectSyntax(a0 : System.String, a1 : System.String) = (3097, GetStringFunc("tcOperatorIncorrectSyntax",",,,%s,,,%s,,,") a0 a1) /// '%s' must come after a 'for' selection clause and be followed by the rest of the query. Syntax: ... %s ... - /// (Originally from ..\FSComp.txt:1220) + /// (Originally from ..\FSComp.txt:1221) static member tcBinaryOperatorRequiresBody(a0 : System.String, a1 : System.String) = (3098, GetStringFunc("tcBinaryOperatorRequiresBody",",,,%s,,,%s,,,") a0 a1) /// '%s' is used with an incorrect number of arguments. This is a custom operation in this query or computation expression. Expected %d argument(s), but given %d. - /// (Originally from ..\FSComp.txt:1221) + /// (Originally from ..\FSComp.txt:1222) static member tcCustomOperationHasIncorrectArgCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3099, GetStringFunc("tcCustomOperationHasIncorrectArgCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Expected an expression after this point - /// (Originally from ..\FSComp.txt:1222) + /// (Originally from ..\FSComp.txt:1223) static member parsExpectedExpressionAfterToken() = (3100, GetStringFunc("parsExpectedExpressionAfterToken",",,,") ) /// Expected a type after this point - /// (Originally from ..\FSComp.txt:1223) + /// (Originally from ..\FSComp.txt:1224) static member parsExpectedTypeAfterToken() = (3101, GetStringFunc("parsExpectedTypeAfterToken",",,,") ) /// Unmatched '[<'. Expected closing '>]' - /// (Originally from ..\FSComp.txt:1224) + /// (Originally from ..\FSComp.txt:1225) static member parsUnmatchedLBrackLess() = (3102, GetStringFunc("parsUnmatchedLBrackLess",",,,") ) /// Unexpected end of input in 'match' expression. Expected 'match with | -> | -> ...'. - /// (Originally from ..\FSComp.txt:1225) + /// (Originally from ..\FSComp.txt:1226) static member parsUnexpectedEndOfFileMatch() = (3103, GetStringFunc("parsUnexpectedEndOfFileMatch",",,,") ) /// Unexpected end of input in 'try' expression. Expected 'try with ' or 'try finally '. - /// (Originally from ..\FSComp.txt:1226) + /// (Originally from ..\FSComp.txt:1227) static member parsUnexpectedEndOfFileTry() = (3104, GetStringFunc("parsUnexpectedEndOfFileTry",",,,") ) /// Unexpected end of input in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1227) + /// (Originally from ..\FSComp.txt:1228) static member parsUnexpectedEndOfFileWhile() = (3105, GetStringFunc("parsUnexpectedEndOfFileWhile",",,,") ) /// Unexpected end of input in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1228) + /// (Originally from ..\FSComp.txt:1229) static member parsUnexpectedEndOfFileFor() = (3106, GetStringFunc("parsUnexpectedEndOfFileFor",",,,") ) /// Unexpected end of input in 'match' or 'try' expression - /// (Originally from ..\FSComp.txt:1229) + /// (Originally from ..\FSComp.txt:1230) static member parsUnexpectedEndOfFileWith() = (3107, GetStringFunc("parsUnexpectedEndOfFileWith",",,,") ) /// Unexpected end of input in 'then' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1230) + /// (Originally from ..\FSComp.txt:1231) static member parsUnexpectedEndOfFileThen() = (3108, GetStringFunc("parsUnexpectedEndOfFileThen",",,,") ) /// Unexpected end of input in 'else' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1231) + /// (Originally from ..\FSComp.txt:1232) static member parsUnexpectedEndOfFileElse() = (3109, GetStringFunc("parsUnexpectedEndOfFileElse",",,,") ) /// Unexpected end of input in body of lambda expression. Expected 'fun ... -> '. - /// (Originally from ..\FSComp.txt:1232) + /// (Originally from ..\FSComp.txt:1233) static member parsUnexpectedEndOfFileFunBody() = (3110, GetStringFunc("parsUnexpectedEndOfFileFunBody",",,,") ) /// Unexpected end of input in type arguments - /// (Originally from ..\FSComp.txt:1233) + /// (Originally from ..\FSComp.txt:1234) static member parsUnexpectedEndOfFileTypeArgs() = (3111, GetStringFunc("parsUnexpectedEndOfFileTypeArgs",",,,") ) /// Unexpected end of input in type signature - /// (Originally from ..\FSComp.txt:1234) + /// (Originally from ..\FSComp.txt:1235) static member parsUnexpectedEndOfFileTypeSignature() = (3112, GetStringFunc("parsUnexpectedEndOfFileTypeSignature",",,,") ) /// Unexpected end of input in type definition - /// (Originally from ..\FSComp.txt:1235) + /// (Originally from ..\FSComp.txt:1236) static member parsUnexpectedEndOfFileTypeDefinition() = (3113, GetStringFunc("parsUnexpectedEndOfFileTypeDefinition",",,,") ) /// Unexpected end of input in object members - /// (Originally from ..\FSComp.txt:1236) + /// (Originally from ..\FSComp.txt:1237) static member parsUnexpectedEndOfFileObjectMembers() = (3114, GetStringFunc("parsUnexpectedEndOfFileObjectMembers",",,,") ) /// Unexpected end of input in value, function or member definition - /// (Originally from ..\FSComp.txt:1237) + /// (Originally from ..\FSComp.txt:1238) static member parsUnexpectedEndOfFileDefinition() = (3115, GetStringFunc("parsUnexpectedEndOfFileDefinition",",,,") ) /// Unexpected end of input in expression - /// (Originally from ..\FSComp.txt:1238) + /// (Originally from ..\FSComp.txt:1239) static member parsUnexpectedEndOfFileExpression() = (3116, GetStringFunc("parsUnexpectedEndOfFileExpression",",,,") ) /// Unexpected end of type. Expected a name after this point. - /// (Originally from ..\FSComp.txt:1239) + /// (Originally from ..\FSComp.txt:1240) static member parsExpectedNameAfterToken() = (3117, GetStringFunc("parsExpectedNameAfterToken",",,,") ) /// Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword. - /// (Originally from ..\FSComp.txt:1240) + /// (Originally from ..\FSComp.txt:1241) static member parsUnmatchedLet() = (3118, GetStringFunc("parsUnmatchedLet",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let!' keyword. - /// (Originally from ..\FSComp.txt:1241) + /// (Originally from ..\FSComp.txt:1242) static member parsUnmatchedLetBang() = (3119, GetStringFunc("parsUnmatchedLetBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use!' keyword. - /// (Originally from ..\FSComp.txt:1242) + /// (Originally from ..\FSComp.txt:1243) static member parsUnmatchedUseBang() = (3120, GetStringFunc("parsUnmatchedUseBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use' keyword. - /// (Originally from ..\FSComp.txt:1243) + /// (Originally from ..\FSComp.txt:1244) static member parsUnmatchedUse() = (3121, GetStringFunc("parsUnmatchedUse",",,,") ) /// Missing 'do' in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1244) + /// (Originally from ..\FSComp.txt:1245) static member parsWhileDoExpected() = (3122, GetStringFunc("parsWhileDoExpected",",,,") ) /// Missing 'do' in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1245) + /// (Originally from ..\FSComp.txt:1246) static member parsForDoExpected() = (3123, GetStringFunc("parsForDoExpected",",,,") ) /// Invalid join relation in '%s'. Expected 'expr expr', where is =, =?, ?= or ?=?. - /// (Originally from ..\FSComp.txt:1246) + /// (Originally from ..\FSComp.txt:1247) static member tcInvalidRelationInJoin(a0 : System.String) = (3125, GetStringFunc("tcInvalidRelationInJoin",",,,%s,,,") a0) /// Calls - /// (Originally from ..\FSComp.txt:1247) + /// (Originally from ..\FSComp.txt:1248) static member typeInfoCallsWord() = (GetStringFunc("typeInfoCallsWord",",,,") ) /// Invalid number of generic arguments to type '%s' in provided type. Expected '%d' arguments, given '%d'. - /// (Originally from ..\FSComp.txt:1248) + /// (Originally from ..\FSComp.txt:1249) static member impInvalidNumberOfGenericArguments(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3126, GetStringFunc("impInvalidNumberOfGenericArguments",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Invalid value '%s' for unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1249) + /// (Originally from ..\FSComp.txt:1250) static member impInvalidMeasureArgument1(a0 : System.String, a1 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument1",",,,%s,,,%s,,,") a0 a1) /// Invalid value unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1250) + /// (Originally from ..\FSComp.txt:1251) static member impInvalidMeasureArgument2(a0 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument2",",,,%s,,,") a0) /// Property '%s' on provided type '%s' is neither readable nor writable as it has CanRead=false and CanWrite=false - /// (Originally from ..\FSComp.txt:1251) + /// (Originally from ..\FSComp.txt:1252) static member etPropertyNeedsCanWriteOrCanRead(a0 : System.String, a1 : System.String) = (3128, GetStringFunc("etPropertyNeedsCanWriteOrCanRead",",,,%s,,,%s,,,") a0 a1) /// A use of 'into' must be followed by the remainder of the computation - /// (Originally from ..\FSComp.txt:1252) + /// (Originally from ..\FSComp.txt:1253) static member tcIntoNeedsRestOfQuery() = (3129, GetStringFunc("tcIntoNeedsRestOfQuery",",,,") ) /// The operator '%s' does not accept the use of 'into' - /// (Originally from ..\FSComp.txt:1253) + /// (Originally from ..\FSComp.txt:1254) static member tcOperatorDoesntAcceptInto(a0 : System.String) = (3130, GetStringFunc("tcOperatorDoesntAcceptInto",",,,%s,,,") a0) /// The definition of the custom operator '%s' does not use a valid combination of attribute flags - /// (Originally from ..\FSComp.txt:1254) + /// (Originally from ..\FSComp.txt:1255) static member tcCustomOperationInvalid(a0 : System.String) = (3131, GetStringFunc("tcCustomOperationInvalid",",,,%s,,,") a0) /// This type definition may not have the 'CLIMutable' attribute. Only record types may have this attribute. - /// (Originally from ..\FSComp.txt:1255) + /// (Originally from ..\FSComp.txt:1256) static member tcThisTypeMayNotHaveACLIMutableAttribute() = (3132, GetStringFunc("tcThisTypeMayNotHaveACLIMutableAttribute",",,,") ) /// 'member val' definitions are only permitted in types with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:1256) + /// (Originally from ..\FSComp.txt:1257) static member tcAutoPropertyRequiresImplicitConstructionSequence() = (3133, GetStringFunc("tcAutoPropertyRequiresImplicitConstructionSequence",",,,") ) /// Property definitions may not be declared mutable. To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1257) + /// (Originally from ..\FSComp.txt:1258) static member parsMutableOnAutoPropertyShouldBeGetSet() = (3134, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSet",",,,") ) /// To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1258) + /// (Originally from ..\FSComp.txt:1259) static member parsMutableOnAutoPropertyShouldBeGetSetNotJustSet() = (3135, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSetNotJustSet",",,,") ) /// Type '%s' is illegal because in byref, T cannot contain byref types. - /// (Originally from ..\FSComp.txt:1259) + /// (Originally from ..\FSComp.txt:1260) static member chkNoByrefsOfByrefs(a0 : System.String) = (3136, GetStringFunc("chkNoByrefsOfByrefs",",,,%s,,,") a0) /// F# supports array ranks between 1 and 32. The value %d is not allowed. - /// (Originally from ..\FSComp.txt:1260) + /// (Originally from ..\FSComp.txt:1261) static member tastopsMaxArrayThirtyTwo(a0 : System.Int32) = (3138, GetStringFunc("tastopsMaxArrayThirtyTwo",",,,%d,,,") a0) /// In queries, use the form 'for x in n .. m do ...' for ranging over integers - /// (Originally from ..\FSComp.txt:1261) + /// (Originally from ..\FSComp.txt:1262) static member tcNoIntegerForLoopInQuery() = (3139, GetStringFunc("tcNoIntegerForLoopInQuery",",,,") ) /// 'while' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1262) + /// (Originally from ..\FSComp.txt:1263) static member tcNoWhileInQuery() = (3140, GetStringFunc("tcNoWhileInQuery",",,,") ) /// 'try/finally' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1263) + /// (Originally from ..\FSComp.txt:1264) static member tcNoTryFinallyInQuery() = (3141, GetStringFunc("tcNoTryFinallyInQuery",",,,") ) /// 'use' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1264) + /// (Originally from ..\FSComp.txt:1265) static member tcUseMayNotBeUsedInQueries() = (3142, GetStringFunc("tcUseMayNotBeUsedInQueries",",,,") ) /// 'let!', 'use!' and 'do!' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1265) + /// (Originally from ..\FSComp.txt:1266) static member tcBindMayNotBeUsedInQueries() = (3143, GetStringFunc("tcBindMayNotBeUsedInQueries",",,,") ) /// 'return' and 'return!' may not be used in queries - /// (Originally from ..\FSComp.txt:1266) + /// (Originally from ..\FSComp.txt:1267) static member tcReturnMayNotBeUsedInQueries() = (3144, GetStringFunc("tcReturnMayNotBeUsedInQueries",",,,") ) /// This is not a known query operator. Query operators are identifiers such as 'select', 'where', 'sortBy', 'thenBy', 'groupBy', 'groupValBy', 'join', 'groupJoin', 'sumBy' and 'averageBy', defined using corresponding methods on the 'QueryBuilder' type. - /// (Originally from ..\FSComp.txt:1267) + /// (Originally from ..\FSComp.txt:1268) static member tcUnrecognizedQueryOperator() = (3145, GetStringFunc("tcUnrecognizedQueryOperator",",,,") ) /// 'try/with' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1268) + /// (Originally from ..\FSComp.txt:1269) static member tcTryWithMayNotBeUsedInQueries() = (3146, GetStringFunc("tcTryWithMayNotBeUsedInQueries",",,,") ) /// This 'let' definition may not be used in a query. Only simple value definitions may be used in queries. - /// (Originally from ..\FSComp.txt:1269) + /// (Originally from ..\FSComp.txt:1270) static member tcNonSimpleLetBindingInQuery() = (3147, GetStringFunc("tcNonSimpleLetBindingInQuery",",,,") ) /// Too many static parameters. Expected at most %d parameters, but got %d unnamed and %d named parameters. - /// (Originally from ..\FSComp.txt:1270) + /// (Originally from ..\FSComp.txt:1271) static member etTooManyStaticParameters(a0 : System.Int32, a1 : System.Int32, a2 : System.Int32) = (3148, GetStringFunc("etTooManyStaticParameters",",,,%d,,,%d,,,%d,,,") a0 a1 a2) /// Invalid provided literal value '%s' - /// (Originally from ..\FSComp.txt:1271) + /// (Originally from ..\FSComp.txt:1272) static member infosInvalidProvidedLiteralValue(a0 : System.String) = (3149, GetStringFunc("infosInvalidProvidedLiteralValue",",,,%s,,,") a0) /// The 'anycpu32bitpreferred' platform can only be used with EXE targets. You must use 'anycpu' instead. - /// (Originally from ..\FSComp.txt:1272) + /// (Originally from ..\FSComp.txt:1273) static member invalidPlatformTarget() = (3150, GetStringFunc("invalidPlatformTarget",",,,") ) /// This member, function or value declaration may not be declared 'inline' - /// (Originally from ..\FSComp.txt:1273) + /// (Originally from ..\FSComp.txt:1274) static member tcThisValueMayNotBeInlined() = (3151, GetStringFunc("tcThisValueMayNotBeInlined",",,,") ) /// The provider '%s' returned a non-generated type '%s' in the context of a set of generated types. Consider adjusting the type provider to only return generated types. - /// (Originally from ..\FSComp.txt:1274) + /// (Originally from ..\FSComp.txt:1275) static member etErasedTypeUsedInGeneration(a0 : System.String, a1 : System.String) = (3152, GetStringFunc("etErasedTypeUsedInGeneration",",,,%s,,,%s,,,") a0 a1) /// Arguments to query operators may require parentheses, e.g. 'where (x > y)' or 'groupBy (x.Length / 10)' - /// (Originally from ..\FSComp.txt:1275) + /// (Originally from ..\FSComp.txt:1276) static member tcUnrecognizedQueryBinaryOperator() = (3153, GetStringFunc("tcUnrecognizedQueryBinaryOperator",",,,") ) /// A quotation may not involve an assignment to or taking the address of a captured local variable - /// (Originally from ..\FSComp.txt:1276) + /// (Originally from ..\FSComp.txt:1277) static member crefNoSetOfHole() = (3155, GetStringFunc("crefNoSetOfHole",",,,") ) /// + 1 overload - /// (Originally from ..\FSComp.txt:1277) + /// (Originally from ..\FSComp.txt:1278) static member nicePrintOtherOverloads1() = (GetStringFunc("nicePrintOtherOverloads1",",,,") ) /// + %d overloads - /// (Originally from ..\FSComp.txt:1278) + /// (Originally from ..\FSComp.txt:1279) static member nicePrintOtherOverloadsN(a0 : System.Int32) = (GetStringFunc("nicePrintOtherOverloadsN",",,,%d,,,") a0) /// Erased to - /// (Originally from ..\FSComp.txt:1279) + /// (Originally from ..\FSComp.txt:1280) static member erasedTo() = (GetStringFunc("erasedTo",",,,") ) /// Unexpected token '%s' or incomplete expression - /// (Originally from ..\FSComp.txt:1280) + /// (Originally from ..\FSComp.txt:1281) static member parsUnfinishedExpression(a0 : System.String) = (3156, GetStringFunc("parsUnfinishedExpression",",,,%s,,,") a0) /// Cannot find code target for this attribute, possibly because the code after the attribute is incomplete. - /// (Originally from ..\FSComp.txt:1281) + /// (Originally from ..\FSComp.txt:1282) static member parsAttributeOnIncompleteCode() = (3158, GetStringFunc("parsAttributeOnIncompleteCode",",,,") ) /// Type name cannot be empty. - /// (Originally from ..\FSComp.txt:1282) + /// (Originally from ..\FSComp.txt:1283) static member parsTypeNameCannotBeEmpty() = (3159, GetStringFunc("parsTypeNameCannotBeEmpty",",,,") ) /// Problem reading assembly '%s': %s - /// (Originally from ..\FSComp.txt:1283) + /// (Originally from ..\FSComp.txt:1284) static member buildProblemReadingAssembly(a0 : System.String, a1 : System.String) = (3160, GetStringFunc("buildProblemReadingAssembly",",,,%s,,,%s,,,") a0 a1) /// Invalid provided field. Provided fields of erased provided types must be literals. - /// (Originally from ..\FSComp.txt:1284) + /// (Originally from ..\FSComp.txt:1285) static member tcTPFieldMustBeLiteral() = (3161, GetStringFunc("tcTPFieldMustBeLiteral",",,,") ) /// (loading description...) - /// (Originally from ..\FSComp.txt:1285) + /// (Originally from ..\FSComp.txt:1286) static member loadingDescription() = (GetStringFunc("loadingDescription",",,,") ) /// (description unavailable...) - /// (Originally from ..\FSComp.txt:1286) + /// (Originally from ..\FSComp.txt:1287) static member descriptionUnavailable() = (GetStringFunc("descriptionUnavailable",",,,") ) /// A type variable has been constrained by multiple different class types. A type variable may only have one class constraint. - /// (Originally from ..\FSComp.txt:1287) + /// (Originally from ..\FSComp.txt:1288) static member chkTyparMultipleClassConstraints() = (3162, GetStringFunc("chkTyparMultipleClassConstraints",",,,") ) /// 'match' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1288) + /// (Originally from ..\FSComp.txt:1289) static member tcMatchMayNotBeUsedWithQuery() = (3163, GetStringFunc("tcMatchMayNotBeUsedWithQuery",",,,") ) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 3 arguments - /// (Originally from ..\FSComp.txt:1289) + /// (Originally from ..\FSComp.txt:1290) static member memberOperatorDefinitionWithNonTripleArgument(a0 : System.String, a1 : System.Int32) = (3164, GetStringFunc("memberOperatorDefinitionWithNonTripleArgument",",,,%s,,,%d,,,") a0 a1) /// The operator '%s' cannot be resolved. Consider opening the module 'Microsoft.FSharp.Linq.NullableOperators'. - /// (Originally from ..\FSComp.txt:1290) + /// (Originally from ..\FSComp.txt:1291) static member cannotResolveNullableOperators(a0 : System.String) = (3165, GetStringFunc("cannotResolveNullableOperators",",,,%s,,,") a0) /// '%s' must be followed by 'in'. Usage: %s. - /// (Originally from ..\FSComp.txt:1291) + /// (Originally from ..\FSComp.txt:1292) static member tcOperatorRequiresIn(a0 : System.String, a1 : System.String) = (3167, GetStringFunc("tcOperatorRequiresIn",",,,%s,,,%s,,,") a0 a1) /// Neither 'member val' nor 'override val' definitions are permitted in object expressions. - /// (Originally from ..\FSComp.txt:1292) + /// (Originally from ..\FSComp.txt:1293) static member parsIllegalMemberVarInObjectImplementation() = (3168, GetStringFunc("parsIllegalMemberVarInObjectImplementation",",,,") ) /// Copy-and-update record expressions must include at least one field. - /// (Originally from ..\FSComp.txt:1293) + /// (Originally from ..\FSComp.txt:1294) static member tcEmptyCopyAndUpdateRecordInvalid() = (3169, GetStringFunc("tcEmptyCopyAndUpdateRecordInvalid",",,,") ) /// '_' cannot be used as field name - /// (Originally from ..\FSComp.txt:1294) + /// (Originally from ..\FSComp.txt:1295) static member parsUnderscoreInvalidFieldName() = (3170, GetStringFunc("parsUnderscoreInvalidFieldName",",,,") ) /// The provided types generated by this use of a type provider may not be used from other F# assemblies and should be marked internal or private. Consider using 'type internal TypeName = ...' or 'type private TypeName = ...'. - /// (Originally from ..\FSComp.txt:1295) + /// (Originally from ..\FSComp.txt:1296) static member tcGeneratedTypesShouldBeInternalOrPrivate() = (3171, GetStringFunc("tcGeneratedTypesShouldBeInternalOrPrivate",",,,") ) /// A property's getter and setter must have the same type. Property '%s' has getter of type '%s' but setter of type '%s'. - /// (Originally from ..\FSComp.txt:1296) + /// (Originally from ..\FSComp.txt:1297) static member chkGetterAndSetterHaveSamePropertyType(a0 : System.String, a1 : System.String, a2 : System.String) = (3172, GetStringFunc("chkGetterAndSetterHaveSamePropertyType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Array method '%s' is supplied by the runtime and cannot be directly used in code. For operations with array elements consider using family of GetArray/SetArray functions from LanguagePrimitives.IntrinsicFunctions module. - /// (Originally from ..\FSComp.txt:1297) + /// (Originally from ..\FSComp.txt:1298) static member tcRuntimeSuppliedMethodCannotBeUsedInUserCode(a0 : System.String) = (3173, GetStringFunc("tcRuntimeSuppliedMethodCannotBeUsedInUserCode",",,,%s,,,") a0) /// The union case '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1298) + /// (Originally from ..\FSComp.txt:1299) static member tcUnionCaseConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcUnionCaseConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// The exception '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1299) + /// (Originally from ..\FSComp.txt:1300) static member tcExceptionConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcExceptionConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// Active patterns do not have fields. This syntax is invalid. - /// (Originally from ..\FSComp.txt:1300) + /// (Originally from ..\FSComp.txt:1301) static member tcActivePatternsDoNotHaveFields() = (3174, GetStringFunc("tcActivePatternsDoNotHaveFields",",,,") ) /// The constructor does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1301) + /// (Originally from ..\FSComp.txt:1302) static member tcConstructorDoesNotHaveFieldWithGivenName(a0 : System.String) = (3174, GetStringFunc("tcConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,") a0) /// Union case/exception field '%s' cannot be used more than once. - /// (Originally from ..\FSComp.txt:1302) + /// (Originally from ..\FSComp.txt:1303) static member tcUnionCaseFieldCannotBeUsedMoreThanOnce(a0 : System.String) = (3175, GetStringFunc("tcUnionCaseFieldCannotBeUsedMoreThanOnce",",,,%s,,,") a0) /// Named field '%s' is used more than once. - /// (Originally from ..\FSComp.txt:1303) + /// (Originally from ..\FSComp.txt:1304) static member tcFieldNameIsUsedModeThanOnce(a0 : System.String) = (3176, GetStringFunc("tcFieldNameIsUsedModeThanOnce",",,,%s,,,") a0) /// Named field '%s' conflicts with autogenerated name for anonymous field. - /// (Originally from ..\FSComp.txt:1304) + /// (Originally from ..\FSComp.txt:1305) static member tcFieldNameConflictsWithGeneratedNameForAnonymousField(a0 : System.String) = (3176, GetStringFunc("tcFieldNameConflictsWithGeneratedNameForAnonymousField",",,,%s,,,") a0) /// This literal expression or attribute argument results in an arithmetic overflow. - /// (Originally from ..\FSComp.txt:1305) + /// (Originally from ..\FSComp.txt:1306) static member tastConstantExpressionOverflow() = (3177, GetStringFunc("tastConstantExpressionOverflow",",,,") ) /// This is not valid literal expression. The [] attribute will be ignored. - /// (Originally from ..\FSComp.txt:1306) + /// (Originally from ..\FSComp.txt:1307) static member tcIllegalStructTypeForConstantExpression() = (3178, GetStringFunc("tcIllegalStructTypeForConstantExpression",",,,") ) /// System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes. - /// (Originally from ..\FSComp.txt:1307) + /// (Originally from ..\FSComp.txt:1308) static member fscSystemRuntimeInteropServicesIsRequired() = (3179, GetStringFunc("fscSystemRuntimeInteropServicesIsRequired",",,,") ) /// The mutable local '%s' is implicitly allocated as a reference cell because it has been captured by a closure. This warning is for informational purposes only to indicate where implicit allocations are performed. - /// (Originally from ..\FSComp.txt:1308) + /// (Originally from ..\FSComp.txt:1309) static member abImplicitHeapAllocation(a0 : System.String) = (3180, GetStringFunc("abImplicitHeapAllocation",",,,%s,,,") a0) /// A type provider implemented GetStaticParametersForMethod, but ApplyStaticArgumentsForMethod was not implemented or invalid - /// (Originally from ..\FSComp.txt:1309) + /// (Originally from ..\FSComp.txt:1310) static member estApplyStaticArgumentsForMethodNotImplemented() = (GetStringFunc("estApplyStaticArgumentsForMethodNotImplemented",",,,") ) /// An error occured applying the static arguments to a provided method - /// (Originally from ..\FSComp.txt:1310) + /// (Originally from ..\FSComp.txt:1311) static member etErrorApplyingStaticArgumentsToMethod() = (3181, GetStringFunc("etErrorApplyingStaticArgumentsToMethod",",,,") ) /// Unexpected character '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1311) + /// (Originally from ..\FSComp.txt:1312) static member pplexUnexpectedChar(a0 : System.String) = (3182, GetStringFunc("pplexUnexpectedChar",",,,%s,,,") a0) /// Unexpected token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1312) + /// (Originally from ..\FSComp.txt:1313) static member ppparsUnexpectedToken(a0 : System.String) = (3183, GetStringFunc("ppparsUnexpectedToken",",,,%s,,,") a0) /// Incomplete preprocessor expression - /// (Originally from ..\FSComp.txt:1313) + /// (Originally from ..\FSComp.txt:1314) static member ppparsIncompleteExpression() = (3184, GetStringFunc("ppparsIncompleteExpression",",,,") ) /// Missing token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1314) + /// (Originally from ..\FSComp.txt:1315) static member ppparsMissingToken(a0 : System.String) = (3185, GetStringFunc("ppparsMissingToken",",,,%s,,,") a0) /// An error occurred while reading the F# metadata node at position %d in table '%s' of assembly '%s'. The node had no matching declaration. Please report this warning. You may need to recompile the F# assembly you are using. - /// (Originally from ..\FSComp.txt:1315) + /// (Originally from ..\FSComp.txt:1316) static member pickleMissingDefinition(a0 : System.Int32, a1 : System.String, a2 : System.String) = (3186, GetStringFunc("pickleMissingDefinition",",,,%d,,,%s,,,%s,,,") a0 a1 a2) /// Type inference caused the type variable %s to escape its scope. Consider adding an explicit type parameter declaration or adjusting your code to be less generic. - /// (Originally from ..\FSComp.txt:1316) + /// (Originally from ..\FSComp.txt:1317) static member checkNotSufficientlyGenericBecauseOfScope(a0 : System.String) = (3187, GetStringFunc("checkNotSufficientlyGenericBecauseOfScope",",,,%s,,,") a0) /// Type inference caused an inference type variable to escape its scope. Consider adding type annotations to make your code less generic. - /// (Originally from ..\FSComp.txt:1317) + /// (Originally from ..\FSComp.txt:1318) static member checkNotSufficientlyGenericBecauseOfScopeAnon() = (3188, GetStringFunc("checkNotSufficientlyGenericBecauseOfScopeAnon",",,,") ) /// Redundant arguments are being ignored in function '%s'. Expected %d but got %d arguments. - /// (Originally from ..\FSComp.txt:1318) + /// (Originally from ..\FSComp.txt:1319) static member checkRaiseFamilyFunctionArgumentCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3189, GetStringFunc("checkRaiseFamilyFunctionArgumentCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Lowercase literal '%s' is being shadowed by a new pattern with the same name. Only uppercase and module-prefixed literals can be used as named patterns. - /// (Originally from ..\FSComp.txt:1319) + /// (Originally from ..\FSComp.txt:1320) static member checkLowercaseLiteralBindingInPattern(a0 : System.String) = (3190, GetStringFunc("checkLowercaseLiteralBindingInPattern",",,,%s,,,") a0) /// This literal pattern does not take arguments - /// (Originally from ..\FSComp.txt:1320) + /// (Originally from ..\FSComp.txt:1321) static member tcLiteralDoesNotTakeArguments() = (3191, GetStringFunc("tcLiteralDoesNotTakeArguments",",,,") ) /// Constructors are not permitted as extension members - they must be defined as part of the original definition of the type - /// (Originally from ..\FSComp.txt:1321) + /// (Originally from ..\FSComp.txt:1322) static member tcConstructorsIllegalInAugmentation() = (3192, GetStringFunc("tcConstructorsIllegalInAugmentation",",,,") ) /// Invalid response file '%s' ( '%s' ) - /// (Originally from ..\FSComp.txt:1322) + /// (Originally from ..\FSComp.txt:1323) static member optsInvalidResponseFile(a0 : System.String, a1 : System.String) = (3193, GetStringFunc("optsInvalidResponseFile",",,,%s,,,%s,,,") a0 a1) /// Response file '%s' not found in '%s' - /// (Originally from ..\FSComp.txt:1323) + /// (Originally from ..\FSComp.txt:1324) static member optsResponseFileNotFound(a0 : System.String, a1 : System.String) = (3194, GetStringFunc("optsResponseFileNotFound",",,,%s,,,%s,,,") a0 a1) /// Response file name '%s' is empty, contains invalid characters, has a drive specification without an absolute path, or is too long - /// (Originally from ..\FSComp.txt:1324) + /// (Originally from ..\FSComp.txt:1325) static member optsResponseFileNameInvalid(a0 : System.String) = (3195, GetStringFunc("optsResponseFileNameInvalid",",,,%s,,,") a0) /// Cannot find FSharp.Core.dll in compiler's directory - /// (Originally from ..\FSComp.txt:1325) + /// (Originally from ..\FSComp.txt:1326) static member fsharpCoreNotFoundToBeCopied() = (3196, GetStringFunc("fsharpCoreNotFoundToBeCopied",",,,") ) /// One tuple type is a struct tuple, the other is a reference tuple - /// (Originally from ..\FSComp.txt:1326) + /// (Originally from ..\FSComp.txt:1327) static member tcTupleStructMismatch() = (GetStringFunc("tcTupleStructMismatch",",,,") ) /// This provided method requires static parameters - /// (Originally from ..\FSComp.txt:1327) + /// (Originally from ..\FSComp.txt:1328) static member etMissingStaticArgumentsToMethod() = (3197, GetStringFunc("etMissingStaticArgumentsToMethod",",,,") ) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using 'upcast' instead of 'downcast'. - /// (Originally from ..\FSComp.txt:1328) + /// (Originally from ..\FSComp.txt:1329) static member considerUpcast(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcast",",,,%s,,,%s,,,") a0 a1) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using the :> (upcast) operator instead of the :?> (downcast) operator. - /// (Originally from ..\FSComp.txt:1329) + /// (Originally from ..\FSComp.txt:1330) static member considerUpcastOperator(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcastOperator",",,,%s,,,%s,,,") a0 a1) /// The 'rec' on this module is implied by an outer 'rec' declaration and is being ignored - /// (Originally from ..\FSComp.txt:1330) + /// (Originally from ..\FSComp.txt:1331) static member tcRecImplied() = (3199, GetStringFunc("tcRecImplied",",,,") ) /// In a recursive declaration group, 'open' declarations must come first in each module - /// (Originally from ..\FSComp.txt:1331) + /// (Originally from ..\FSComp.txt:1332) static member tcOpenFirstInMutRec() = (3200, GetStringFunc("tcOpenFirstInMutRec",",,,") ) /// In a recursive declaration group, module abbreviations must come after all 'open' declarations and before other declarations - /// (Originally from ..\FSComp.txt:1332) + /// (Originally from ..\FSComp.txt:1333) static member tcModuleAbbrevFirstInMutRec() = (3201, GetStringFunc("tcModuleAbbrevFirstInMutRec",",,,") ) /// This declaration is not supported in recursive declaration groups - /// (Originally from ..\FSComp.txt:1333) + /// (Originally from ..\FSComp.txt:1334) static member tcUnsupportedMutRecDecl() = (3202, GetStringFunc("tcUnsupportedMutRecDecl",",,,") ) /// Invalid use of 'rec' keyword - /// (Originally from ..\FSComp.txt:1334) + /// (Originally from ..\FSComp.txt:1335) static member parsInvalidUseOfRec() = (3203, GetStringFunc("parsInvalidUseOfRec",",,,") ) /// If a union type has more than one case and is a struct, then all fields within the union type must be given unique names. - /// (Originally from ..\FSComp.txt:1335) + /// (Originally from ..\FSComp.txt:1336) static member tcStructUnionMultiCaseDistinctFields() = (3204, GetStringFunc("tcStructUnionMultiCaseDistinctFields",",,,") ) /// The CallerMemberNameAttribute applied to parameter '%s' will have no effect. It is overridden by the CallerFilePathAttribute. - /// (Originally from ..\FSComp.txt:1336) + /// (Originally from ..\FSComp.txt:1337) static member CallerMemberNameIsOverriden(a0 : System.String) = (3206, GetStringFunc("CallerMemberNameIsOverriden",",,,%s,,,") a0) /// Invalid use of 'fixed'. 'fixed' may only be used in a declaration of the form 'use x = fixed expr' where the expression is an array, the address of a field, the address of an array element or a string' - /// (Originally from ..\FSComp.txt:1337) + /// (Originally from ..\FSComp.txt:1338) static member tcFixedNotAllowed() = (3207, GetStringFunc("tcFixedNotAllowed",",,,") ) /// Could not find method System.Runtime.CompilerServices.OffsetToStringData in references when building 'fixed' expression. - /// (Originally from ..\FSComp.txt:1338) + /// (Originally from ..\FSComp.txt:1339) static member tcCouldNotFindOffsetToStringData() = (3208, GetStringFunc("tcCouldNotFindOffsetToStringData",",,,") ) /// The address of the variable '%s' or a related expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1339) + /// (Originally from ..\FSComp.txt:1340) static member chkNoByrefAddressOfLocal(a0 : System.String) = (3209, GetStringFunc("chkNoByrefAddressOfLocal",",,,%s,,,") a0) /// %s is an active pattern and cannot be treated as a discriminated union case with named fields. - /// (Originally from ..\FSComp.txt:1340) + /// (Originally from ..\FSComp.txt:1341) static member tcNamedActivePattern(a0 : System.String) = (3210, GetStringFunc("tcNamedActivePattern",",,,%s,,,") a0) /// The default value does not have the same type as the argument. The DefaultParameterValue attribute and any Optional attribute will be ignored. Note: 'null' needs to be annotated with the correct type, e.g. 'DefaultParameterValue(null:obj)'. - /// (Originally from ..\FSComp.txt:1341) + /// (Originally from ..\FSComp.txt:1342) static member DefaultParameterValueNotAppropriateForArgument() = (3211, GetStringFunc("DefaultParameterValueNotAppropriateForArgument",",,,") ) /// The system type '%s' was required but no referenced system DLL contained this type - /// (Originally from ..\FSComp.txt:1342) + /// (Originally from ..\FSComp.txt:1343) static member tcGlobalsSystemTypeNotFound(a0 : System.String) = (GetStringFunc("tcGlobalsSystemTypeNotFound",",,,%s,,,") a0) /// The member '%s' matches multiple overloads of the same method.\nPlease restrict it to one of the following:%s. - /// (Originally from ..\FSComp.txt:1343) + /// (Originally from ..\FSComp.txt:1344) static member typrelMemberHasMultiplePossibleDispatchSlots(a0 : System.String, a1 : System.String) = (3213, GetStringFunc("typrelMemberHasMultiplePossibleDispatchSlots",",,,%s,,,%s,,,") a0 a1) /// Method or object constructor '%s' is not static - /// (Originally from ..\FSComp.txt:1344) + /// (Originally from ..\FSComp.txt:1345) static member methodIsNotStatic(a0 : System.String) = (3214, GetStringFunc("methodIsNotStatic",",,,%s,,,") a0) /// Unexpected symbol '=' in expression. Did you intend to use 'for x in y .. z do' instead? - /// (Originally from ..\FSComp.txt:1345) + /// (Originally from ..\FSComp.txt:1346) static member parsUnexpectedSymbolEqualsInsteadOfIn() = (3215, GetStringFunc("parsUnexpectedSymbolEqualsInsteadOfIn",",,,") ) /// Two anonymous record types are from different assemblies '%s' and '%s' - /// (Originally from ..\FSComp.txt:1346) + /// (Originally from ..\FSComp.txt:1347) static member tcAnonRecdCcuMismatch(a0 : System.String, a1 : System.String) = (GetStringFunc("tcAnonRecdCcuMismatch",",,,%s,,,%s,,,") a0 a1) /// Two anonymous record types have mismatched sets of field names '%s' and '%s' - /// (Originally from ..\FSComp.txt:1347) + /// (Originally from ..\FSComp.txt:1348) static member tcAnonRecdFieldNameMismatch(a0 : System.String, a1 : System.String) = (GetStringFunc("tcAnonRecdFieldNameMismatch",",,,%s,,,%s,,,") a0 a1) /// Indicates a method that either has no implementation in the type in which it is declared or that is virtual and has a default implementation. - /// (Originally from ..\FSComp.txt:1348) + /// (Originally from ..\FSComp.txt:1349) static member keywordDescriptionAbstract() = (GetStringFunc("keywordDescriptionAbstract",",,,") ) /// Used in mutually recursive bindings, in property declarations, and with multiple constraints on generic parameters. - /// (Originally from ..\FSComp.txt:1349) + /// (Originally from ..\FSComp.txt:1350) static member keyworkDescriptionAnd() = (GetStringFunc("keyworkDescriptionAnd",",,,") ) /// Used to give the current class object an object name. Also used to give a name to a whole pattern within a pattern match. - /// (Originally from ..\FSComp.txt:1350) + /// (Originally from ..\FSComp.txt:1351) static member keywordDescriptionAs() = (GetStringFunc("keywordDescriptionAs",",,,") ) /// Used to verify code during debugging. - /// (Originally from ..\FSComp.txt:1351) + /// (Originally from ..\FSComp.txt:1352) static member keywordDescriptionAssert() = (GetStringFunc("keywordDescriptionAssert",",,,") ) /// Used as the name of the base class object. - /// (Originally from ..\FSComp.txt:1352) + /// (Originally from ..\FSComp.txt:1353) static member keywordDescriptionBase() = (GetStringFunc("keywordDescriptionBase",",,,") ) /// In verbose syntax, indicates the start of a code block. - /// (Originally from ..\FSComp.txt:1353) + /// (Originally from ..\FSComp.txt:1354) static member keywordDescriptionBegin() = (GetStringFunc("keywordDescriptionBegin",",,,") ) /// In verbose syntax, indicates the start of a class definition. - /// (Originally from ..\FSComp.txt:1354) + /// (Originally from ..\FSComp.txt:1355) static member keywordDescriptionClass() = (GetStringFunc("keywordDescriptionClass",",,,") ) /// Indicates an implementation of an abstract method; used together with an abstract method declaration to create a virtual method. - /// (Originally from ..\FSComp.txt:1355) + /// (Originally from ..\FSComp.txt:1356) static member keywordDescriptionDefault() = (GetStringFunc("keywordDescriptionDefault",",,,") ) /// Used to declare a delegate. - /// (Originally from ..\FSComp.txt:1356) + /// (Originally from ..\FSComp.txt:1357) static member keywordDescriptionDelegate() = (GetStringFunc("keywordDescriptionDelegate",",,,") ) /// Used in looping constructs or to execute imperative code. - /// (Originally from ..\FSComp.txt:1357) + /// (Originally from ..\FSComp.txt:1358) static member keywordDescriptionDo() = (GetStringFunc("keywordDescriptionDo",",,,") ) /// In verbose syntax, indicates the end of a block of code in a looping expression. - /// (Originally from ..\FSComp.txt:1358) + /// (Originally from ..\FSComp.txt:1359) static member keywordDescriptionDone() = (GetStringFunc("keywordDescriptionDone",",,,") ) /// Used to convert to a type that is lower in the inheritance chain. - /// (Originally from ..\FSComp.txt:1359) + /// (Originally from ..\FSComp.txt:1360) static member keywordDescriptionDowncast() = (GetStringFunc("keywordDescriptionDowncast",",,,") ) /// In a for expression, used when counting in reverse. - /// (Originally from ..\FSComp.txt:1360) + /// (Originally from ..\FSComp.txt:1361) static member keywordDescriptionDownto() = (GetStringFunc("keywordDescriptionDownto",",,,") ) /// Used in conditional branching. A short form of else if. - /// (Originally from ..\FSComp.txt:1361) + /// (Originally from ..\FSComp.txt:1362) static member keywordDescriptionElif() = (GetStringFunc("keywordDescriptionElif",",,,") ) /// Used in conditional branching. - /// (Originally from ..\FSComp.txt:1362) + /// (Originally from ..\FSComp.txt:1363) static member keywordDescriptionElse() = (GetStringFunc("keywordDescriptionElse",",,,") ) /// In type definitions and type extensions, indicates the end of a section of member definitions. In verbose syntax, used to specify the end of a code block that starts with the begin keyword. - /// (Originally from ..\FSComp.txt:1363) + /// (Originally from ..\FSComp.txt:1364) static member keywordDescriptionEnd() = (GetStringFunc("keywordDescriptionEnd",",,,") ) /// Used to declare an exception type. - /// (Originally from ..\FSComp.txt:1364) + /// (Originally from ..\FSComp.txt:1365) static member keywordDescriptionException() = (GetStringFunc("keywordDescriptionException",",,,") ) /// Indicates that a declared program element is defined in another binary or assembly. - /// (Originally from ..\FSComp.txt:1365) + /// (Originally from ..\FSComp.txt:1366) static member keywordDescriptionExtern() = (GetStringFunc("keywordDescriptionExtern",",,,") ) /// Used as a Boolean literal. - /// (Originally from ..\FSComp.txt:1366) + /// (Originally from ..\FSComp.txt:1367) static member keywordDescriptionTrueFalse() = (GetStringFunc("keywordDescriptionTrueFalse",",,,") ) /// Used together with try to introduce a block of code that executes regardless of whether an exception occurs. - /// (Originally from ..\FSComp.txt:1367) + /// (Originally from ..\FSComp.txt:1368) static member keywordDescriptionFinally() = (GetStringFunc("keywordDescriptionFinally",",,,") ) /// Used in looping constructs. - /// (Originally from ..\FSComp.txt:1368) + /// (Originally from ..\FSComp.txt:1369) static member keywordDescriptionFor() = (GetStringFunc("keywordDescriptionFor",",,,") ) /// Used in lambda expressions, also known as anonymous functions. - /// (Originally from ..\FSComp.txt:1369) + /// (Originally from ..\FSComp.txt:1370) static member keywordDescriptionFun() = (GetStringFunc("keywordDescriptionFun",",,,") ) /// Used as a shorter alternative to the fun keyword and a match expression in a lambda expression that has pattern matching on a single argument. - /// (Originally from ..\FSComp.txt:1370) + /// (Originally from ..\FSComp.txt:1371) static member keywordDescriptionFunction() = (GetStringFunc("keywordDescriptionFunction",",,,") ) /// Used to reference the top-level .NET namespace. - /// (Originally from ..\FSComp.txt:1371) + /// (Originally from ..\FSComp.txt:1372) static member keywordDescriptionGlobal() = (GetStringFunc("keywordDescriptionGlobal",",,,") ) /// Used in conditional branching constructs. - /// (Originally from ..\FSComp.txt:1372) + /// (Originally from ..\FSComp.txt:1373) static member keywordDescriptionIf() = (GetStringFunc("keywordDescriptionIf",",,,") ) /// Used for sequence expressions and, in verbose syntax, to separate expressions from bindings. - /// (Originally from ..\FSComp.txt:1373) + /// (Originally from ..\FSComp.txt:1374) static member keywordDescriptionIn() = (GetStringFunc("keywordDescriptionIn",",,,") ) /// Used to specify a base class or base interface. - /// (Originally from ..\FSComp.txt:1374) + /// (Originally from ..\FSComp.txt:1375) static member keywordDescriptionInherit() = (GetStringFunc("keywordDescriptionInherit",",,,") ) /// Used to indicate a function that should be integrated directly into the caller's code. - /// (Originally from ..\FSComp.txt:1375) + /// (Originally from ..\FSComp.txt:1376) static member keywordDescriptionInline() = (GetStringFunc("keywordDescriptionInline",",,,") ) /// Used to declare and implement interfaces. - /// (Originally from ..\FSComp.txt:1376) + /// (Originally from ..\FSComp.txt:1377) static member keywordDescriptionInterface() = (GetStringFunc("keywordDescriptionInterface",",,,") ) /// Used to specify that a member is visible inside an assembly but not outside it. - /// (Originally from ..\FSComp.txt:1377) + /// (Originally from ..\FSComp.txt:1378) static member keywordDescriptionInternal() = (GetStringFunc("keywordDescriptionInternal",",,,") ) /// Used to specify a computation that is to be performed only when a result is needed. - /// (Originally from ..\FSComp.txt:1378) + /// (Originally from ..\FSComp.txt:1379) static member keywordDescriptionLazy() = (GetStringFunc("keywordDescriptionLazy",",,,") ) /// Used to associate, or bind, a name to a value or function. - /// (Originally from ..\FSComp.txt:1379) + /// (Originally from ..\FSComp.txt:1380) static member keywordDescriptionLet() = (GetStringFunc("keywordDescriptionLet",",,,") ) /// Used in computation expressions to bind a name to the result of another computation expression. - /// (Originally from ..\FSComp.txt:1380) + /// (Originally from ..\FSComp.txt:1381) static member keywordDescriptionLetBang() = (GetStringFunc("keywordDescriptionLetBang",",,,") ) /// Used to branch by comparing a value to a pattern. - /// (Originally from ..\FSComp.txt:1381) + /// (Originally from ..\FSComp.txt:1382) static member keywordDescriptionMatch() = (GetStringFunc("keywordDescriptionMatch",",,,") ) /// Used in computation expressions to pattern match directly over the result of another computation expression. - /// (Originally from ..\FSComp.txt:1382) + /// (Originally from ..\FSComp.txt:1383) static member keywordDescriptionMatchBang() = (GetStringFunc("keywordDescriptionMatchBang",",,,") ) /// Used to declare a property or method in an object type. - /// (Originally from ..\FSComp.txt:1383) + /// (Originally from ..\FSComp.txt:1384) static member keywordDescriptionMember() = (GetStringFunc("keywordDescriptionMember",",,,") ) /// Used to associate a name with a group of related types, values, and functions, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1384) + /// (Originally from ..\FSComp.txt:1385) static member keywordDescriptionModule() = (GetStringFunc("keywordDescriptionModule",",,,") ) /// Used to declare a variable, that is, a value that can be changed. - /// (Originally from ..\FSComp.txt:1385) + /// (Originally from ..\FSComp.txt:1386) static member keywordDescriptionMutable() = (GetStringFunc("keywordDescriptionMutable",",,,") ) /// Used to associate a name with a group of related types and modules, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1386) + /// (Originally from ..\FSComp.txt:1387) static member keywordDescriptionNamespace() = (GetStringFunc("keywordDescriptionNamespace",",,,") ) /// Used to declare, define, or invoke a constructor that creates or that can create an object. Also used in generic parameter constraints to indicate that a type must have a certain constructor. - /// (Originally from ..\FSComp.txt:1387) + /// (Originally from ..\FSComp.txt:1388) static member keywordDescriptionNew() = (GetStringFunc("keywordDescriptionNew",",,,") ) /// Not actually a keyword. However, not struct in combination is used as a generic parameter constraint. - /// (Originally from ..\FSComp.txt:1388) + /// (Originally from ..\FSComp.txt:1389) static member keywordDescriptionNot() = (GetStringFunc("keywordDescriptionNot",",,,") ) /// Indicates the absence of an object. Also used in generic parameter constraints. - /// (Originally from ..\FSComp.txt:1389) + /// (Originally from ..\FSComp.txt:1390) static member keywordDescriptionNull() = (GetStringFunc("keywordDescriptionNull",",,,") ) /// Used in discriminated unions to indicate the type of categories of values, and in delegate and exception declarations. - /// (Originally from ..\FSComp.txt:1390) + /// (Originally from ..\FSComp.txt:1391) static member keywordDescriptionOf() = (GetStringFunc("keywordDescriptionOf",",,,") ) /// Used to make the contents of a namespace or module available without qualification. - /// (Originally from ..\FSComp.txt:1391) + /// (Originally from ..\FSComp.txt:1392) static member keywordDescriptionOpen() = (GetStringFunc("keywordDescriptionOpen",",,,") ) /// Used with Boolean conditions as a Boolean or operator. Equivalent to ||. Also used in member constraints. - /// (Originally from ..\FSComp.txt:1392) + /// (Originally from ..\FSComp.txt:1393) static member keywordDescriptionOr() = (GetStringFunc("keywordDescriptionOr",",,,") ) /// Used to implement a version of an abstract or virtual method that differs from the base version. - /// (Originally from ..\FSComp.txt:1393) + /// (Originally from ..\FSComp.txt:1394) static member keywordDescriptionOverride() = (GetStringFunc("keywordDescriptionOverride",",,,") ) /// Restricts access to a member to code in the same type or module. - /// (Originally from ..\FSComp.txt:1394) + /// (Originally from ..\FSComp.txt:1395) static member keywordDescriptionPrivate() = (GetStringFunc("keywordDescriptionPrivate",",,,") ) /// Allows access to a member from outside the type. - /// (Originally from ..\FSComp.txt:1395) + /// (Originally from ..\FSComp.txt:1396) static member keywordDescriptionPublic() = (GetStringFunc("keywordDescriptionPublic",",,,") ) /// Used to indicate that a function is recursive. - /// (Originally from ..\FSComp.txt:1396) + /// (Originally from ..\FSComp.txt:1397) static member keywordDescriptionRec() = (GetStringFunc("keywordDescriptionRec",",,,") ) /// Used to provide a value for the result of the containing computation expression. - /// (Originally from ..\FSComp.txt:1397) + /// (Originally from ..\FSComp.txt:1398) static member keywordDescriptionReturn() = (GetStringFunc("keywordDescriptionReturn",",,,") ) /// Used to provide a value for the result of the containing computation expression, where that value itself comes from the result another computation expression. - /// (Originally from ..\FSComp.txt:1398) + /// (Originally from ..\FSComp.txt:1399) static member keywordDescriptionReturnBang() = (GetStringFunc("keywordDescriptionReturnBang",",,,") ) /// Used in query expressions to specify what fields or columns to extract. Note that this is a contextual keyword, which means that it is not actually a reserved word and it only acts like a keyword in appropriate context. - /// (Originally from ..\FSComp.txt:1399) + /// (Originally from ..\FSComp.txt:1400) static member keywordDescriptionSelect() = (GetStringFunc("keywordDescriptionSelect",",,,") ) /// Used to indicate a method or property that can be called without an instance of a type, or a value member that is shared among all instances of a type. - /// (Originally from ..\FSComp.txt:1400) + /// (Originally from ..\FSComp.txt:1401) static member keywordDescriptionStatic() = (GetStringFunc("keywordDescriptionStatic",",,,") ) /// Used to declare a structure type. Also used in generic parameter constraints. Used for OCaml compatibility in module definitions. - /// (Originally from ..\FSComp.txt:1401) + /// (Originally from ..\FSComp.txt:1402) static member keywordDescriptionStruct() = (GetStringFunc("keywordDescriptionStruct",",,,") ) /// Used in conditional expressions. Also used to perform side effects after object construction. - /// (Originally from ..\FSComp.txt:1402) + /// (Originally from ..\FSComp.txt:1403) static member keywordDescriptionThen() = (GetStringFunc("keywordDescriptionThen",",,,") ) /// Used in for loops to indicate a range. - /// (Originally from ..\FSComp.txt:1403) + /// (Originally from ..\FSComp.txt:1404) static member keywordDescriptionTo() = (GetStringFunc("keywordDescriptionTo",",,,") ) /// Used to introduce a block of code that might generate an exception. Used together with with or finally. - /// (Originally from ..\FSComp.txt:1404) + /// (Originally from ..\FSComp.txt:1405) static member keywordDescriptionTry() = (GetStringFunc("keywordDescriptionTry",",,,") ) /// Used to declare a class, record, structure, discriminated union, enumeration type, unit of measure, or type abbreviation. - /// (Originally from ..\FSComp.txt:1405) + /// (Originally from ..\FSComp.txt:1406) static member keywordDescriptionType() = (GetStringFunc("keywordDescriptionType",",,,") ) /// Used to convert to a type that is higher in the inheritance chain. - /// (Originally from ..\FSComp.txt:1406) + /// (Originally from ..\FSComp.txt:1407) static member keywordDescriptionUpcast() = (GetStringFunc("keywordDescriptionUpcast",",,,") ) /// Used instead of let for values that implement IDisposable" - /// (Originally from ..\FSComp.txt:1407) + /// (Originally from ..\FSComp.txt:1408) static member keywordDescriptionUse() = (GetStringFunc("keywordDescriptionUse",",,,") ) /// Used instead of let! in computation expressions for computation expression results that implement IDisposable. - /// (Originally from ..\FSComp.txt:1408) + /// (Originally from ..\FSComp.txt:1409) static member keywordDescriptionUseBang() = (GetStringFunc("keywordDescriptionUseBang",",,,") ) /// Used in a signature to indicate a value, or in a type to declare a member, in limited situations. - /// (Originally from ..\FSComp.txt:1409) + /// (Originally from ..\FSComp.txt:1410) static member keywordDescriptionVal() = (GetStringFunc("keywordDescriptionVal",",,,") ) /// Indicates the .NET void type. Used when interoperating with other .NET languages. - /// (Originally from ..\FSComp.txt:1410) + /// (Originally from ..\FSComp.txt:1411) static member keywordDescriptionVoid() = (GetStringFunc("keywordDescriptionVoid",",,,") ) /// Used for Boolean conditions (when guards) on pattern matches and to introduce a constraint clause for a generic type parameter. - /// (Originally from ..\FSComp.txt:1411) + /// (Originally from ..\FSComp.txt:1412) static member keywordDescriptionWhen() = (GetStringFunc("keywordDescriptionWhen",",,,") ) /// Introduces a looping construct. - /// (Originally from ..\FSComp.txt:1412) + /// (Originally from ..\FSComp.txt:1413) static member keywordDescriptionWhile() = (GetStringFunc("keywordDescriptionWhile",",,,") ) /// Used together with the match keyword in pattern matching expressions. Also used in object expressions, record copying expressions, and type extensions to introduce member definitions, and to introduce exception handlers. - /// (Originally from ..\FSComp.txt:1413) + /// (Originally from ..\FSComp.txt:1414) static member keywordDescriptionWith() = (GetStringFunc("keywordDescriptionWith",",,,") ) /// Used in a sequence expression to produce a value for a sequence. - /// (Originally from ..\FSComp.txt:1414) + /// (Originally from ..\FSComp.txt:1415) static member keywordDescriptionYield() = (GetStringFunc("keywordDescriptionYield",",,,") ) /// Used in a computation expression to append the result of a given computation expression to a collection of results for the containing computation expression. - /// (Originally from ..\FSComp.txt:1415) + /// (Originally from ..\FSComp.txt:1416) static member keywordDescriptionYieldBang() = (GetStringFunc("keywordDescriptionYieldBang",",,,") ) /// In function types, delimits arguments and return values. Yields an expression (in sequence expressions); equivalent to the yield keyword. Used in match expressions - /// (Originally from ..\FSComp.txt:1416) + /// (Originally from ..\FSComp.txt:1417) static member keywordDescriptionRightArrow() = (GetStringFunc("keywordDescriptionRightArrow",",,,") ) /// Assigns a value to a variable. - /// (Originally from ..\FSComp.txt:1417) + /// (Originally from ..\FSComp.txt:1418) static member keywordDescriptionLeftArrow() = (GetStringFunc("keywordDescriptionLeftArrow",",,,") ) /// Converts a type to type that is higher in the hierarchy. - /// (Originally from ..\FSComp.txt:1418) + /// (Originally from ..\FSComp.txt:1419) static member keywordDescriptionCast() = (GetStringFunc("keywordDescriptionCast",",,,") ) /// Converts a type to a type that is lower in the hierarchy. - /// (Originally from ..\FSComp.txt:1419) + /// (Originally from ..\FSComp.txt:1420) static member keywordDescriptionDynamicCast() = (GetStringFunc("keywordDescriptionDynamicCast",",,,") ) /// Delimits a typed code quotation. - /// (Originally from ..\FSComp.txt:1420) + /// (Originally from ..\FSComp.txt:1421) static member keywordDescriptionTypedQuotation() = (GetStringFunc("keywordDescriptionTypedQuotation",",,,") ) /// Delimits a untyped code quotation. - /// (Originally from ..\FSComp.txt:1421) + /// (Originally from ..\FSComp.txt:1422) static member keywordDescriptionUntypedQuotation() = (GetStringFunc("keywordDescriptionUntypedQuotation",",,,") ) /// %s '%s' not found in assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1422) + /// (Originally from ..\FSComp.txt:1423) static member itemNotFoundDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String) = (3216, GetStringFunc("itemNotFoundDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s '%s' not found in type '%s' from assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1423) + /// (Originally from ..\FSComp.txt:1424) static member itemNotFoundInTypeDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3216, GetStringFunc("itemNotFoundInTypeDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// is - /// (Originally from ..\FSComp.txt:1424) + /// (Originally from ..\FSComp.txt:1425) static member descriptionWordIs() = (GetStringFunc("descriptionWordIs",",,,") ) /// This value is not a function and cannot be applied. - /// (Originally from ..\FSComp.txt:1425) + /// (Originally from ..\FSComp.txt:1426) static member notAFunction() = (GetStringFunc("notAFunction",",,,") ) /// This value is not a function and cannot be applied. Did you intend to access the indexer via %s.[index] instead? - /// (Originally from ..\FSComp.txt:1426) + /// (Originally from ..\FSComp.txt:1427) static member notAFunctionButMaybeIndexerWithName(a0 : System.String) = (GetStringFunc("notAFunctionButMaybeIndexerWithName",",,,%s,,,") a0) /// This expression is not a function and cannot be applied. Did you intend to access the indexer via expr.[index] instead? - /// (Originally from ..\FSComp.txt:1427) + /// (Originally from ..\FSComp.txt:1428) static member notAFunctionButMaybeIndexer() = (GetStringFunc("notAFunctionButMaybeIndexer",",,,") ) /// - /// (Originally from ..\FSComp.txt:1428) + /// (Originally from ..\FSComp.txt:1429) static member notAFunctionButMaybeIndexerErrorCode() = (3217, GetStringFunc("notAFunctionButMaybeIndexerErrorCode",",,,") ) /// This value is not a function and cannot be applied. Did you forget to terminate a declaration? - /// (Originally from ..\FSComp.txt:1429) + /// (Originally from ..\FSComp.txt:1430) static member notAFunctionButMaybeDeclaration() = (GetStringFunc("notAFunctionButMaybeDeclaration",",,,") ) /// The argument names in the signature '%s' and implementation '%s' do not match. The argument name from the signature file will be used. This may cause problems when debugging or profiling. - /// (Originally from ..\FSComp.txt:1430) + /// (Originally from ..\FSComp.txt:1431) static member ArgumentsInSigAndImplMismatch(a0 : System.String, a1 : System.String) = (3218, GetStringFunc("ArgumentsInSigAndImplMismatch",",,,%s,,,%s,,,") a0 a1) /// An error occurred while reading the F# metadata of assembly '%s'. A reserved construct was utilized. You may need to upgrade your F# compiler or use an earlier version of the assembly that doesn't make use of a specific construct. - /// (Originally from ..\FSComp.txt:1431) + /// (Originally from ..\FSComp.txt:1432) static member pickleUnexpectedNonZero(a0 : System.String) = (3219, GetStringFunc("pickleUnexpectedNonZero",",,,%s,,,") a0) /// This method or property is not normally used from F# code, use an explicit tuple pattern for deconstruction instead. - /// (Originally from ..\FSComp.txt:1432) + /// (Originally from ..\FSComp.txt:1433) static member tcTupleMemberNotNormallyUsed() = (3220, GetStringFunc("tcTupleMemberNotNormallyUsed",",,,") ) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield'. - /// (Originally from ..\FSComp.txt:1433) + /// (Originally from ..\FSComp.txt:1434) static member implicitlyDiscardedInSequenceExpression(a0 : System.String) = (3221, GetStringFunc("implicitlyDiscardedInSequenceExpression",",,,%s,,,") a0) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield!'. - /// (Originally from ..\FSComp.txt:1434) + /// (Originally from ..\FSComp.txt:1435) static member implicitlyDiscardedSequenceInSequenceExpression(a0 : System.String) = (3222, GetStringFunc("implicitlyDiscardedSequenceInSequenceExpression",",,,%s,,,") a0) /// The file '%s' changed on disk unexpectedly, please reload. - /// (Originally from ..\FSComp.txt:1435) + /// (Originally from ..\FSComp.txt:1436) static member ilreadFileChanged(a0 : System.String) = (3223, GetStringFunc("ilreadFileChanged",",,,%s,,,") a0) /// The byref pointer is readonly, so this write is not permitted. - /// (Originally from ..\FSComp.txt:1436) + /// (Originally from ..\FSComp.txt:1437) static member writeToReadOnlyByref() = (3224, GetStringFunc("writeToReadOnlyByref",",,,") ) /// A ReadOnly attribute has been applied to a struct type with a mutable field. - /// (Originally from ..\FSComp.txt:1437) + /// (Originally from ..\FSComp.txt:1438) static member readOnlyAttributeOnStructWithMutableField() = (3225, GetStringFunc("readOnlyAttributeOnStructWithMutableField",",,,") ) /// A byref pointer returned by a function or method is implicitly dereferenced as of F# 4.5. To acquire the return value as a pointer, use the address-of operator, e.g. '&f(x)' or '&obj.Method(arg1, arg2)'. - /// (Originally from ..\FSComp.txt:1438) + /// (Originally from ..\FSComp.txt:1439) static member tcByrefReturnImplicitlyDereferenced() = (3226, GetStringFunc("tcByrefReturnImplicitlyDereferenced",",,,") ) /// A type annotated with IsByRefLike must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1439) + /// (Originally from ..\FSComp.txt:1440) static member tcByRefLikeNotStruct() = (3227, GetStringFunc("tcByRefLikeNotStruct",",,,") ) /// The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1440) - static member chkNoByrefAddressOfValueFromExpression() = (3228, GetStringFunc("chkNoByrefAddressOfValueFromExpression",",,,") ) - /// This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope. /// (Originally from ..\FSComp.txt:1441) - static member chkNoWriteToLimitedSpan(a0 : System.String) = (3229, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0) - /// A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...' + static member chkNoByrefAddressOfValueFromExpression() = (3228, GetStringFunc("chkNoByrefAddressOfValueFromExpression",",,,") ) + /// The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope. /// (Originally from ..\FSComp.txt:1442) - static member tastValueMustBeLocal() = (3230, GetStringFunc("tastValueMustBeLocal",",,,") ) - /// A type annotated with IsReadOnly must also be a struct. Consider adding the [] attribute to the type. + static member chkNoReturnOfLimitedSpan() = (3229, GetStringFunc("chkNoReturnOfLimitedSpan",",,,") ) + /// This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope. /// (Originally from ..\FSComp.txt:1443) - static member tcIsReadOnlyNotStruct() = (3231, GetStringFunc("tcIsReadOnlyNotStruct",",,,") ) - /// Struct members cannot return the address of fields of the struct by reference + static member chkNoWriteToLimitedSpan(a0 : System.String) = (3230, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0) + /// A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...' /// (Originally from ..\FSComp.txt:1444) - static member chkStructsMayNotReturnAddressesOfContents() = (3232, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,") ) - /// The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope. + static member tastValueMustBeLocal() = (3231, GetStringFunc("tastValueMustBeLocal",",,,") ) + /// A type annotated with IsReadOnly must also be a struct. Consider adding the [] attribute to the type. /// (Originally from ..\FSComp.txt:1445) - static member chkNoByrefLikeFunctionCall() = (3233, GetStringFunc("chkNoByrefLikeFunctionCall",",,,") ) - /// The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope. + static member tcIsReadOnlyNotStruct() = (3232, GetStringFunc("tcIsReadOnlyNotStruct",",,,") ) + /// Struct members cannot return the address of fields of the struct by reference /// (Originally from ..\FSComp.txt:1446) - static member chkNoSpanLikeVariable(a0 : System.String) = (3234, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0) - /// A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope. + static member chkStructsMayNotReturnAddressesOfContents() = (3233, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,") ) + /// The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope. /// (Originally from ..\FSComp.txt:1447) - static member chkNoSpanLikeValueFromExpression() = (3235, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,") ) - /// Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address. + static member chkNoByrefLikeFunctionCall() = (3234, GetStringFunc("chkNoByrefLikeFunctionCall",",,,") ) + /// The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope. /// (Originally from ..\FSComp.txt:1448) - static member tastCantTakeAddressOfExpression() = (3236, GetStringFunc("tastCantTakeAddressOfExpression",",,,") ) - /// Cannot call the byref extension method '%s. The first parameter requires the value to be mutable or a non-readonly byref type. + static member chkNoSpanLikeVariable(a0 : System.String) = (3235, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0) + /// A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope. /// (Originally from ..\FSComp.txt:1449) - static member tcCannotCallExtensionMethodInrefToByref(a0 : System.String) = (3237, GetStringFunc("tcCannotCallExtensionMethodInrefToByref",",,,%s,,,") a0) - /// Byref types are not allowed to have optional type extensions. + static member chkNoSpanLikeValueFromExpression() = (3236, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,") ) + /// Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address. /// (Originally from ..\FSComp.txt:1450) - static member tcByrefsMayNotHaveTypeExtensions() = (3238, GetStringFunc("tcByrefsMayNotHaveTypeExtensions",",,,") ) - /// Cannot partially apply the extension method '%s' because the first parameter is a byref type. - /// (Originally from ..\FSComp.txt:1451) - static member tcCannotPartiallyApplyExtensionMethodForByref(a0 : System.String) = (3239, GetStringFunc("tcCannotPartiallyApplyExtensionMethodForByref",",,,%s,,,") a0) + static member tastCantTakeAddressOfExpression() = (3237, GetStringFunc("tastCantTakeAddressOfExpression",",,,") ) /// This type does not inherit Attribute, it will not work correctly with other .NET languages. - /// (Originally from ..\FSComp.txt:1452) + /// (Originally from ..\FSComp.txt:1451) static member tcTypeDoesNotInheritAttribute() = (3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,") ) /// Invalid anonymous record expression - /// (Originally from ..\FSComp.txt:1453) + /// (Originally from ..\FSComp.txt:1452) static member parsInvalidAnonRecdExpr() = (3243, GetStringFunc("parsInvalidAnonRecdExpr",",,,") ) /// Invalid anonymous record type - /// (Originally from ..\FSComp.txt:1454) + /// (Originally from ..\FSComp.txt:1453) static member parsInvalidAnonRecdType() = (3244, GetStringFunc("parsInvalidAnonRecdType",",,,") ) /// The input to a copy-and-update expression that creates an anonymous record must be either an anonymous record or a record - /// (Originally from ..\FSComp.txt:1455) + /// (Originally from ..\FSComp.txt:1454) static member tcCopyAndUpdateNeedsRecordType() = (3245, GetStringFunc("tcCopyAndUpdateNeedsRecordType",",,,") ) - /// The type '%s' does not support a nullness qualitification. + /// The dependency manager extension %s could not be loaded: %s + /// (Originally from ..\FSComp.txt:1455) + static member couldNotLoadDependencyManagerExtension(a0 : System.String, a1 : System.String) = (3246, GetStringFunc("couldNotLoadDependencyManagerExtension",",,,%s,,,%s,,,") a0 a1) + /// Package manager key '%s' was not registered in %s. Currently registered: %s /// (Originally from ..\FSComp.txt:1456) - static member tcTypeDoesNotHaveAnyNull(a0 : System.String) = (3260, GetStringFunc("tcTypeDoesNotHaveAnyNull",",,,%s,,,") a0) - /// This language feature is not enabled, use /langversion:5.0 or greater to enable it - /// (Originally from ..\FSComp.txt:1461) - static member tcLangFeatureNotEnabled50() = (3265, GetStringFunc("tcLangFeatureNotEnabled50",",,,") ) - /// Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - /// (Originally from ..\FSComp.txt:1462) - static member tcDefaultStructConstructorCallNulls() = (3266, GetStringFunc("tcDefaultStructConstructorCallNulls",",,,") ) - /// Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - /// (Originally from ..\FSComp.txt:1463) - static member chkValueWithDefaultValueMustHaveDefaultValueNulls() = (3267, GetStringFunc("chkValueWithDefaultValueMustHaveDefaultValueNulls",",,,") ) - /// The constraints 'null' and 'not null' are inconsistent - /// (Originally from ..\FSComp.txt:1464) - static member csNullNotNullConstraintInconsistent() = (3268, GetStringFunc("csNullNotNullConstraintInconsistent",",,,") ) - /// The constraints 'struct' and 'null' are inconsistent - /// (Originally from ..\FSComp.txt:1465) - static member csStructNullConstraintInconsistent() = (3269, GetStringFunc("csStructNullConstraintInconsistent",",,,") ) - /// The constraints 'delegate' and 'comparison' are inconsistent - /// (Originally from ..\FSComp.txt:1466) - static member csDelegateComparisonConstraintInconsistent() = (3270, GetStringFunc("csDelegateComparisonConstraintInconsistent",",,,") ) - /// The /checknulls language feature is not enabled - /// (Originally from ..\FSComp.txt:1467) - static member tcNullnessCheckingNotEnabled() = (3271, GetStringFunc("tcNullnessCheckingNotEnabled",",,,") ) - /// The type '%s' has 'null' as a true representation value but a constraint does not permit this - /// (Originally from ..\FSComp.txt:1468) - static member csTypeHasNullAsTrueValue(a0 : System.String) = (GetStringFunc("csTypeHasNullAsTrueValue",",,,%s,,,") a0) - /// The type '%s' has 'null' as an extra value but a constraint does not permit this - /// (Originally from ..\FSComp.txt:1469) - static member csTypeHasNullAsExtraValue(a0 : System.String) = (GetStringFunc("csTypeHasNullAsExtraValue",",,,%s,,,") a0) - /// The parameter '%s' has an invalid type '%s'. This is not permitted by the rules of Common IL. - /// (Originally from ..\FSComp.txt:1470) - static member chkInvalidFunctionParameterType(a0 : System.String, a1 : System.String) = (3300, GetStringFunc("chkInvalidFunctionParameterType",",,,%s,,,%s,,,") a0 a1) - /// The function or method has an invalid return type '%s'. This is not permitted by the rules of Common IL. - /// (Originally from ..\FSComp.txt:1471) - static member chkInvalidFunctionReturnType(a0 : System.String) = (3301, GetStringFunc("chkInvalidFunctionReturnType",",,,%s,,,") a0) - /// Enable nullness declarations and checks - /// (Originally from ..\FSComp.txt:1472) - static member optsCheckNulls() = (GetStringFunc("optsCheckNulls",",,,") ) - /// Specify the language version - /// (Originally from ..\FSComp.txt:1473) - static member optsLangVersion() = (GetStringFunc("optsLangVersion",",,,") ) + static member packageManagerUnknown(a0 : System.String, a1 : System.String, a2 : System.String) = (3247, GetStringFunc("packageManagerUnknown",",,,%s,,,%s,,,%s,,,") a0 a1 a2) + /// %s + /// (Originally from ..\FSComp.txt:1457) + static member packageManagerError(a0 : System.String) = (3248, GetStringFunc("packageManagerError",",,,%s,,,") a0) /// Call this method once to validate that all known resources are valid; throws if not static member RunStartupValidation() = @@ -5270,6 +5234,7 @@ type internal SR private() = ignore(GetString("optsNoInterface")) ignore(GetString("optsSig")) ignore(GetString("optsReference")) + ignore(GetString("optsCompilerTool")) ignore(GetString("optsWin32res")) ignore(GetString("optsWin32manifest")) ignore(GetString("optsNowin32manifest")) @@ -5849,6 +5814,7 @@ type internal SR private() = ignore(GetString("tcByrefReturnImplicitlyDereferenced")) ignore(GetString("tcByRefLikeNotStruct")) ignore(GetString("chkNoByrefAddressOfValueFromExpression")) + ignore(GetString("chkNoReturnOfLimitedSpan")) ignore(GetString("chkNoWriteToLimitedSpan")) ignore(GetString("tastValueMustBeLocal")) ignore(GetString("tcIsReadOnlyNotStruct")) @@ -5857,25 +5823,11 @@ type internal SR private() = ignore(GetString("chkNoSpanLikeVariable")) ignore(GetString("chkNoSpanLikeValueFromExpression")) ignore(GetString("tastCantTakeAddressOfExpression")) - ignore(GetString("tcCannotCallExtensionMethodInrefToByref")) - ignore(GetString("tcByrefsMayNotHaveTypeExtensions")) - ignore(GetString("tcCannotPartiallyApplyExtensionMethodForByref")) ignore(GetString("tcTypeDoesNotInheritAttribute")) ignore(GetString("parsInvalidAnonRecdExpr")) ignore(GetString("parsInvalidAnonRecdType")) ignore(GetString("tcCopyAndUpdateNeedsRecordType")) - ignore(GetString("tcTypeDoesNotHaveAnyNull")) - ignore(GetString("tcLangFeatureNotEnabled50")) - ignore(GetString("tcDefaultStructConstructorCallNulls")) - ignore(GetString("chkValueWithDefaultValueMustHaveDefaultValueNulls")) - ignore(GetString("csNullNotNullConstraintInconsistent")) - ignore(GetString("csStructNullConstraintInconsistent")) - ignore(GetString("csDelegateComparisonConstraintInconsistent")) - ignore(GetString("tcNullnessCheckingNotEnabled")) - ignore(GetString("csTypeHasNullAsTrueValue")) - ignore(GetString("csTypeHasNullAsExtraValue")) - ignore(GetString("chkInvalidFunctionParameterType")) - ignore(GetString("chkInvalidFunctionReturnType")) - ignore(GetString("optsCheckNulls")) - ignore(GetString("optsLangVersion")) + ignore(GetString("couldNotLoadDependencyManagerExtension")) + ignore(GetString("packageManagerUnknown")) + ignore(GetString("packageManagerError")) () diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index 8f130e8f0c9..a38c71bb2bc 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -2613,6 +2613,9 @@ Reference an assembly (Short form: -r) + + Reference an assembly or diretory containing a design time tool (Short form: -t) + Specify a Win32 resource file (.res) @@ -4351,6 +4354,9 @@ The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. + + The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope. + This value can't be assigned because the target '{0}' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope. @@ -4375,15 +4381,6 @@ Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address. - - Cannot call the byref extension method '{0}. The first parameter requires the value to be mutable or a non-readonly byref type. - - - Byref types are not allowed to have optional type extensions. - - - Cannot partially apply the extension method '{0}' because the first parameter is a byref type. - This type does not inherit Attribute, it will not work correctly with other .NET languages. @@ -4396,46 +4393,13 @@ The input to a copy-and-update expression that creates an anonymous record must be either an anonymous record or a record - - The type '{0}' does not support a nullness qualitification. - - - This language feature is not enabled, use /langversion:5.0 or greater to enable it - - - Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. - - - Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. - - - The constraints 'null' and 'not null' are inconsistent - - - The constraints 'struct' and 'null' are inconsistent - - - The constraints 'delegate' and 'comparison' are inconsistent - - - The /checknulls language feature is not enabled - - - The type '{0}' has 'null' as a true representation value but a constraint does not permit this - - - The type '{0}' has 'null' as an extra value but a constraint does not permit this - - - The parameter '{0}' has an invalid type '{1}'. This is not permitted by the rules of Common IL. - - - The function or method has an invalid return type '{0}'. This is not permitted by the rules of Common IL. + + The dependency manager extension {0} could not be loaded: {1} - - Enable nullness declarations and checks + + Package manager key '{0}' was not registered in {1}. Currently registered: {2} - - Specify the language version + + {0} \ No newline at end of file From e82988f9edc8fdb434f0fe76ad05000b877ecf8f Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 14 Jan 2019 13:17:52 +0000 Subject: [PATCH 051/137] fix build from source --- .../FSharp.Compiler.Private/FSComp.fs | 1282 +++++++++-------- .../FSharp.Compiler.Private/FSComp.resx | 60 +- .../BindingExpressions/Binding/in05.fs | 1 - 3 files changed, 713 insertions(+), 630 deletions(-) diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs index d857a04d533..6fe336ced15 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.fs @@ -2611,1794 +2611,1830 @@ type internal SR private() = /// Reference an assembly (Short form: -r) /// (Originally from ..\FSComp.txt:843) static member optsReference() = (GetStringFunc("optsReference",",,,") ) - /// Reference an assembly or diretory containing a design time tool (Short form: -t) - /// (Originally from ..\FSComp.txt:844) - static member optsCompilerTool() = (GetStringFunc("optsCompilerTool",",,,") ) /// Specify a Win32 resource file (.res) - /// (Originally from ..\FSComp.txt:845) + /// (Originally from ..\FSComp.txt:844) static member optsWin32res() = (GetStringFunc("optsWin32res",",,,") ) /// Specify a Win32 manifest file - /// (Originally from ..\FSComp.txt:846) + /// (Originally from ..\FSComp.txt:845) static member optsWin32manifest() = (GetStringFunc("optsWin32manifest",",,,") ) /// Do not include the default Win32 manifest - /// (Originally from ..\FSComp.txt:847) + /// (Originally from ..\FSComp.txt:846) static member optsNowin32manifest() = (GetStringFunc("optsNowin32manifest",",,,") ) /// Embed all source files in the portable PDB file - /// (Originally from ..\FSComp.txt:848) + /// (Originally from ..\FSComp.txt:847) static member optsEmbedAllSource() = (GetStringFunc("optsEmbedAllSource",",,,") ) /// Embed specific source files in the portable PDB file - /// (Originally from ..\FSComp.txt:849) + /// (Originally from ..\FSComp.txt:848) static member optsEmbedSource() = (GetStringFunc("optsEmbedSource",",,,") ) /// Source link information file to embed in the portable PDB file - /// (Originally from ..\FSComp.txt:850) + /// (Originally from ..\FSComp.txt:849) static member optsSourceLink() = (GetStringFunc("optsSourceLink",",,,") ) /// --embed switch only supported when emitting a Portable PDB (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:851) + /// (Originally from ..\FSComp.txt:850) static member optsEmbeddedSourceRequirePortablePDBs() = (1501, GetStringFunc("optsEmbeddedSourceRequirePortablePDBs",",,,") ) /// --sourcelink switch only supported when emitting a Portable PDB (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:852) + /// (Originally from ..\FSComp.txt:851) static member optsSourceLinkRequirePortablePDBs() = (1502, GetStringFunc("optsSourceLinkRequirePortablePDBs",",,,") ) /// Source file is too large to embed in a portable PDB - /// (Originally from ..\FSComp.txt:853) + /// (Originally from ..\FSComp.txt:852) static member srcFileTooLarge() = (GetStringFunc("srcFileTooLarge",",,,") ) /// Embed the specified managed resource - /// (Originally from ..\FSComp.txt:854) + /// (Originally from ..\FSComp.txt:853) static member optsResource() = (GetStringFunc("optsResource",",,,") ) /// Link the specified resource to this assembly where the resinfo format is [,[,public|private]] - /// (Originally from ..\FSComp.txt:855) + /// (Originally from ..\FSComp.txt:854) static member optsLinkresource() = (GetStringFunc("optsLinkresource",",,,") ) /// Emit debug information (Short form: -g) - /// (Originally from ..\FSComp.txt:856) + /// (Originally from ..\FSComp.txt:855) static member optsDebugPM() = (GetStringFunc("optsDebugPM",",,,") ) /// Specify debugging type: full, portable, embedded, pdbonly. ('%s' is the default if no debuggging type specified and enables attaching a debugger to a running program, 'portable' is a cross-platform format, 'embedded' is a cross-platform format embedded into the output file). - /// (Originally from ..\FSComp.txt:857) + /// (Originally from ..\FSComp.txt:856) static member optsDebug(a0 : System.String) = (GetStringFunc("optsDebug",",,,%s,,,") a0) /// Enable optimizations (Short form: -O) - /// (Originally from ..\FSComp.txt:858) + /// (Originally from ..\FSComp.txt:857) static member optsOptimize() = (GetStringFunc("optsOptimize",",,,") ) /// Enable or disable tailcalls - /// (Originally from ..\FSComp.txt:859) + /// (Originally from ..\FSComp.txt:858) static member optsTailcalls() = (GetStringFunc("optsTailcalls",",,,") ) /// Produce a deterministic assembly (including module version GUID and timestamp) - /// (Originally from ..\FSComp.txt:860) + /// (Originally from ..\FSComp.txt:859) static member optsDeterministic() = (GetStringFunc("optsDeterministic",",,,") ) /// Enable or disable cross-module optimizations - /// (Originally from ..\FSComp.txt:861) + /// (Originally from ..\FSComp.txt:860) static member optsCrossoptimize() = (GetStringFunc("optsCrossoptimize",",,,") ) /// Report all warnings as errors - /// (Originally from ..\FSComp.txt:862) + /// (Originally from ..\FSComp.txt:861) static member optsWarnaserrorPM() = (GetStringFunc("optsWarnaserrorPM",",,,") ) /// Report specific warnings as errors - /// (Originally from ..\FSComp.txt:863) + /// (Originally from ..\FSComp.txt:862) static member optsWarnaserror() = (GetStringFunc("optsWarnaserror",",,,") ) /// Set a warning level (0-5) - /// (Originally from ..\FSComp.txt:864) + /// (Originally from ..\FSComp.txt:863) static member optsWarn() = (GetStringFunc("optsWarn",",,,") ) /// Disable specific warning messages - /// (Originally from ..\FSComp.txt:865) + /// (Originally from ..\FSComp.txt:864) static member optsNowarn() = (GetStringFunc("optsNowarn",",,,") ) /// Enable specific warnings that may be off by default - /// (Originally from ..\FSComp.txt:866) + /// (Originally from ..\FSComp.txt:865) static member optsWarnOn() = (GetStringFunc("optsWarnOn",",,,") ) /// Generate overflow checks - /// (Originally from ..\FSComp.txt:867) + /// (Originally from ..\FSComp.txt:866) static member optsChecked() = (GetStringFunc("optsChecked",",,,") ) /// Define conditional compilation symbols (Short form: -d) - /// (Originally from ..\FSComp.txt:868) + /// (Originally from ..\FSComp.txt:867) static member optsDefine() = (GetStringFunc("optsDefine",",,,") ) /// Ignore ML compatibility warnings - /// (Originally from ..\FSComp.txt:869) + /// (Originally from ..\FSComp.txt:868) static member optsMlcompatibility() = (GetStringFunc("optsMlcompatibility",",,,") ) /// Suppress compiler copyright message - /// (Originally from ..\FSComp.txt:870) + /// (Originally from ..\FSComp.txt:869) static member optsNologo() = (GetStringFunc("optsNologo",",,,") ) /// Display this usage message (Short form: -?) - /// (Originally from ..\FSComp.txt:871) + /// (Originally from ..\FSComp.txt:870) static member optsHelp() = (GetStringFunc("optsHelp",",,,") ) /// Read response file for more options - /// (Originally from ..\FSComp.txt:872) + /// (Originally from ..\FSComp.txt:871) static member optsResponseFile() = (GetStringFunc("optsResponseFile",",,,") ) /// Specify the codepage used to read source files - /// (Originally from ..\FSComp.txt:873) + /// (Originally from ..\FSComp.txt:872) static member optsCodepage() = (GetStringFunc("optsCodepage",",,,") ) /// Output messages in UTF-8 encoding - /// (Originally from ..\FSComp.txt:874) + /// (Originally from ..\FSComp.txt:873) static member optsUtf8output() = (GetStringFunc("optsUtf8output",",,,") ) /// Output messages with fully qualified paths - /// (Originally from ..\FSComp.txt:875) + /// (Originally from ..\FSComp.txt:874) static member optsFullpaths() = (GetStringFunc("optsFullpaths",",,,") ) /// Specify a directory for the include path which is used to resolve source files and assemblies (Short form: -I) - /// (Originally from ..\FSComp.txt:876) + /// (Originally from ..\FSComp.txt:875) static member optsLib() = (GetStringFunc("optsLib",",,,") ) /// Base address for the library to be built - /// (Originally from ..\FSComp.txt:877) + /// (Originally from ..\FSComp.txt:876) static member optsBaseaddress() = (GetStringFunc("optsBaseaddress",",,,") ) /// Do not reference the default CLI assemblies by default - /// (Originally from ..\FSComp.txt:878) + /// (Originally from ..\FSComp.txt:877) static member optsNoframework() = (GetStringFunc("optsNoframework",",,,") ) /// Statically link the F# library and all referenced DLLs that depend on it into the assembly being generated - /// (Originally from ..\FSComp.txt:879) + /// (Originally from ..\FSComp.txt:878) static member optsStandalone() = (GetStringFunc("optsStandalone",",,,") ) /// Statically link the given assembly and all referenced DLLs that depend on this assembly. Use an assembly name e.g. mylib, not a DLL name. - /// (Originally from ..\FSComp.txt:880) + /// (Originally from ..\FSComp.txt:879) static member optsStaticlink() = (GetStringFunc("optsStaticlink",",,,") ) /// Use a resident background compilation service to improve compiler startup times. - /// (Originally from ..\FSComp.txt:881) + /// (Originally from ..\FSComp.txt:880) static member optsResident() = (GetStringFunc("optsResident",",,,") ) /// Name the output debug file - /// (Originally from ..\FSComp.txt:882) + /// (Originally from ..\FSComp.txt:881) static member optsPdb() = (GetStringFunc("optsPdb",",,,") ) /// Resolve assembly references using directory-based rules rather than MSBuild resolution - /// (Originally from ..\FSComp.txt:883) + /// (Originally from ..\FSComp.txt:882) static member optsSimpleresolution() = (GetStringFunc("optsSimpleresolution",",,,") ) /// Unrecognized target '%s', expected 'exe', 'winexe', 'library' or 'module' - /// (Originally from ..\FSComp.txt:884) + /// (Originally from ..\FSComp.txt:883) static member optsUnrecognizedTarget(a0 : System.String) = (1048, GetStringFunc("optsUnrecognizedTarget",",,,%s,,,") a0) /// Unrecognized debug type '%s', expected 'pdbonly' or 'full' - /// (Originally from ..\FSComp.txt:885) + /// (Originally from ..\FSComp.txt:884) static member optsUnrecognizedDebugType(a0 : System.String) = (1049, GetStringFunc("optsUnrecognizedDebugType",",,,%s,,,") a0) /// Invalid warning level '%d' - /// (Originally from ..\FSComp.txt:886) + /// (Originally from ..\FSComp.txt:885) static member optsInvalidWarningLevel(a0 : System.Int32) = (1050, GetStringFunc("optsInvalidWarningLevel",",,,%d,,,") a0) /// Short form of '%s' - /// (Originally from ..\FSComp.txt:887) + /// (Originally from ..\FSComp.txt:886) static member optsShortFormOf(a0 : System.String) = (GetStringFunc("optsShortFormOf",",,,%s,,,") a0) /// The command-line option '--cliroot' has been deprecated. Use an explicit reference to a specific copy of mscorlib.dll instead. - /// (Originally from ..\FSComp.txt:888) + /// (Originally from ..\FSComp.txt:887) static member optsClirootDeprecatedMsg() = (GetStringFunc("optsClirootDeprecatedMsg",",,,") ) /// Use to override where the compiler looks for mscorlib.dll and framework components - /// (Originally from ..\FSComp.txt:889) + /// (Originally from ..\FSComp.txt:888) static member optsClirootDescription() = (GetStringFunc("optsClirootDescription",",,,") ) /// - OUTPUT FILES - - /// (Originally from ..\FSComp.txt:890) + /// (Originally from ..\FSComp.txt:889) static member optsHelpBannerOutputFiles() = (GetStringFunc("optsHelpBannerOutputFiles",",,,") ) /// - INPUT FILES - - /// (Originally from ..\FSComp.txt:891) + /// (Originally from ..\FSComp.txt:890) static member optsHelpBannerInputFiles() = (GetStringFunc("optsHelpBannerInputFiles",",,,") ) /// - RESOURCES - - /// (Originally from ..\FSComp.txt:892) + /// (Originally from ..\FSComp.txt:891) static member optsHelpBannerResources() = (GetStringFunc("optsHelpBannerResources",",,,") ) /// - CODE GENERATION - - /// (Originally from ..\FSComp.txt:893) + /// (Originally from ..\FSComp.txt:892) static member optsHelpBannerCodeGen() = (GetStringFunc("optsHelpBannerCodeGen",",,,") ) /// - ADVANCED - - /// (Originally from ..\FSComp.txt:894) + /// (Originally from ..\FSComp.txt:893) static member optsHelpBannerAdvanced() = (GetStringFunc("optsHelpBannerAdvanced",",,,") ) /// - MISCELLANEOUS - - /// (Originally from ..\FSComp.txt:895) + /// (Originally from ..\FSComp.txt:894) static member optsHelpBannerMisc() = (GetStringFunc("optsHelpBannerMisc",",,,") ) /// - LANGUAGE - - /// (Originally from ..\FSComp.txt:896) + /// (Originally from ..\FSComp.txt:895) static member optsHelpBannerLanguage() = (GetStringFunc("optsHelpBannerLanguage",",,,") ) /// - ERRORS AND WARNINGS - - /// (Originally from ..\FSComp.txt:897) + /// (Originally from ..\FSComp.txt:896) static member optsHelpBannerErrsAndWarns() = (GetStringFunc("optsHelpBannerErrsAndWarns",",,,") ) /// Unknown --test argument: '%s' - /// (Originally from ..\FSComp.txt:898) + /// (Originally from ..\FSComp.txt:897) static member optsUnknownArgumentToTheTestSwitch(a0 : System.String) = (1063, GetStringFunc("optsUnknownArgumentToTheTestSwitch",",,,%s,,,") a0) /// Unrecognized platform '%s', valid values are 'x86', 'x64', 'Itanium', 'anycpu32bitpreferred', and 'anycpu' - /// (Originally from ..\FSComp.txt:899) + /// (Originally from ..\FSComp.txt:898) static member optsUnknownPlatform(a0 : System.String) = (1064, GetStringFunc("optsUnknownPlatform",",,,%s,,,") a0) /// The command-line option '%s' is for test purposes only - /// (Originally from ..\FSComp.txt:900) + /// (Originally from ..\FSComp.txt:899) static member optsInternalNoDescription(a0 : System.String) = (GetStringFunc("optsInternalNoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated - /// (Originally from ..\FSComp.txt:901) + /// (Originally from ..\FSComp.txt:900) static member optsDCLONoDescription(a0 : System.String) = (GetStringFunc("optsDCLONoDescription",",,,%s,,,") a0) /// The command-line option '%s' has been deprecated. Use '%s' instead. - /// (Originally from ..\FSComp.txt:902) + /// (Originally from ..\FSComp.txt:901) static member optsDCLODeprecatedSuggestAlternative(a0 : System.String, a1 : System.String) = (GetStringFunc("optsDCLODeprecatedSuggestAlternative",",,,%s,,,%s,,,") a0 a1) /// The command-line option '%s' has been deprecated. HTML document generation is now part of the F# Power Pack, via the tool FsHtmlDoc.exe. - /// (Originally from ..\FSComp.txt:903) + /// (Originally from ..\FSComp.txt:902) static member optsDCLOHtmlDoc(a0 : System.String) = (GetStringFunc("optsDCLOHtmlDoc",",,,%s,,,") a0) /// Output warning and error messages in color - /// (Originally from ..\FSComp.txt:904) + /// (Originally from ..\FSComp.txt:903) static member optsConsoleColors() = (GetStringFunc("optsConsoleColors",",,,") ) /// Enable high-entropy ASLR - /// (Originally from ..\FSComp.txt:905) + /// (Originally from ..\FSComp.txt:904) static member optsUseHighEntropyVA() = (GetStringFunc("optsUseHighEntropyVA",",,,") ) /// Specify subsystem version of this assembly - /// (Originally from ..\FSComp.txt:906) + /// (Originally from ..\FSComp.txt:905) static member optsSubSystemVersion() = (GetStringFunc("optsSubSystemVersion",",,,") ) /// Specify target framework profile of this assembly. Valid values are mscorlib, netcore or netstandard. Default - mscorlib - /// (Originally from ..\FSComp.txt:907) + /// (Originally from ..\FSComp.txt:906) static member optsTargetProfile() = (GetStringFunc("optsTargetProfile",",,,") ) /// Emit debug information in quotations - /// (Originally from ..\FSComp.txt:908) + /// (Originally from ..\FSComp.txt:907) static member optsEmitDebugInfoInQuotations() = (GetStringFunc("optsEmitDebugInfoInQuotations",",,,") ) /// Specify the preferred output language culture name (e.g. es-ES, ja-JP) - /// (Originally from ..\FSComp.txt:909) + /// (Originally from ..\FSComp.txt:908) static member optsPreferredUiLang() = (GetStringFunc("optsPreferredUiLang",",,,") ) /// Don't copy FSharp.Core.dll along the produced binaries - /// (Originally from ..\FSComp.txt:910) + /// (Originally from ..\FSComp.txt:909) static member optsNoCopyFsharpCore() = (GetStringFunc("optsNoCopyFsharpCore",",,,") ) /// Invalid version '%s' for '--subsystemversion'. The version must be 4.00 or greater. - /// (Originally from ..\FSComp.txt:911) + /// (Originally from ..\FSComp.txt:910) static member optsInvalidSubSystemVersion(a0 : System.String) = (1051, GetStringFunc("optsInvalidSubSystemVersion",",,,%s,,,") a0) /// Invalid value '%s' for '--targetprofile', valid values are 'mscorlib', 'netcore' or 'netstandard'. - /// (Originally from ..\FSComp.txt:912) + /// (Originally from ..\FSComp.txt:911) static member optsInvalidTargetProfile(a0 : System.String) = (1052, GetStringFunc("optsInvalidTargetProfile",",,,%s,,,") a0) /// Full name - /// (Originally from ..\FSComp.txt:913) + /// (Originally from ..\FSComp.txt:912) static member typeInfoFullName() = (GetStringFunc("typeInfoFullName",",,,") ) /// and %d other overloads - /// (Originally from ..\FSComp.txt:917) + /// (Originally from ..\FSComp.txt:916) static member typeInfoOtherOverloads(a0 : System.Int32) = (GetStringFunc("typeInfoOtherOverloads",",,,%d,,,") a0) /// union case - /// (Originally from ..\FSComp.txt:918) + /// (Originally from ..\FSComp.txt:917) static member typeInfoUnionCase() = (GetStringFunc("typeInfoUnionCase",",,,") ) /// active pattern result - /// (Originally from ..\FSComp.txt:919) + /// (Originally from ..\FSComp.txt:918) static member typeInfoActivePatternResult() = (GetStringFunc("typeInfoActivePatternResult",",,,") ) /// active recognizer - /// (Originally from ..\FSComp.txt:920) + /// (Originally from ..\FSComp.txt:919) static member typeInfoActiveRecognizer() = (GetStringFunc("typeInfoActiveRecognizer",",,,") ) /// field - /// (Originally from ..\FSComp.txt:921) + /// (Originally from ..\FSComp.txt:920) static member typeInfoField() = (GetStringFunc("typeInfoField",",,,") ) /// event - /// (Originally from ..\FSComp.txt:922) + /// (Originally from ..\FSComp.txt:921) static member typeInfoEvent() = (GetStringFunc("typeInfoEvent",",,,") ) /// property - /// (Originally from ..\FSComp.txt:923) + /// (Originally from ..\FSComp.txt:922) static member typeInfoProperty() = (GetStringFunc("typeInfoProperty",",,,") ) /// extension - /// (Originally from ..\FSComp.txt:924) + /// (Originally from ..\FSComp.txt:923) static member typeInfoExtension() = (GetStringFunc("typeInfoExtension",",,,") ) /// custom operation - /// (Originally from ..\FSComp.txt:925) + /// (Originally from ..\FSComp.txt:924) static member typeInfoCustomOperation() = (GetStringFunc("typeInfoCustomOperation",",,,") ) /// argument - /// (Originally from ..\FSComp.txt:926) + /// (Originally from ..\FSComp.txt:925) static member typeInfoArgument() = (GetStringFunc("typeInfoArgument",",,,") ) /// anonymous record field - /// (Originally from ..\FSComp.txt:927) + /// (Originally from ..\FSComp.txt:926) static member typeInfoAnonRecdField() = (GetStringFunc("typeInfoAnonRecdField",",,,") ) /// patvar - /// (Originally from ..\FSComp.txt:928) + /// (Originally from ..\FSComp.txt:927) static member typeInfoPatternVariable() = (GetStringFunc("typeInfoPatternVariable",",,,") ) /// namespace - /// (Originally from ..\FSComp.txt:929) + /// (Originally from ..\FSComp.txt:928) static member typeInfoNamespace() = (GetStringFunc("typeInfoNamespace",",,,") ) /// module - /// (Originally from ..\FSComp.txt:930) + /// (Originally from ..\FSComp.txt:929) static member typeInfoModule() = (GetStringFunc("typeInfoModule",",,,") ) /// namespace/module - /// (Originally from ..\FSComp.txt:931) + /// (Originally from ..\FSComp.txt:930) static member typeInfoNamespaceOrModule() = (GetStringFunc("typeInfoNamespaceOrModule",",,,") ) /// from %s - /// (Originally from ..\FSComp.txt:932) + /// (Originally from ..\FSComp.txt:931) static member typeInfoFromFirst(a0 : System.String) = (GetStringFunc("typeInfoFromFirst",",,,%s,,,") a0) /// also from %s - /// (Originally from ..\FSComp.txt:933) + /// (Originally from ..\FSComp.txt:932) static member typeInfoFromNext(a0 : System.String) = (GetStringFunc("typeInfoFromNext",",,,%s,,,") a0) /// generated property - /// (Originally from ..\FSComp.txt:934) + /// (Originally from ..\FSComp.txt:933) static member typeInfoGeneratedProperty() = (GetStringFunc("typeInfoGeneratedProperty",",,,") ) /// generated type - /// (Originally from ..\FSComp.txt:935) + /// (Originally from ..\FSComp.txt:934) static member typeInfoGeneratedType() = (GetStringFunc("typeInfoGeneratedType",",,,") ) /// Found by AssemblyFolders registry key - /// (Originally from ..\FSComp.txt:936) + /// (Originally from ..\FSComp.txt:935) static member assemblyResolutionFoundByAssemblyFoldersKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersKey",",,,") ) /// Found by AssemblyFoldersEx registry key - /// (Originally from ..\FSComp.txt:937) + /// (Originally from ..\FSComp.txt:936) static member assemblyResolutionFoundByAssemblyFoldersExKey() = (GetStringFunc("assemblyResolutionFoundByAssemblyFoldersExKey",",,,") ) /// .NET Framework - /// (Originally from ..\FSComp.txt:938) + /// (Originally from ..\FSComp.txt:937) static member assemblyResolutionNetFramework() = (GetStringFunc("assemblyResolutionNetFramework",",,,") ) /// Global Assembly Cache - /// (Originally from ..\FSComp.txt:939) + /// (Originally from ..\FSComp.txt:938) static member assemblyResolutionGAC() = (GetStringFunc("assemblyResolutionGAC",",,,") ) /// Recursive class hierarchy in type '%s' - /// (Originally from ..\FSComp.txt:940) + /// (Originally from ..\FSComp.txt:939) static member recursiveClassHierarchy(a0 : System.String) = (1089, GetStringFunc("recursiveClassHierarchy",",,,%s,,,") a0) /// Invalid recursive reference to an abstract slot - /// (Originally from ..\FSComp.txt:941) + /// (Originally from ..\FSComp.txt:940) static member InvalidRecursiveReferenceToAbstractSlot() = (1090, GetStringFunc("InvalidRecursiveReferenceToAbstractSlot",",,,") ) /// The event '%s' has a non-standard type. If this event is declared in another CLI language, you may need to access this event using the explicit %s and %s methods for the event. If this event is declared in F#, make the type of the event an instantiation of either 'IDelegateEvent<_>' or 'IEvent<_,_>'. - /// (Originally from ..\FSComp.txt:942) + /// (Originally from ..\FSComp.txt:941) static member eventHasNonStandardType(a0 : System.String, a1 : System.String, a2 : System.String) = (1091, GetStringFunc("eventHasNonStandardType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:943) + /// (Originally from ..\FSComp.txt:942) static member typeIsNotAccessible(a0 : System.String) = (1092, GetStringFunc("typeIsNotAccessible",",,,%s,,,") a0) /// The union cases or fields of the type '%s' are not accessible from this code location - /// (Originally from ..\FSComp.txt:944) + /// (Originally from ..\FSComp.txt:943) static member unionCasesAreNotAccessible(a0 : System.String) = (1093, GetStringFunc("unionCasesAreNotAccessible",",,,%s,,,") a0) /// The value '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:945) + /// (Originally from ..\FSComp.txt:944) static member valueIsNotAccessible(a0 : System.String) = (1094, GetStringFunc("valueIsNotAccessible",",,,%s,,,") a0) /// The union case '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:946) + /// (Originally from ..\FSComp.txt:945) static member unionCaseIsNotAccessible(a0 : System.String) = (1095, GetStringFunc("unionCaseIsNotAccessible",",,,%s,,,") a0) /// The record, struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:947) + /// (Originally from ..\FSComp.txt:946) static member fieldIsNotAccessible(a0 : System.String) = (1096, GetStringFunc("fieldIsNotAccessible",",,,%s,,,") a0) /// The struct or class field '%s' is not accessible from this code location - /// (Originally from ..\FSComp.txt:948) + /// (Originally from ..\FSComp.txt:947) static member structOrClassFieldIsNotAccessible(a0 : System.String) = (1097, GetStringFunc("structOrClassFieldIsNotAccessible",",,,%s,,,") a0) /// This construct is experimental - /// (Originally from ..\FSComp.txt:949) + /// (Originally from ..\FSComp.txt:948) static member experimentalConstruct() = (GetStringFunc("experimentalConstruct",",,,") ) /// No Invoke methods found for delegate type - /// (Originally from ..\FSComp.txt:950) + /// (Originally from ..\FSComp.txt:949) static member noInvokeMethodsFound() = (1099, GetStringFunc("noInvokeMethodsFound",",,,") ) /// More than one Invoke method found for delegate type - /// (Originally from ..\FSComp.txt:951) + /// (Originally from ..\FSComp.txt:950) static member moreThanOneInvokeMethodFound() = (GetStringFunc("moreThanOneInvokeMethodFound",",,,") ) /// Delegates are not allowed to have curried signatures - /// (Originally from ..\FSComp.txt:952) + /// (Originally from ..\FSComp.txt:951) static member delegatesNotAllowedToHaveCurriedSignatures() = (1101, GetStringFunc("delegatesNotAllowedToHaveCurriedSignatures",",,,") ) /// Unexpected Expr.TyChoose - /// (Originally from ..\FSComp.txt:953) + /// (Originally from ..\FSComp.txt:952) static member tlrUnexpectedTExpr() = (1102, GetStringFunc("tlrUnexpectedTExpr",",,,") ) /// Note: Lambda-lifting optimizations have not been applied because of the use of this local constrained generic function as a first class value. Adding type constraints may resolve this condition. - /// (Originally from ..\FSComp.txt:954) + /// (Originally from ..\FSComp.txt:953) static member tlrLambdaLiftingOptimizationsNotApplied() = (1103, GetStringFunc("tlrLambdaLiftingOptimizationsNotApplied",",,,") ) /// Identifiers containing '@' are reserved for use in F# code generation - /// (Originally from ..\FSComp.txt:955) + /// (Originally from ..\FSComp.txt:954) static member lexhlpIdentifiersContainingAtSymbolReserved() = (1104, GetStringFunc("lexhlpIdentifiersContainingAtSymbolReserved",",,,") ) /// The identifier '%s' is reserved for future use by F# - /// (Originally from ..\FSComp.txt:956) + /// (Originally from ..\FSComp.txt:955) static member lexhlpIdentifierReserved(a0 : System.String) = (GetStringFunc("lexhlpIdentifierReserved",",,,%s,,,") a0) /// Missing variable '%s' - /// (Originally from ..\FSComp.txt:957) + /// (Originally from ..\FSComp.txt:956) static member patcMissingVariable(a0 : System.String) = (1106, GetStringFunc("patcMissingVariable",",,,%s,,,") a0) /// Partial active patterns may only generate one result - /// (Originally from ..\FSComp.txt:958) + /// (Originally from ..\FSComp.txt:957) static member patcPartialActivePatternsGenerateOneResult() = (1107, GetStringFunc("patcPartialActivePatternsGenerateOneResult",",,,") ) /// The type '%s' is required here and is unavailable. You must add a reference to assembly '%s'. - /// (Originally from ..\FSComp.txt:959) + /// (Originally from ..\FSComp.txt:958) static member impTypeRequiredUnavailable(a0 : System.String, a1 : System.String) = (1108, GetStringFunc("impTypeRequiredUnavailable",",,,%s,,,%s,,,") a0 a1) /// A reference to the type '%s' in assembly '%s' was found, but the type could not be found in that assembly - /// (Originally from ..\FSComp.txt:960) + /// (Originally from ..\FSComp.txt:959) static member impReferencedTypeCouldNotBeFoundInAssembly(a0 : System.String, a1 : System.String) = (1109, GetStringFunc("impReferencedTypeCouldNotBeFoundInAssembly",",,,%s,,,%s,,,") a0 a1) /// Internal error or badly formed metadata: not enough type parameters were in scope while importing - /// (Originally from ..\FSComp.txt:961) + /// (Originally from ..\FSComp.txt:960) static member impNotEnoughTypeParamsInScopeWhileImporting() = (1110, GetStringFunc("impNotEnoughTypeParamsInScopeWhileImporting",",,,") ) /// A reference to the DLL %s is required by assembly %s. The imported type %s is located in the first assembly and could not be resolved. - /// (Originally from ..\FSComp.txt:962) + /// (Originally from ..\FSComp.txt:961) static member impReferenceToDllRequiredByAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (1111, GetStringFunc("impReferenceToDllRequiredByAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// An imported assembly uses the type '%s' but that type is not public - /// (Originally from ..\FSComp.txt:963) + /// (Originally from ..\FSComp.txt:962) static member impImportedAssemblyUsesNotPublicType(a0 : System.String) = (1112, GetStringFunc("impImportedAssemblyUsesNotPublicType",",,,%s,,,") a0) /// The value '%s' was marked inline but its implementation makes use of an internal or private function which is not sufficiently accessible - /// (Originally from ..\FSComp.txt:964) + /// (Originally from ..\FSComp.txt:963) static member optValueMarkedInlineButIncomplete(a0 : System.String) = (1113, GetStringFunc("optValueMarkedInlineButIncomplete",",,,%s,,,") a0) /// The value '%s' was marked inline but was not bound in the optimization environment - /// (Originally from ..\FSComp.txt:965) + /// (Originally from ..\FSComp.txt:964) static member optValueMarkedInlineButWasNotBoundInTheOptEnv(a0 : System.String) = (1114, GetStringFunc("optValueMarkedInlineButWasNotBoundInTheOptEnv",",,,%s,,,") a0) /// Local value %s not found during optimization - /// (Originally from ..\FSComp.txt:966) + /// (Originally from ..\FSComp.txt:965) static member optLocalValueNotFoundDuringOptimization(a0 : System.String) = (1115, GetStringFunc("optLocalValueNotFoundDuringOptimization",",,,%s,,,") a0) /// A value marked as 'inline' has an unexpected value - /// (Originally from ..\FSComp.txt:967) + /// (Originally from ..\FSComp.txt:966) static member optValueMarkedInlineHasUnexpectedValue() = (1116, GetStringFunc("optValueMarkedInlineHasUnexpectedValue",",,,") ) /// A value marked as 'inline' could not be inlined - /// (Originally from ..\FSComp.txt:968) + /// (Originally from ..\FSComp.txt:967) static member optValueMarkedInlineCouldNotBeInlined() = (1117, GetStringFunc("optValueMarkedInlineCouldNotBeInlined",",,,") ) /// Failed to inline the value '%s' marked 'inline', perhaps because a recursive value was marked 'inline' - /// (Originally from ..\FSComp.txt:969) + /// (Originally from ..\FSComp.txt:968) static member optFailedToInlineValue(a0 : System.String) = (1118, GetStringFunc("optFailedToInlineValue",",,,%s,,,") a0) /// Recursive ValValue %s - /// (Originally from ..\FSComp.txt:970) + /// (Originally from ..\FSComp.txt:969) static member optRecursiveValValue(a0 : System.String) = (1119, GetStringFunc("optRecursiveValValue",",,,%s,,,") a0) /// The indentation of this 'in' token is incorrect with respect to the corresponding 'let' - /// (Originally from ..\FSComp.txt:971) + /// (Originally from ..\FSComp.txt:970) static member lexfltIncorrentIndentationOfIn() = (GetStringFunc("lexfltIncorrentIndentationOfIn",",,,") ) /// Possible incorrect indentation: this token is offside of context started at position %s. Try indenting this token further or using standard formatting conventions. - /// (Originally from ..\FSComp.txt:972) + /// (Originally from ..\FSComp.txt:971) static member lexfltTokenIsOffsideOfContextStartedEarlier(a0 : System.String) = (GetStringFunc("lexfltTokenIsOffsideOfContextStartedEarlier",",,,%s,,,") a0) /// The '|' tokens separating rules of this pattern match are misaligned by one column. Consider realigning your code or using further indentation. - /// (Originally from ..\FSComp.txt:973) + /// (Originally from ..\FSComp.txt:972) static member lexfltSeparatorTokensOfPatternMatchMisaligned() = (GetStringFunc("lexfltSeparatorTokensOfPatternMatchMisaligned",",,,") ) /// Invalid module/expression/type - /// (Originally from ..\FSComp.txt:974) + /// (Originally from ..\FSComp.txt:973) static member nrInvalidModuleExprType() = (1123, GetStringFunc("nrInvalidModuleExprType",",,,") ) /// Multiple types exist called '%s', taking different numbers of generic parameters. Provide a type instantiation to disambiguate the type resolution, e.g. '%s'. - /// (Originally from ..\FSComp.txt:975) + /// (Originally from ..\FSComp.txt:974) static member nrTypeInstantiationNeededToDisambiguateTypesWithSameName(a0 : System.String, a1 : System.String) = (1124, GetStringFunc("nrTypeInstantiationNeededToDisambiguateTypesWithSameName",",,,%s,,,%s,,,") a0 a1) /// The instantiation of the generic type '%s' is missing and can't be inferred from the arguments or return type of this member. Consider providing a type instantiation when accessing this type, e.g. '%s'. - /// (Originally from ..\FSComp.txt:976) + /// (Originally from ..\FSComp.txt:975) static member nrTypeInstantiationIsMissingAndCouldNotBeInferred(a0 : System.String, a1 : System.String) = (1125, GetStringFunc("nrTypeInstantiationIsMissingAndCouldNotBeInferred",",,,%s,,,%s,,,") a0 a1) /// 'global' may only be used as the first name in a qualified path - /// (Originally from ..\FSComp.txt:977) + /// (Originally from ..\FSComp.txt:976) static member nrGlobalUsedOnlyAsFirstName() = (1126, GetStringFunc("nrGlobalUsedOnlyAsFirstName",",,,") ) /// This is not a constructor or literal, or a constructor is being used incorrectly - /// (Originally from ..\FSComp.txt:978) + /// (Originally from ..\FSComp.txt:977) static member nrIsNotConstructorOrLiteral() = (1127, GetStringFunc("nrIsNotConstructorOrLiteral",",,,") ) /// Unexpected empty long identifier - /// (Originally from ..\FSComp.txt:979) + /// (Originally from ..\FSComp.txt:978) static member nrUnexpectedEmptyLongId() = (1128, GetStringFunc("nrUnexpectedEmptyLongId",",,,") ) /// The record type '%s' does not contain a label '%s'. - /// (Originally from ..\FSComp.txt:980) + /// (Originally from ..\FSComp.txt:979) static member nrRecordDoesNotContainSuchLabel(a0 : System.String, a1 : System.String) = (1129, GetStringFunc("nrRecordDoesNotContainSuchLabel",",,,%s,,,%s,,,") a0 a1) /// Invalid field label - /// (Originally from ..\FSComp.txt:981) + /// (Originally from ..\FSComp.txt:980) static member nrInvalidFieldLabel() = (1130, GetStringFunc("nrInvalidFieldLabel",",,,") ) /// Invalid expression '%s' - /// (Originally from ..\FSComp.txt:982) + /// (Originally from ..\FSComp.txt:981) static member nrInvalidExpression(a0 : System.String) = (1132, GetStringFunc("nrInvalidExpression",",,,%s,,,") a0) /// No constructors are available for the type '%s' - /// (Originally from ..\FSComp.txt:983) + /// (Originally from ..\FSComp.txt:982) static member nrNoConstructorsAvailableForType(a0 : System.String) = (1133, GetStringFunc("nrNoConstructorsAvailableForType",",,,%s,,,") a0) /// The union type for union case '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the union type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:984) + /// (Originally from ..\FSComp.txt:983) static member nrUnionTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1134, GetStringFunc("nrUnionTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// The record type for the record field '%s' was defined with the RequireQualifiedAccessAttribute. Include the name of the record type ('%s') in the name you are using. - /// (Originally from ..\FSComp.txt:985) + /// (Originally from ..\FSComp.txt:984) static member nrRecordTypeNeedsQualifiedAccess(a0 : System.String, a1 : System.String) = (1135, GetStringFunc("nrRecordTypeNeedsQualifiedAccess",",,,%s,,,%s,,,") a0 a1) /// Unexpected error creating debug information file '%s' - /// (Originally from ..\FSComp.txt:986) + /// (Originally from ..\FSComp.txt:985) static member ilwriteErrorCreatingPdb(a0 : System.String) = (1136, GetStringFunc("ilwriteErrorCreatingPdb",",,,%s,,,") a0) /// This number is outside the allowable range for this integer type - /// (Originally from ..\FSComp.txt:987) + /// (Originally from ..\FSComp.txt:986) static member lexOutsideIntegerRange() = (1138, GetStringFunc("lexOutsideIntegerRange",",,,") ) /// '%s' is not permitted as a character in operator names and is reserved for future use - /// (Originally from ..\FSComp.txt:991) + /// (Originally from ..\FSComp.txt:990) static member lexCharNotAllowedInOperatorNames(a0 : System.String) = (GetStringFunc("lexCharNotAllowedInOperatorNames",",,,%s,,,") a0) /// Unexpected character '%s' - /// (Originally from ..\FSComp.txt:992) + /// (Originally from ..\FSComp.txt:991) static member lexUnexpectedChar(a0 : System.String) = (GetStringFunc("lexUnexpectedChar",",,,%s,,,") a0) /// This byte array literal contains characters that do not encode as a single byte - /// (Originally from ..\FSComp.txt:993) + /// (Originally from ..\FSComp.txt:992) static member lexByteArrayCannotEncode() = (1140, GetStringFunc("lexByteArrayCannotEncode",",,,") ) /// Identifiers followed by '%s' are reserved for future use - /// (Originally from ..\FSComp.txt:994) + /// (Originally from ..\FSComp.txt:993) static member lexIdentEndInMarkReserved(a0 : System.String) = (1141, GetStringFunc("lexIdentEndInMarkReserved",",,,%s,,,") a0) /// This number is outside the allowable range for 8-bit signed integers - /// (Originally from ..\FSComp.txt:995) + /// (Originally from ..\FSComp.txt:994) static member lexOutsideEightBitSigned() = (1142, GetStringFunc("lexOutsideEightBitSigned",",,,") ) /// This number is outside the allowable range for hexadecimal 8-bit signed integers - /// (Originally from ..\FSComp.txt:996) + /// (Originally from ..\FSComp.txt:995) static member lexOutsideEightBitSignedHex() = (1143, GetStringFunc("lexOutsideEightBitSignedHex",",,,") ) /// This number is outside the allowable range for 8-bit unsigned integers - /// (Originally from ..\FSComp.txt:997) + /// (Originally from ..\FSComp.txt:996) static member lexOutsideEightBitUnsigned() = (1144, GetStringFunc("lexOutsideEightBitUnsigned",",,,") ) /// This number is outside the allowable range for 16-bit signed integers - /// (Originally from ..\FSComp.txt:998) + /// (Originally from ..\FSComp.txt:997) static member lexOutsideSixteenBitSigned() = (1145, GetStringFunc("lexOutsideSixteenBitSigned",",,,") ) /// This number is outside the allowable range for 16-bit unsigned integers - /// (Originally from ..\FSComp.txt:999) + /// (Originally from ..\FSComp.txt:998) static member lexOutsideSixteenBitUnsigned() = (1146, GetStringFunc("lexOutsideSixteenBitUnsigned",",,,") ) /// This number is outside the allowable range for 32-bit signed integers - /// (Originally from ..\FSComp.txt:1000) + /// (Originally from ..\FSComp.txt:999) static member lexOutsideThirtyTwoBitSigned() = (1147, GetStringFunc("lexOutsideThirtyTwoBitSigned",",,,") ) /// This number is outside the allowable range for 32-bit unsigned integers - /// (Originally from ..\FSComp.txt:1001) + /// (Originally from ..\FSComp.txt:1000) static member lexOutsideThirtyTwoBitUnsigned() = (1148, GetStringFunc("lexOutsideThirtyTwoBitUnsigned",",,,") ) /// This number is outside the allowable range for 64-bit signed integers - /// (Originally from ..\FSComp.txt:1002) + /// (Originally from ..\FSComp.txt:1001) static member lexOutsideSixtyFourBitSigned() = (1149, GetStringFunc("lexOutsideSixtyFourBitSigned",",,,") ) /// This number is outside the allowable range for 64-bit unsigned integers - /// (Originally from ..\FSComp.txt:1003) + /// (Originally from ..\FSComp.txt:1002) static member lexOutsideSixtyFourBitUnsigned() = (1150, GetStringFunc("lexOutsideSixtyFourBitUnsigned",",,,") ) /// This number is outside the allowable range for signed native integers - /// (Originally from ..\FSComp.txt:1004) + /// (Originally from ..\FSComp.txt:1003) static member lexOutsideNativeSigned() = (1151, GetStringFunc("lexOutsideNativeSigned",",,,") ) /// This number is outside the allowable range for unsigned native integers - /// (Originally from ..\FSComp.txt:1005) + /// (Originally from ..\FSComp.txt:1004) static member lexOutsideNativeUnsigned() = (1152, GetStringFunc("lexOutsideNativeUnsigned",",,,") ) /// Invalid floating point number - /// (Originally from ..\FSComp.txt:1006) + /// (Originally from ..\FSComp.txt:1005) static member lexInvalidFloat() = (1153, GetStringFunc("lexInvalidFloat",",,,") ) /// This number is outside the allowable range for decimal literals - /// (Originally from ..\FSComp.txt:1007) + /// (Originally from ..\FSComp.txt:1006) static member lexOusideDecimal() = (1154, GetStringFunc("lexOusideDecimal",",,,") ) /// This number is outside the allowable range for 32-bit floats - /// (Originally from ..\FSComp.txt:1008) + /// (Originally from ..\FSComp.txt:1007) static member lexOusideThirtyTwoBitFloat() = (1155, GetStringFunc("lexOusideThirtyTwoBitFloat",",,,") ) /// This is not a valid numeric literal. Valid numeric literals include 1, 0x1, 0b0001 (int), 1u (uint32), 1L (int64), 1UL (uint64), 1s (int16), 1y (sbyte), 1uy (byte), 1.0 (float), 1.0f (float32), 1.0m (decimal), 1I (BigInteger). - /// (Originally from ..\FSComp.txt:1009) + /// (Originally from ..\FSComp.txt:1008) static member lexInvalidNumericLiteral() = (1156, GetStringFunc("lexInvalidNumericLiteral",",,,") ) /// This is not a valid byte literal - /// (Originally from ..\FSComp.txt:1010) + /// (Originally from ..\FSComp.txt:1009) static member lexInvalidByteLiteral() = (1157, GetStringFunc("lexInvalidByteLiteral",",,,") ) /// This is not a valid character literal - /// (Originally from ..\FSComp.txt:1011) + /// (Originally from ..\FSComp.txt:1010) static member lexInvalidCharLiteral() = (1158, GetStringFunc("lexInvalidCharLiteral",",,,") ) /// This Unicode encoding is only valid in string literals - /// (Originally from ..\FSComp.txt:1012) + /// (Originally from ..\FSComp.txt:1011) static member lexThisUnicodeOnlyInStringLiterals() = (1159, GetStringFunc("lexThisUnicodeOnlyInStringLiterals",",,,") ) /// This token is reserved for future use - /// (Originally from ..\FSComp.txt:1013) + /// (Originally from ..\FSComp.txt:1012) static member lexTokenReserved() = (1160, GetStringFunc("lexTokenReserved",",,,") ) /// TABs are not allowed in F# code unless the #indent \"off\" option is used - /// (Originally from ..\FSComp.txt:1014) + /// (Originally from ..\FSComp.txt:1013) static member lexTabsNotAllowed() = (1161, GetStringFunc("lexTabsNotAllowed",",,,") ) /// Invalid line number: '%s' - /// (Originally from ..\FSComp.txt:1015) + /// (Originally from ..\FSComp.txt:1014) static member lexInvalidLineNumber(a0 : System.String) = (1162, GetStringFunc("lexInvalidLineNumber",",,,%s,,,") a0) /// #if directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1016) + /// (Originally from ..\FSComp.txt:1015) static member lexHashIfMustBeFirst() = (1163, GetStringFunc("lexHashIfMustBeFirst",",,,") ) /// #else has no matching #if - /// (Originally from ..\FSComp.txt:1017) + /// (Originally from ..\FSComp.txt:1016) static member lexHashElseNoMatchingIf() = (GetStringFunc("lexHashElseNoMatchingIf",",,,") ) /// #endif required for #else - /// (Originally from ..\FSComp.txt:1018) + /// (Originally from ..\FSComp.txt:1017) static member lexHashEndifRequiredForElse() = (GetStringFunc("lexHashEndifRequiredForElse",",,,") ) /// #else directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1019) + /// (Originally from ..\FSComp.txt:1018) static member lexHashElseMustBeFirst() = (1166, GetStringFunc("lexHashElseMustBeFirst",",,,") ) /// #endif has no matching #if - /// (Originally from ..\FSComp.txt:1020) + /// (Originally from ..\FSComp.txt:1019) static member lexHashEndingNoMatchingIf() = (GetStringFunc("lexHashEndingNoMatchingIf",",,,") ) /// #endif directive must appear as the first non-whitespace character on a line - /// (Originally from ..\FSComp.txt:1021) + /// (Originally from ..\FSComp.txt:1020) static member lexHashEndifMustBeFirst() = (1168, GetStringFunc("lexHashEndifMustBeFirst",",,,") ) /// #if directive should be immediately followed by an identifier - /// (Originally from ..\FSComp.txt:1022) + /// (Originally from ..\FSComp.txt:1021) static member lexHashIfMustHaveIdent() = (1169, GetStringFunc("lexHashIfMustHaveIdent",",,,") ) /// Syntax error. Wrong nested #endif, unexpected tokens before it. - /// (Originally from ..\FSComp.txt:1023) + /// (Originally from ..\FSComp.txt:1022) static member lexWrongNestedHashEndif() = (1170, GetStringFunc("lexWrongNestedHashEndif",",,,") ) /// #! may only appear as the first line at the start of a file. - /// (Originally from ..\FSComp.txt:1024) + /// (Originally from ..\FSComp.txt:1023) static member lexHashBangMustBeFirstInFile() = (GetStringFunc("lexHashBangMustBeFirstInFile",",,,") ) /// Expected single line comment or end of line - /// (Originally from ..\FSComp.txt:1025) + /// (Originally from ..\FSComp.txt:1024) static member pplexExpectedSingleLineComment() = (1171, GetStringFunc("pplexExpectedSingleLineComment",",,,") ) /// Infix operator member '%s' has no arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1026) + /// (Originally from ..\FSComp.txt:1025) static member memberOperatorDefinitionWithNoArguments(a0 : System.String) = (1172, GetStringFunc("memberOperatorDefinitionWithNoArguments",",,,%s,,,") a0) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1027) + /// (Originally from ..\FSComp.txt:1026) static member memberOperatorDefinitionWithNonPairArgument(a0 : System.String, a1 : System.Int32) = (1173, GetStringFunc("memberOperatorDefinitionWithNonPairArgument",",,,%s,,,%d,,,") a0 a1) /// Infix operator member '%s' has extra curried arguments. Expected a tuple of 2 arguments, e.g. static member (+) (x,y) = ... - /// (Originally from ..\FSComp.txt:1028) + /// (Originally from ..\FSComp.txt:1027) static member memberOperatorDefinitionWithCurriedArguments(a0 : System.String) = (1174, GetStringFunc("memberOperatorDefinitionWithCurriedArguments",",,,%s,,,") a0) /// All record, union and struct types in FSharp.Core.dll must be explicitly labelled with 'StructuralComparison' or 'NoComparison' - /// (Originally from ..\FSComp.txt:1029) + /// (Originally from ..\FSComp.txt:1028) static member tcFSharpCoreRequiresExplicit() = (1175, GetStringFunc("tcFSharpCoreRequiresExplicit",",,,") ) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the type parameter '%s' does not satisfy the 'comparison' constraint. Consider adding the 'comparison' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1030) + /// (Originally from ..\FSComp.txt:1029) static member tcStructuralComparisonNotSatisfied1(a0 : System.String, a1 : System.String) = (1176, GetStringFunc("tcStructuralComparisonNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralComparison' attribute but the component type '%s' does not satisfy the 'comparison' constraint - /// (Originally from ..\FSComp.txt:1031) + /// (Originally from ..\FSComp.txt:1030) static member tcStructuralComparisonNotSatisfied2(a0 : System.String, a1 : System.String) = (1177, GetStringFunc("tcStructuralComparisonNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' is not structurally comparable because the type parameter %s does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1032) + /// (Originally from ..\FSComp.txt:1031) static member tcNoComparisonNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' is not structurally comparable because the type '%s' does not satisfy the 'comparison' constraint. Consider adding the 'NoComparison' attribute to the type '%s' to clarify that the type is not comparable - /// (Originally from ..\FSComp.txt:1033) + /// (Originally from ..\FSComp.txt:1032) static member tcNoComparisonNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoComparisonNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type parameter %s does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1034) + /// (Originally from ..\FSComp.txt:1033) static member tcNoEqualityNeeded1(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded1",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' does not support structural equality because the type '%s' does not satisfy the 'equality' constraint. Consider adding the 'NoEquality' attribute to the type '%s' to clarify that the type does not support structural equality - /// (Originally from ..\FSComp.txt:1035) + /// (Originally from ..\FSComp.txt:1034) static member tcNoEqualityNeeded2(a0 : System.String, a1 : System.String, a2 : System.String) = (1178, GetStringFunc("tcNoEqualityNeeded2",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the type parameter '%s' does not satisfy the 'equality' constraint. Consider adding the 'equality' constraint to the type parameter - /// (Originally from ..\FSComp.txt:1036) + /// (Originally from ..\FSComp.txt:1035) static member tcStructuralEqualityNotSatisfied1(a0 : System.String, a1 : System.String) = (1179, GetStringFunc("tcStructuralEqualityNotSatisfied1",",,,%s,,,%s,,,") a0 a1) /// The struct, record or union type '%s' has the 'StructuralEquality' attribute but the component type '%s' does not satisfy the 'equality' constraint - /// (Originally from ..\FSComp.txt:1037) + /// (Originally from ..\FSComp.txt:1036) static member tcStructuralEqualityNotSatisfied2(a0 : System.String, a1 : System.String) = (1180, GetStringFunc("tcStructuralEqualityNotSatisfied2",",,,%s,,,%s,,,") a0 a1) /// Each argument of the primary constructor for a struct must be given a type, for example 'type S(x1:int, x2: int) = ...'. These arguments determine the fields of the struct. - /// (Originally from ..\FSComp.txt:1038) + /// (Originally from ..\FSComp.txt:1037) static member tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly() = (1181, GetStringFunc("tcStructsMustDeclareTypesOfImplicitCtorArgsExplicitly",",,,") ) /// The value '%s' is unused - /// (Originally from ..\FSComp.txt:1039) + /// (Originally from ..\FSComp.txt:1038) static member chkUnusedValue(a0 : System.String) = (1182, GetStringFunc("chkUnusedValue",",,,%s,,,") a0) /// The recursive object reference '%s' is unused. The presence of a recursive object reference adds runtime initialization checks to members in this and derived types. Consider removing this recursive object reference. - /// (Originally from ..\FSComp.txt:1040) + /// (Originally from ..\FSComp.txt:1039) static member chkUnusedThisVariable(a0 : System.String) = (1183, GetStringFunc("chkUnusedThisVariable",",,,%s,,,") a0) /// A getter property may have at most one argument group - /// (Originally from ..\FSComp.txt:1041) + /// (Originally from ..\FSComp.txt:1040) static member parsGetterAtMostOneArgument() = (1184, GetStringFunc("parsGetterAtMostOneArgument",",,,") ) /// A setter property may have at most two argument groups - /// (Originally from ..\FSComp.txt:1042) + /// (Originally from ..\FSComp.txt:1041) static member parsSetterAtMostTwoArguments() = (1185, GetStringFunc("parsSetterAtMostTwoArguments",",,,") ) /// Invalid property getter or setter - /// (Originally from ..\FSComp.txt:1043) + /// (Originally from ..\FSComp.txt:1042) static member parsInvalidProperty() = (1186, GetStringFunc("parsInvalidProperty",",,,") ) /// An indexer property must be given at least one argument - /// (Originally from ..\FSComp.txt:1044) + /// (Originally from ..\FSComp.txt:1043) static member parsIndexerPropertyRequiresAtLeastOneArgument() = (1187, GetStringFunc("parsIndexerPropertyRequiresAtLeastOneArgument",",,,") ) /// This operation accesses a mutable top-level value defined in another assembly in an unsupported way. The value cannot be accessed through its address. Consider copying the expression to a mutable local, e.g. 'let mutable x = ...', and if necessary assigning the value back after the completion of the operation - /// (Originally from ..\FSComp.txt:1045) + /// (Originally from ..\FSComp.txt:1044) static member tastInvalidAddressOfMutableAcrossAssemblyBoundary() = (1188, GetStringFunc("tastInvalidAddressOfMutableAcrossAssemblyBoundary",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"type C<'T>\", not type \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1046) + /// (Originally from ..\FSComp.txt:1045) static member parsNonAdjacentTypars() = (1189, GetStringFunc("parsNonAdjacentTypars",",,,") ) /// Remove spaces between the type name and type parameter, e.g. \"C<'T>\", not \"C <'T>\". Type parameters must be placed directly adjacent to the type name. - /// (Originally from ..\FSComp.txt:1047) + /// (Originally from ..\FSComp.txt:1046) static member parsNonAdjacentTyargs() = (1190, GetStringFunc("parsNonAdjacentTyargs",",,,") ) /// The use of the type syntax 'int C' and 'C ' is not permitted here. Consider adjusting this type to be written in the form 'C' - /// (Originally from ..\FSComp.txt:1048) + /// (Originally from ..\FSComp.txt:1047) static member parsNonAtomicType() = (GetStringFunc("parsNonAtomicType",",,,") ) /// The module/namespace '%s' from compilation unit '%s' did not contain the module/namespace '%s' - /// (Originally from ..\FSComp.txt:1051) + /// (Originally from ..\FSComp.txt:1050) static member tastUndefinedItemRefModuleNamespace(a0 : System.String, a1 : System.String, a2 : System.String) = (1193, GetStringFunc("tastUndefinedItemRefModuleNamespace",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the val '%s' - /// (Originally from ..\FSComp.txt:1052) + /// (Originally from ..\FSComp.txt:1051) static member tastUndefinedItemRefVal(a0 : System.String, a1 : System.String, a2 : System.String) = (1194, GetStringFunc("tastUndefinedItemRefVal",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The module/namespace '%s' from compilation unit '%s' did not contain the namespace, module or type '%s' - /// (Originally from ..\FSComp.txt:1053) + /// (Originally from ..\FSComp.txt:1052) static member tastUndefinedItemRefModuleNamespaceType(a0 : System.String, a1 : System.String, a2 : System.String) = (1195, GetStringFunc("tastUndefinedItemRefModuleNamespaceType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The 'UseNullAsTrueValue' attribute flag may only be used with union types that have one nullary case and at least one non-nullary case - /// (Originally from ..\FSComp.txt:1054) + /// (Originally from ..\FSComp.txt:1053) static member tcInvalidUseNullAsTrueValue() = (1196, GetStringFunc("tcInvalidUseNullAsTrueValue",",,,") ) /// The parameter '%s' was inferred to have byref type. Parameters of byref type must be given an explicit type annotation, e.g. 'x1: byref'. When used, a byref parameter is implicitly dereferenced. - /// (Originally from ..\FSComp.txt:1055) + /// (Originally from ..\FSComp.txt:1054) static member tcParameterInferredByref(a0 : System.String) = (1197, GetStringFunc("tcParameterInferredByref",",,,%s,,,") a0) /// The generic member '%s' has been used at a non-uniform instantiation prior to this program point. Consider reordering the members so this member occurs first. Alternatively, specify the full type of the member explicitly, including argument types, return type and any additional generic parameters and constraints. - /// (Originally from ..\FSComp.txt:1056) + /// (Originally from ..\FSComp.txt:1055) static member tcNonUniformMemberUse(a0 : System.String) = (1198, GetStringFunc("tcNonUniformMemberUse",",,,%s,,,") a0) /// The attribute '%s' appears in both the implementation and the signature, but the attribute arguments differ. Only the attribute from the signature will be included in the compiled code. - /// (Originally from ..\FSComp.txt:1057) + /// (Originally from ..\FSComp.txt:1056) static member tcAttribArgsDiffer(a0 : System.String) = (1200, GetStringFunc("tcAttribArgsDiffer",",,,%s,,,") a0) /// Cannot call an abstract base member: '%s' - /// (Originally from ..\FSComp.txt:1058) + /// (Originally from ..\FSComp.txt:1057) static member tcCannotCallAbstractBaseMember(a0 : System.String) = (1201, GetStringFunc("tcCannotCallAbstractBaseMember",",,,%s,,,") a0) /// Could not resolve the ambiguity in the use of a generic construct with an 'unmanaged' constraint at or near this position - /// (Originally from ..\FSComp.txt:1059) + /// (Originally from ..\FSComp.txt:1058) static member typrelCannotResolveAmbiguityInUnmanaged() = (1202, GetStringFunc("typrelCannotResolveAmbiguityInUnmanaged",",,,") ) /// This construct is for ML compatibility. %s. You can disable this warning by using '--mlcompatibility' or '--nowarn:62'. - /// (Originally from ..\FSComp.txt:1062) + /// (Originally from ..\FSComp.txt:1061) static member mlCompatMessage(a0 : System.String) = (GetStringFunc("mlCompatMessage",",,,%s,,,") a0) /// The type '%s' has been marked as having an Explicit layout, but the field '%s' has not been marked with the 'FieldOffset' attribute - /// (Originally from ..\FSComp.txt:1064) + /// (Originally from ..\FSComp.txt:1063) static member ilFieldDoesNotHaveValidOffsetForStructureLayout(a0 : System.String, a1 : System.String) = (1206, GetStringFunc("ilFieldDoesNotHaveValidOffsetForStructureLayout",",,,%s,,,%s,,,") a0 a1) /// Interfaces inherited by other interfaces should be declared using 'inherit ...' instead of 'interface ...' - /// (Originally from ..\FSComp.txt:1065) + /// (Originally from ..\FSComp.txt:1064) static member tcInterfacesShouldUseInheritNotInterface() = (1207, GetStringFunc("tcInterfacesShouldUseInheritNotInterface",",,,") ) /// Invalid prefix operator - /// (Originally from ..\FSComp.txt:1066) + /// (Originally from ..\FSComp.txt:1065) static member parsInvalidPrefixOperator() = (1208, GetStringFunc("parsInvalidPrefixOperator",",,,") ) /// Invalid operator definition. Prefix operator definitions must use a valid prefix operator name. - /// (Originally from ..\FSComp.txt:1067) + /// (Originally from ..\FSComp.txt:1066) static member parsInvalidPrefixOperatorDefinition() = (1208, GetStringFunc("parsInvalidPrefixOperatorDefinition",",,,") ) /// The file extensions '.ml' and '.mli' are for ML compatibility - /// (Originally from ..\FSComp.txt:1068) + /// (Originally from ..\FSComp.txt:1067) static member buildCompilingExtensionIsForML() = (GetStringFunc("buildCompilingExtensionIsForML",",,,") ) /// Consider using a file with extension '.ml' or '.mli' instead - /// (Originally from ..\FSComp.txt:1069) + /// (Originally from ..\FSComp.txt:1068) static member lexIndentOffForML() = (GetStringFunc("lexIndentOffForML",",,,") ) /// Active pattern '%s' is not a function - /// (Originally from ..\FSComp.txt:1070) + /// (Originally from ..\FSComp.txt:1069) static member activePatternIdentIsNotFunctionTyped(a0 : System.String) = (1209, GetStringFunc("activePatternIdentIsNotFunctionTyped",",,,%s,,,") a0) /// Active pattern '%s' has a result type containing type variables that are not determined by the input. The common cause is a when a result case is not mentioned, e.g. 'let (|A|B|) (x:int) = A x'. This can be fixed with a type constraint, e.g. 'let (|A|B|) (x:int) : Choice = A x' - /// (Originally from ..\FSComp.txt:1071) + /// (Originally from ..\FSComp.txt:1070) static member activePatternChoiceHasFreeTypars(a0 : System.String) = (1210, GetStringFunc("activePatternChoiceHasFreeTypars",",,,%s,,,") a0) /// The FieldOffset attribute can only be placed on members of types marked with the StructLayout(LayoutKind.Explicit) - /// (Originally from ..\FSComp.txt:1072) + /// (Originally from ..\FSComp.txt:1071) static member ilFieldHasOffsetForSequentialLayout() = (1211, GetStringFunc("ilFieldHasOffsetForSequentialLayout",",,,") ) /// Optional arguments must come at the end of the argument list, after any non-optional arguments - /// (Originally from ..\FSComp.txt:1073) + /// (Originally from ..\FSComp.txt:1072) static member tcOptionalArgsMustComeAfterNonOptionalArgs() = (1212, GetStringFunc("tcOptionalArgsMustComeAfterNonOptionalArgs",",,,") ) /// Attribute 'System.Diagnostics.ConditionalAttribute' is only valid on methods or attribute classes - /// (Originally from ..\FSComp.txt:1074) + /// (Originally from ..\FSComp.txt:1073) static member tcConditionalAttributeUsage() = (1213, GetStringFunc("tcConditionalAttributeUsage",",,,") ) /// Extension members cannot provide operator overloads. Consider defining the operator as part of the type definition instead. - /// (Originally from ..\FSComp.txt:1076) + /// (Originally from ..\FSComp.txt:1075) static member tcMemberOperatorDefinitionInExtrinsic() = (1215, GetStringFunc("tcMemberOperatorDefinitionInExtrinsic",",,,") ) /// The name of the MDB file must be .mdb. The --pdb option will be ignored. - /// (Originally from ..\FSComp.txt:1077) + /// (Originally from ..\FSComp.txt:1076) static member ilwriteMDBFileNameCannotBeChangedWarning() = (1216, GetStringFunc("ilwriteMDBFileNameCannotBeChangedWarning",",,,") ) /// MDB generation failed. Could not find compatible member %s - /// (Originally from ..\FSComp.txt:1078) + /// (Originally from ..\FSComp.txt:1077) static member ilwriteMDBMemberMissing(a0 : System.String) = (1217, GetStringFunc("ilwriteMDBMemberMissing",",,,%s,,,") a0) /// Cannot generate MDB debug information. Failed to load the 'MonoSymbolWriter' type from the 'Mono.CompilerServices.SymbolWriter.dll' assembly. - /// (Originally from ..\FSComp.txt:1079) + /// (Originally from ..\FSComp.txt:1078) static member ilwriteErrorCreatingMdb() = (1218, GetStringFunc("ilwriteErrorCreatingMdb",",,,") ) /// The union case named '%s' conflicts with the generated type '%s' - /// (Originally from ..\FSComp.txt:1080) + /// (Originally from ..\FSComp.txt:1079) static member tcUnionCaseNameConflictsWithGeneratedType(a0 : System.String, a1 : System.String) = (1219, GetStringFunc("tcUnionCaseNameConflictsWithGeneratedType",",,,%s,,,%s,,,") a0 a1) /// ReflectedDefinitionAttribute may not be applied to an instance member on a struct type, because the instance member takes an implicit 'this' byref parameter - /// (Originally from ..\FSComp.txt:1081) + /// (Originally from ..\FSComp.txt:1080) static member chkNoReflectedDefinitionOnStructMember() = (1220, GetStringFunc("chkNoReflectedDefinitionOnStructMember",",,,") ) /// DLLImport bindings must be static members in a class or function definitions in a module - /// (Originally from ..\FSComp.txt:1082) + /// (Originally from ..\FSComp.txt:1081) static member tcDllImportNotAllowed() = (1221, GetStringFunc("tcDllImportNotAllowed",",,,") ) /// When mscorlib.dll or FSharp.Core.dll is explicitly referenced the %s option must also be passed - /// (Originally from ..\FSComp.txt:1083) + /// (Originally from ..\FSComp.txt:1082) static member buildExplicitCoreLibRequiresNoFramework(a0 : System.String) = (1222, GetStringFunc("buildExplicitCoreLibRequiresNoFramework",",,,%s,,,") a0) /// FSharp.Core.sigdata not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1084) + /// (Originally from ..\FSComp.txt:1083) static member buildExpectedSigdataFile(a0 : System.String) = (1223, GetStringFunc("buildExpectedSigdataFile",",,,%s,,,") a0) /// File '%s' not found alongside FSharp.Core. File expected in %s. Consider upgrading to a more recent version of FSharp.Core, where this file is no longer be required. - /// (Originally from ..\FSComp.txt:1085) + /// (Originally from ..\FSComp.txt:1084) static member buildExpectedFileAlongSideFSharpCore(a0 : System.String, a1 : System.String) = (1225, GetStringFunc("buildExpectedFileAlongSideFSharpCore",",,,%s,,,%s,,,") a0 a1) /// Filename '%s' contains invalid character '%s' - /// (Originally from ..\FSComp.txt:1086) + /// (Originally from ..\FSComp.txt:1085) static member buildUnexpectedFileNameCharacter(a0 : System.String, a1 : System.String) = (1227, GetStringFunc("buildUnexpectedFileNameCharacter",",,,%s,,,%s,,,") a0 a1) /// 'use!' bindings must be of the form 'use! = ' - /// (Originally from ..\FSComp.txt:1087) + /// (Originally from ..\FSComp.txt:1086) static member tcInvalidUseBangBinding() = (1228, GetStringFunc("tcInvalidUseBangBinding",",,,") ) /// Inner generic functions are not permitted in quoted expressions. Consider adding some type constraints until this function is no longer generic. - /// (Originally from ..\FSComp.txt:1088) + /// (Originally from ..\FSComp.txt:1087) static member crefNoInnerGenericsInQuotations() = (1230, GetStringFunc("crefNoInnerGenericsInQuotations",",,,") ) /// The type '%s' is not a valid enumerator type , i.e. does not have a 'MoveNext()' method returning a bool, and a 'Current' property - /// (Originally from ..\FSComp.txt:1089) + /// (Originally from ..\FSComp.txt:1088) static member tcEnumTypeCannotBeEnumerated(a0 : System.String) = (1231, GetStringFunc("tcEnumTypeCannotBeEnumerated",",,,%s,,,") a0) /// End of file in triple-quote string begun at or before here - /// (Originally from ..\FSComp.txt:1090) + /// (Originally from ..\FSComp.txt:1089) static member parsEofInTripleQuoteString() = (1232, GetStringFunc("parsEofInTripleQuoteString",",,,") ) /// End of file in triple-quote string embedded in comment begun at or before here - /// (Originally from ..\FSComp.txt:1091) + /// (Originally from ..\FSComp.txt:1090) static member parsEofInTripleQuoteStringInComment() = (1233, GetStringFunc("parsEofInTripleQuoteStringInComment",",,,") ) /// This type test or downcast will ignore the unit-of-measure '%s' - /// (Originally from ..\FSComp.txt:1092) + /// (Originally from ..\FSComp.txt:1091) static member tcTypeTestLosesMeasures(a0 : System.String) = (1240, GetStringFunc("tcTypeTestLosesMeasures",",,,%s,,,") a0) /// Expected type argument or static argument - /// (Originally from ..\FSComp.txt:1093) + /// (Originally from ..\FSComp.txt:1092) static member parsMissingTypeArgs() = (1241, GetStringFunc("parsMissingTypeArgs",",,,") ) /// Unmatched '<'. Expected closing '>' - /// (Originally from ..\FSComp.txt:1094) + /// (Originally from ..\FSComp.txt:1093) static member parsMissingGreaterThan() = (1242, GetStringFunc("parsMissingGreaterThan",",,,") ) /// Unexpected quotation operator '<@' in type definition. If you intend to pass a verbatim string as a static argument to a type provider, put a space between the '<' and '@' characters. - /// (Originally from ..\FSComp.txt:1095) + /// (Originally from ..\FSComp.txt:1094) static member parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString() = (1243, GetStringFunc("parsUnexpectedQuotationOperatorInTypeAliasDidYouMeanVerbatimString",",,,") ) /// Attempted to parse this as an operator name, but failed - /// (Originally from ..\FSComp.txt:1096) + /// (Originally from ..\FSComp.txt:1095) static member parsErrorParsingAsOperatorName() = (1244, GetStringFunc("parsErrorParsingAsOperatorName",",,,") ) /// \U%s is not a valid Unicode character escape sequence - /// (Originally from ..\FSComp.txt:1097) + /// (Originally from ..\FSComp.txt:1096) static member lexInvalidUnicodeLiteral(a0 : System.String) = (1245, GetStringFunc("lexInvalidUnicodeLiteral",",,,%s,,,") a0) /// '%s' must be applied to an argument of type '%s', but has been applied to an argument of type '%s' - /// (Originally from ..\FSComp.txt:1098) + /// (Originally from ..\FSComp.txt:1097) static member tcCallerInfoWrongType(a0 : System.String, a1 : System.String, a2 : System.String) = (1246, GetStringFunc("tcCallerInfoWrongType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// '%s' can only be applied to optional arguments - /// (Originally from ..\FSComp.txt:1099) + /// (Originally from ..\FSComp.txt:1098) static member tcCallerInfoNotOptional(a0 : System.String) = (1247, GetStringFunc("tcCallerInfoNotOptional",",,,%s,,,") a0) /// The specified .NET Framework version '%s' is not supported. Please specify a value from the enumeration Microsoft.Build.Utilities.TargetDotNetFrameworkVersion. - /// (Originally from ..\FSComp.txt:1101) + /// (Originally from ..\FSComp.txt:1100) static member toolLocationHelperUnsupportedFrameworkVersion(a0 : System.String) = (1300, GetStringFunc("toolLocationHelperUnsupportedFrameworkVersion",",,,%s,,,") a0) /// Invalid Magic value in CLR Header - /// (Originally from ..\FSComp.txt:1105) + /// (Originally from ..\FSComp.txt:1104) static member ilSignInvalidMagicValue() = (1301, GetStringFunc("ilSignInvalidMagicValue",",,,") ) /// Bad image format - /// (Originally from ..\FSComp.txt:1106) + /// (Originally from ..\FSComp.txt:1105) static member ilSignBadImageFormat() = (1302, GetStringFunc("ilSignBadImageFormat",",,,") ) /// Private key expected - /// (Originally from ..\FSComp.txt:1107) + /// (Originally from ..\FSComp.txt:1106) static member ilSignPrivateKeyExpected() = (1303, GetStringFunc("ilSignPrivateKeyExpected",",,,") ) /// RSA key expected - /// (Originally from ..\FSComp.txt:1108) + /// (Originally from ..\FSComp.txt:1107) static member ilSignRsaKeyExpected() = (1304, GetStringFunc("ilSignRsaKeyExpected",",,,") ) /// Invalid bit Length - /// (Originally from ..\FSComp.txt:1109) + /// (Originally from ..\FSComp.txt:1108) static member ilSignInvalidBitLen() = (1305, GetStringFunc("ilSignInvalidBitLen",",,,") ) /// Invalid RSAParameters structure - '{0}' expected - /// (Originally from ..\FSComp.txt:1110) + /// (Originally from ..\FSComp.txt:1109) static member ilSignInvalidRSAParams() = (1306, GetStringFunc("ilSignInvalidRSAParams",",,,") ) /// Invalid algId - 'Exponent' expected - /// (Originally from ..\FSComp.txt:1111) + /// (Originally from ..\FSComp.txt:1110) static member ilSignInvalidAlgId() = (1307, GetStringFunc("ilSignInvalidAlgId",",,,") ) /// Invalid signature size - /// (Originally from ..\FSComp.txt:1112) + /// (Originally from ..\FSComp.txt:1111) static member ilSignInvalidSignatureSize() = (1308, GetStringFunc("ilSignInvalidSignatureSize",",,,") ) /// No signature directory - /// (Originally from ..\FSComp.txt:1113) + /// (Originally from ..\FSComp.txt:1112) static member ilSignNoSignatureDirectory() = (1309, GetStringFunc("ilSignNoSignatureDirectory",",,,") ) /// Invalid Public Key blob - /// (Originally from ..\FSComp.txt:1114) + /// (Originally from ..\FSComp.txt:1113) static member ilSignInvalidPKBlob() = (1310, GetStringFunc("ilSignInvalidPKBlob",",,,") ) /// Exiting - too many errors - /// (Originally from ..\FSComp.txt:1116) + /// (Originally from ..\FSComp.txt:1115) static member fscTooManyErrors() = (GetStringFunc("fscTooManyErrors",",,,") ) /// The documentation file has no .xml suffix - /// (Originally from ..\FSComp.txt:1117) + /// (Originally from ..\FSComp.txt:1116) static member docfileNoXmlSuffix() = (2001, GetStringFunc("docfileNoXmlSuffix",",,,") ) /// No implementation files specified - /// (Originally from ..\FSComp.txt:1118) + /// (Originally from ..\FSComp.txt:1117) static member fscNoImplementationFiles() = (2002, GetStringFunc("fscNoImplementationFiles",",,,") ) /// The attribute %s specified version '%s', but this value is invalid and has been ignored - /// (Originally from ..\FSComp.txt:1119) + /// (Originally from ..\FSComp.txt:1118) static member fscBadAssemblyVersion(a0 : System.String, a1 : System.String) = (2003, GetStringFunc("fscBadAssemblyVersion",",,,%s,,,%s,,,") a0 a1) /// Conflicting options specified: 'win32manifest' and 'win32res'. Only one of these can be used. - /// (Originally from ..\FSComp.txt:1120) + /// (Originally from ..\FSComp.txt:1119) static member fscTwoResourceManifests() = (2004, GetStringFunc("fscTwoResourceManifests",",,,") ) /// The code in assembly '%s' makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1121) + /// (Originally from ..\FSComp.txt:1120) static member fscQuotationLiteralsStaticLinking(a0 : System.String) = (2005, GetStringFunc("fscQuotationLiteralsStaticLinking",",,,%s,,,") a0) /// Code in this assembly makes uses of quotation literals. Static linking may not include components that make use of quotation literals unless all assemblies are compiled with at least F# 4.0. - /// (Originally from ..\FSComp.txt:1122) + /// (Originally from ..\FSComp.txt:1121) static member fscQuotationLiteralsStaticLinking0() = (2006, GetStringFunc("fscQuotationLiteralsStaticLinking0",",,,") ) /// Static linking may not include a .EXE - /// (Originally from ..\FSComp.txt:1123) + /// (Originally from ..\FSComp.txt:1122) static member fscStaticLinkingNoEXE() = (2007, GetStringFunc("fscStaticLinkingNoEXE",",,,") ) /// Static linking may not include a mixed managed/unmanaged DLL - /// (Originally from ..\FSComp.txt:1124) + /// (Originally from ..\FSComp.txt:1123) static member fscStaticLinkingNoMixedDLL() = (2008, GetStringFunc("fscStaticLinkingNoMixedDLL",",,,") ) /// Ignoring mixed managed/unmanaged assembly '%s' during static linking - /// (Originally from ..\FSComp.txt:1125) + /// (Originally from ..\FSComp.txt:1124) static member fscIgnoringMixedWhenLinking(a0 : System.String) = (2009, GetStringFunc("fscIgnoringMixedWhenLinking",",,,%s,,,") a0) /// Assembly '%s' was referenced transitively and the assembly could not be resolved automatically. Static linking will assume this DLL has no dependencies on the F# library or other statically linked DLLs. Consider adding an explicit reference to this DLL. - /// (Originally from ..\FSComp.txt:1126) + /// (Originally from ..\FSComp.txt:1125) static member fscAssumeStaticLinkContainsNoDependencies(a0 : System.String) = (2011, GetStringFunc("fscAssumeStaticLinkContainsNoDependencies",",,,%s,,,") a0) /// Assembly '%s' not found in dependency set of target binary. Statically linked roots should be specified using an assembly name, without a DLL or EXE extension. If this assembly was referenced explicitly then it is possible the assembly was not actually required by the generated binary, in which case it should not be statically linked. - /// (Originally from ..\FSComp.txt:1127) + /// (Originally from ..\FSComp.txt:1126) static member fscAssemblyNotFoundInDependencySet(a0 : System.String) = (2012, GetStringFunc("fscAssemblyNotFoundInDependencySet",",,,%s,,,") a0) /// The key file '%s' could not be opened - /// (Originally from ..\FSComp.txt:1128) + /// (Originally from ..\FSComp.txt:1127) static member fscKeyFileCouldNotBeOpened(a0 : System.String) = (2013, GetStringFunc("fscKeyFileCouldNotBeOpened",",,,%s,,,") a0) /// A problem occurred writing the binary '%s': %s - /// (Originally from ..\FSComp.txt:1129) + /// (Originally from ..\FSComp.txt:1128) static member fscProblemWritingBinary(a0 : System.String, a1 : System.String) = (2014, GetStringFunc("fscProblemWritingBinary",",,,%s,,,%s,,,") a0 a1) /// The 'AssemblyVersionAttribute' has been ignored because a version was given using a command line option - /// (Originally from ..\FSComp.txt:1130) + /// (Originally from ..\FSComp.txt:1129) static member fscAssemblyVersionAttributeIgnored() = (2015, GetStringFunc("fscAssemblyVersionAttributeIgnored",",,,") ) /// Error emitting 'System.Reflection.AssemblyCultureAttribute' attribute -- 'Executables cannot be satellite assemblies, Culture should always be empty' - /// (Originally from ..\FSComp.txt:1131) + /// (Originally from ..\FSComp.txt:1130) static member fscAssemblyCultureAttributeError() = (2016, GetStringFunc("fscAssemblyCultureAttributeError",",,,") ) /// Option '--delaysign' overrides attribute 'System.Reflection.AssemblyDelaySignAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1132) + /// (Originally from ..\FSComp.txt:1131) static member fscDelaySignWarning() = (2017, GetStringFunc("fscDelaySignWarning",",,,") ) /// Option '--keyfile' overrides attribute 'System.Reflection.AssemblyKeyFileAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1133) + /// (Originally from ..\FSComp.txt:1132) static member fscKeyFileWarning() = (2018, GetStringFunc("fscKeyFileWarning",",,,") ) /// Option '--keycontainer' overrides attribute 'System.Reflection.AssemblyNameAttribute' given in a source file or added module - /// (Originally from ..\FSComp.txt:1134) + /// (Originally from ..\FSComp.txt:1133) static member fscKeyNameWarning() = (2019, GetStringFunc("fscKeyNameWarning",",,,") ) /// The assembly '%s' is listed on the command line. Assemblies should be referenced using a command line flag such as '-r'. - /// (Originally from ..\FSComp.txt:1135) + /// (Originally from ..\FSComp.txt:1134) static member fscReferenceOnCommandLine(a0 : System.String) = (2020, GetStringFunc("fscReferenceOnCommandLine",",,,%s,,,") a0) /// The resident compilation service was not used because a problem occured in communicating with the server. - /// (Originally from ..\FSComp.txt:1136) + /// (Originally from ..\FSComp.txt:1135) static member fscRemotingError() = (2021, GetStringFunc("fscRemotingError",",,,") ) /// Problem with filename '%s': Illegal characters in path. - /// (Originally from ..\FSComp.txt:1137) + /// (Originally from ..\FSComp.txt:1136) static member pathIsInvalid(a0 : System.String) = (2022, GetStringFunc("pathIsInvalid",",,,%s,,,") a0) /// Passing a .resx file (%s) as a source file to the compiler is deprecated. Use resgen.exe to transform the .resx file into a .resources file to pass as a --resource option. If you are using MSBuild, this can be done via an item in the .fsproj project file. - /// (Originally from ..\FSComp.txt:1138) + /// (Originally from ..\FSComp.txt:1137) static member fscResxSourceFileDeprecated(a0 : System.String) = (2023, GetStringFunc("fscResxSourceFileDeprecated",",,,%s,,,") a0) /// Static linking may not be used on an assembly referencing mscorlib (e.g. a .NET Framework assembly) when generating an assembly that references System.Runtime (e.g. a .NET Core or Portable assembly). - /// (Originally from ..\FSComp.txt:1139) + /// (Originally from ..\FSComp.txt:1138) static member fscStaticLinkingNoProfileMismatches() = (2024, GetStringFunc("fscStaticLinkingNoProfileMismatches",",,,") ) /// An %s specified version '%s', but this value is a wildcard, and you have requested a deterministic build, these are in conflict. - /// (Originally from ..\FSComp.txt:1140) + /// (Originally from ..\FSComp.txt:1139) static member fscAssemblyWildcardAndDeterminism(a0 : System.String, a1 : System.String) = (2025, GetStringFunc("fscAssemblyWildcardAndDeterminism",",,,%s,,,%s,,,") a0 a1) /// Determinstic builds only support portable PDBs (--debug:portable or --debug:embedded) - /// (Originally from ..\FSComp.txt:1141) + /// (Originally from ..\FSComp.txt:1140) static member fscDeterministicDebugRequiresPortablePdb() = (2026, GetStringFunc("fscDeterministicDebugRequiresPortablePdb",",,,") ) /// Character '%s' is not allowed in provided namespace name '%s' - /// (Originally from ..\FSComp.txt:1142) + /// (Originally from ..\FSComp.txt:1141) static member etIllegalCharactersInNamespaceName(a0 : System.String, a1 : System.String) = (3000, GetStringFunc("etIllegalCharactersInNamespaceName",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' returned a member with a null or empty member name - /// (Originally from ..\FSComp.txt:1143) + /// (Originally from ..\FSComp.txt:1142) static member etNullOrEmptyMemberName(a0 : System.String) = (3001, GetStringFunc("etNullOrEmptyMemberName",",,,%s,,,") a0) /// The provided type '%s' returned a null member - /// (Originally from ..\FSComp.txt:1144) + /// (Originally from ..\FSComp.txt:1143) static member etNullMember(a0 : System.String) = (3002, GetStringFunc("etNullMember",",,,%s,,,") a0) /// The provided type '%s' member info '%s' has null declaring type - /// (Originally from ..\FSComp.txt:1145) + /// (Originally from ..\FSComp.txt:1144) static member etNullMemberDeclaringType(a0 : System.String, a1 : System.String) = (3003, GetStringFunc("etNullMemberDeclaringType",",,,%s,,,%s,,,") a0 a1) /// The provided type '%s' has member '%s' which has declaring type '%s'. Expected declaring type to be the same as provided type. - /// (Originally from ..\FSComp.txt:1146) + /// (Originally from ..\FSComp.txt:1145) static member etNullMemberDeclaringTypeDifferentFromProvidedType(a0 : System.String, a1 : System.String, a2 : System.String) = (3004, GetStringFunc("etNullMemberDeclaringTypeDifferentFromProvidedType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Referenced assembly '%s' has assembly level attribute '%s' but no public type provider classes were found - /// (Originally from ..\FSComp.txt:1147) + /// (Originally from ..\FSComp.txt:1146) static member etHostingAssemblyFoundWithoutHosts(a0 : System.String, a1 : System.String) = (3005, GetStringFunc("etHostingAssemblyFoundWithoutHosts",",,,%s,,,%s,,,") a0 a1) /// Type '%s' from type provider '%s' has an empty namespace. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1148) + /// (Originally from ..\FSComp.txt:1147) static member etEmptyNamespaceOfTypeNotAllowed(a0 : System.String, a1 : System.String) = (3006, GetStringFunc("etEmptyNamespaceOfTypeNotAllowed",",,,%s,,,%s,,,") a0 a1) /// Empty namespace found from the type provider '%s'. Use 'null' for the global namespace. - /// (Originally from ..\FSComp.txt:1149) + /// (Originally from ..\FSComp.txt:1148) static member etEmptyNamespaceNotAllowed(a0 : System.String) = (3007, GetStringFunc("etEmptyNamespaceNotAllowed",",,,%s,,,") a0) /// Provided type '%s' has 'IsGenericType' as true, but generic types are not supported. - /// (Originally from ..\FSComp.txt:1150) + /// (Originally from ..\FSComp.txt:1149) static member etMustNotBeGeneric(a0 : System.String) = (3011, GetStringFunc("etMustNotBeGeneric",",,,%s,,,") a0) /// Provided type '%s' has 'IsArray' as true, but array types are not supported. - /// (Originally from ..\FSComp.txt:1151) + /// (Originally from ..\FSComp.txt:1150) static member etMustNotBeAnArray(a0 : System.String) = (3013, GetStringFunc("etMustNotBeAnArray",",,,%s,,,") a0) /// Invalid member '%s' on provided type '%s'. Provided type members must be public, and not be generic, virtual, or abstract. - /// (Originally from ..\FSComp.txt:1152) + /// (Originally from ..\FSComp.txt:1151) static member etMethodHasRequirements(a0 : System.String, a1 : System.String) = (3014, GetStringFunc("etMethodHasRequirements",",,,%s,,,%s,,,") a0 a1) /// Invalid member '%s' on provided type '%s'. Only properties, methods and constructors are allowed - /// (Originally from ..\FSComp.txt:1153) + /// (Originally from ..\FSComp.txt:1152) static member etUnsupportedMemberKind(a0 : System.String, a1 : System.String) = (3015, GetStringFunc("etUnsupportedMemberKind",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=true but there was no value from GetGetMethod() - /// (Originally from ..\FSComp.txt:1154) + /// (Originally from ..\FSComp.txt:1153) static member etPropertyCanReadButHasNoGetter(a0 : System.String, a1 : System.String) = (3016, GetStringFunc("etPropertyCanReadButHasNoGetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanRead=false but GetGetMethod() returned a method - /// (Originally from ..\FSComp.txt:1155) + /// (Originally from ..\FSComp.txt:1154) static member etPropertyHasGetterButNoCanRead(a0 : System.String, a1 : System.String) = (3017, GetStringFunc("etPropertyHasGetterButNoCanRead",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=true but there was no value from GetSetMethod() - /// (Originally from ..\FSComp.txt:1156) + /// (Originally from ..\FSComp.txt:1155) static member etPropertyCanWriteButHasNoSetter(a0 : System.String, a1 : System.String) = (3018, GetStringFunc("etPropertyCanWriteButHasNoSetter",",,,%s,,,%s,,,") a0 a1) /// Property '%s' on provided type '%s' has CanWrite=false but GetSetMethod() returned a method - /// (Originally from ..\FSComp.txt:1157) + /// (Originally from ..\FSComp.txt:1156) static member etPropertyHasSetterButNoCanWrite(a0 : System.String, a1 : System.String) = (3019, GetStringFunc("etPropertyHasSetterButNoCanWrite",",,,%s,,,%s,,,") a0 a1) /// One or more errors seen during provided type setup - /// (Originally from ..\FSComp.txt:1158) + /// (Originally from ..\FSComp.txt:1157) static member etOneOrMoreErrorsSeenDuringExtensionTypeSetting() = (3020, GetStringFunc("etOneOrMoreErrorsSeenDuringExtensionTypeSetting",",,,") ) /// Unexpected exception from provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1159) + /// (Originally from ..\FSComp.txt:1158) static member etUnexpectedExceptionFromProvidedTypeMember(a0 : System.String, a1 : System.String, a2 : System.String) = (3021, GetStringFunc("etUnexpectedExceptionFromProvidedTypeMember",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Unsupported constant type '%s'. Quotations provided by type providers can only contain simple constants. The implementation of the type provider may need to be adjusted by moving a value declared outside a provided quotation literal to be a 'let' binding inside the quotation literal. - /// (Originally from ..\FSComp.txt:1160) + /// (Originally from ..\FSComp.txt:1159) static member etUnsupportedConstantType(a0 : System.String) = (3022, GetStringFunc("etUnsupportedConstantType",",,,%s,,,") a0) /// Unsupported expression '%s' from type provider. If you are the author of this type provider, consider adjusting it to provide a different provided expression. - /// (Originally from ..\FSComp.txt:1161) + /// (Originally from ..\FSComp.txt:1160) static member etUnsupportedProvidedExpression(a0 : System.String) = (3025, GetStringFunc("etUnsupportedProvidedExpression",",,,%s,,,") a0) /// Expected provided type named '%s' but provided type has 'Name' with value '%s' - /// (Originally from ..\FSComp.txt:1162) + /// (Originally from ..\FSComp.txt:1161) static member etProvidedTypeHasUnexpectedName(a0 : System.String, a1 : System.String) = (3028, GetStringFunc("etProvidedTypeHasUnexpectedName",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetAddMethod() - /// (Originally from ..\FSComp.txt:1163) + /// (Originally from ..\FSComp.txt:1162) static member etEventNoAdd(a0 : System.String, a1 : System.String) = (3029, GetStringFunc("etEventNoAdd",",,,%s,,,%s,,,") a0 a1) /// Event '%s' on provided type '%s' has no value from GetRemoveMethod() - /// (Originally from ..\FSComp.txt:1164) + /// (Originally from ..\FSComp.txt:1163) static member etEventNoRemove(a0 : System.String, a1 : System.String) = (3030, GetStringFunc("etEventNoRemove",",,,%s,,,%s,,,") a0 a1) /// Assembly attribute '%s' refers to a designer assembly '%s' which cannot be loaded or doesn't exist. %s - /// (Originally from ..\FSComp.txt:1165) + /// (Originally from ..\FSComp.txt:1164) static member etProviderHasWrongDesignerAssembly(a0 : System.String, a1 : System.String, a2 : System.String) = (3031, GetStringFunc("etProviderHasWrongDesignerAssembly",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider does not have a valid constructor. A constructor taking either no arguments or one argument of type 'TypeProviderConfig' was expected. - /// (Originally from ..\FSComp.txt:1166) + /// (Originally from ..\FSComp.txt:1165) static member etProviderDoesNotHaveValidConstructor() = (3032, GetStringFunc("etProviderDoesNotHaveValidConstructor",",,,") ) /// The type provider '%s' reported an error: %s - /// (Originally from ..\FSComp.txt:1167) + /// (Originally from ..\FSComp.txt:1166) static member etProviderError(a0 : System.String, a1 : System.String) = (3033, GetStringFunc("etProviderError",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' used an invalid parameter in the ParameterExpression: %s - /// (Originally from ..\FSComp.txt:1168) + /// (Originally from ..\FSComp.txt:1167) static member etIncorrectParameterExpression(a0 : System.String, a1 : System.String) = (3034, GetStringFunc("etIncorrectParameterExpression",",,,%s,,,%s,,,") a0 a1) /// The type provider '%s' provided a method with a name '%s' and metadata token '%d', which is not reported among its methods of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1169) + /// (Originally from ..\FSComp.txt:1168) static member etIncorrectProvidedMethod(a0 : System.String, a1 : System.String, a2 : System.Int32, a3 : System.String) = (3035, GetStringFunc("etIncorrectProvidedMethod",",,,%s,,,%s,,,%d,,,%s,,,") a0 a1 a2 a3) /// The type provider '%s' provided a constructor which is not reported among the constructors of its declaring type '%s' - /// (Originally from ..\FSComp.txt:1170) + /// (Originally from ..\FSComp.txt:1169) static member etIncorrectProvidedConstructor(a0 : System.String, a1 : System.String) = (3036, GetStringFunc("etIncorrectProvidedConstructor",",,,%s,,,%s,,,") a0 a1) /// A direct reference to the generated type '%s' is not permitted. Instead, use a type definition, e.g. 'type TypeAlias = '. This indicates that a type provider adds generated types to your assembly. - /// (Originally from ..\FSComp.txt:1171) + /// (Originally from ..\FSComp.txt:1170) static member etDirectReferenceToGeneratedTypeNotAllowed(a0 : System.String) = (3039, GetStringFunc("etDirectReferenceToGeneratedTypeNotAllowed",",,,%s,,,") a0) /// Expected provided type with path '%s' but provided type has path '%s' - /// (Originally from ..\FSComp.txt:1172) + /// (Originally from ..\FSComp.txt:1171) static member etProvidedTypeHasUnexpectedPath(a0 : System.String, a1 : System.String) = (3041, GetStringFunc("etProvidedTypeHasUnexpectedPath",",,,%s,,,%s,,,") a0 a1) /// Unexpected 'null' return value from provided type '%s' member '%s' - /// (Originally from ..\FSComp.txt:1173) + /// (Originally from ..\FSComp.txt:1172) static member etUnexpectedNullFromProvidedTypeMember(a0 : System.String, a1 : System.String) = (3042, GetStringFunc("etUnexpectedNullFromProvidedTypeMember",",,,%s,,,%s,,,") a0 a1) /// Unexpected exception from member '%s' of provided type '%s' member '%s': %s - /// (Originally from ..\FSComp.txt:1174) + /// (Originally from ..\FSComp.txt:1173) static member etUnexpectedExceptionFromProvidedMemberMember(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3043, GetStringFunc("etUnexpectedExceptionFromProvidedMemberMember",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// Nested provided types do not take static arguments or generic parameters - /// (Originally from ..\FSComp.txt:1175) + /// (Originally from ..\FSComp.txt:1174) static member etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters() = (3044, GetStringFunc("etNestedProvidedTypesDoNotTakeStaticArgumentsOrGenericParameters",",,,") ) /// Invalid static argument to provided type. Expected an argument of kind '%s'. - /// (Originally from ..\FSComp.txt:1176) + /// (Originally from ..\FSComp.txt:1175) static member etInvalidStaticArgument(a0 : System.String) = (3045, GetStringFunc("etInvalidStaticArgument",",,,%s,,,") a0) /// An error occured applying the static arguments to a provided type - /// (Originally from ..\FSComp.txt:1177) + /// (Originally from ..\FSComp.txt:1176) static member etErrorApplyingStaticArgumentsToType() = (3046, GetStringFunc("etErrorApplyingStaticArgumentsToType",",,,") ) /// Unknown static argument kind '%s' when resolving a reference to a provided type or method '%s' - /// (Originally from ..\FSComp.txt:1178) + /// (Originally from ..\FSComp.txt:1177) static member etUnknownStaticArgumentKind(a0 : System.String, a1 : System.String) = (3047, GetStringFunc("etUnknownStaticArgumentKind",",,,%s,,,%s,,,") a0 a1) /// invalid namespace for provided type - /// (Originally from ..\FSComp.txt:1179) + /// (Originally from ..\FSComp.txt:1178) static member invalidNamespaceForProvidedType() = (GetStringFunc("invalidNamespaceForProvidedType",",,,") ) /// invalid full name for provided type - /// (Originally from ..\FSComp.txt:1180) + /// (Originally from ..\FSComp.txt:1179) static member invalidFullNameForProvidedType() = (GetStringFunc("invalidFullNameForProvidedType",",,,") ) /// The type provider returned 'null', which is not a valid return value from '%s' - /// (Originally from ..\FSComp.txt:1182) + /// (Originally from ..\FSComp.txt:1181) static member etProviderReturnedNull(a0 : System.String) = (3051, GetStringFunc("etProviderReturnedNull",",,,%s,,,") a0) /// The type provider constructor has thrown an exception: %s - /// (Originally from ..\FSComp.txt:1183) + /// (Originally from ..\FSComp.txt:1182) static member etTypeProviderConstructorException(a0 : System.String) = (3053, GetStringFunc("etTypeProviderConstructorException",",,,%s,,,") a0) /// Type provider '%s' returned null from GetInvokerExpression. - /// (Originally from ..\FSComp.txt:1184) + /// (Originally from ..\FSComp.txt:1183) static member etNullProvidedExpression(a0 : System.String) = (3056, GetStringFunc("etNullProvidedExpression",",,,%s,,,") a0) /// The type provider '%s' returned an invalid type from 'ApplyStaticArguments'. A type with name '%s' was expected, but a type with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1185) + /// (Originally from ..\FSComp.txt:1184) static member etProvidedAppliedTypeHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3057, GetStringFunc("etProvidedAppliedTypeHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// The type provider '%s' returned an invalid method from 'ApplyStaticArgumentsForMethod'. A method with name '%s' was expected, but a method with name '%s' was returned. - /// (Originally from ..\FSComp.txt:1186) + /// (Originally from ..\FSComp.txt:1185) static member etProvidedAppliedMethodHadWrongName(a0 : System.String, a1 : System.String, a2 : System.String) = (3058, GetStringFunc("etProvidedAppliedMethodHadWrongName",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// This type test or downcast will erase the provided type '%s' to the type '%s' - /// (Originally from ..\FSComp.txt:1187) + /// (Originally from ..\FSComp.txt:1186) static member tcTypeTestLossy(a0 : System.String, a1 : System.String) = (3060, GetStringFunc("tcTypeTestLossy",",,,%s,,,%s,,,") a0 a1) /// This downcast will erase the provided type '%s' to the type '%s'. - /// (Originally from ..\FSComp.txt:1188) + /// (Originally from ..\FSComp.txt:1187) static member tcTypeCastErased(a0 : System.String, a1 : System.String) = (3061, GetStringFunc("tcTypeCastErased",",,,%s,,,%s,,,") a0 a1) /// This type test with a provided type '%s' is not allowed because this provided type will be erased to '%s' at runtime. - /// (Originally from ..\FSComp.txt:1189) + /// (Originally from ..\FSComp.txt:1188) static member tcTypeTestErased(a0 : System.String, a1 : System.String) = (3062, GetStringFunc("tcTypeTestErased",",,,%s,,,%s,,,") a0 a1) /// Cannot inherit from erased provided type - /// (Originally from ..\FSComp.txt:1190) + /// (Originally from ..\FSComp.txt:1189) static member tcCannotInheritFromErasedType() = (3063, GetStringFunc("tcCannotInheritFromErasedType",",,,") ) /// Assembly '%s' hase TypeProviderAssembly attribute with invalid value '%s'. The value should be a valid assembly name - /// (Originally from ..\FSComp.txt:1191) + /// (Originally from ..\FSComp.txt:1190) static member etInvalidTypeProviderAssemblyName(a0 : System.String, a1 : System.String) = (3065, GetStringFunc("etInvalidTypeProviderAssemblyName",",,,%s,,,%s,,,") a0 a1) /// Invalid member name. Members may not have name '.ctor' or '.cctor' - /// (Originally from ..\FSComp.txt:1192) + /// (Originally from ..\FSComp.txt:1191) static member tcInvalidMemberNameCtor() = (3066, GetStringFunc("tcInvalidMemberNameCtor",",,,") ) /// The function or member '%s' is used in a way that requires further type annotations at its definition to ensure consistency of inferred types. The inferred signature is '%s'. - /// (Originally from ..\FSComp.txt:1193) + /// (Originally from ..\FSComp.txt:1192) static member tcInferredGenericTypeGivesRiseToInconsistency(a0 : System.String, a1 : System.String) = (3068, GetStringFunc("tcInferredGenericTypeGivesRiseToInconsistency",",,,%s,,,%s,,,") a0 a1) /// The number of type arguments did not match: '%d' given, '%d' expected. This may be related to a previously reported error. - /// (Originally from ..\FSComp.txt:1194) + /// (Originally from ..\FSComp.txt:1193) static member tcInvalidTypeArgumentCount(a0 : System.Int32, a1 : System.Int32) = (3069, GetStringFunc("tcInvalidTypeArgumentCount",",,,%d,,,%d,,,") a0 a1) /// Cannot override inherited member '%s' because it is sealed - /// (Originally from ..\FSComp.txt:1195) + /// (Originally from ..\FSComp.txt:1194) static member tcCannotOverrideSealedMethod(a0 : System.String) = (3070, GetStringFunc("tcCannotOverrideSealedMethod",",,,%s,,,") a0) /// The type provider '%s' reported an error in the context of provided type '%s', member '%s'. The error: %s - /// (Originally from ..\FSComp.txt:1196) + /// (Originally from ..\FSComp.txt:1195) static member etProviderErrorWithContext(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3071, GetStringFunc("etProviderErrorWithContext",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// An exception occurred when accessing the '%s' of a provided type: %s - /// (Originally from ..\FSComp.txt:1197) + /// (Originally from ..\FSComp.txt:1196) static member etProvidedTypeWithNameException(a0 : System.String, a1 : System.String) = (3072, GetStringFunc("etProvidedTypeWithNameException",",,,%s,,,%s,,,") a0 a1) /// The '%s' of a provided type was null or empty. - /// (Originally from ..\FSComp.txt:1198) + /// (Originally from ..\FSComp.txt:1197) static member etProvidedTypeWithNullOrEmptyName(a0 : System.String) = (3073, GetStringFunc("etProvidedTypeWithNullOrEmptyName",",,,%s,,,") a0) /// Character '%s' is not allowed in provided type name '%s' - /// (Originally from ..\FSComp.txt:1199) + /// (Originally from ..\FSComp.txt:1198) static member etIllegalCharactersInTypeName(a0 : System.String, a1 : System.String) = (3075, GetStringFunc("etIllegalCharactersInTypeName",",,,%s,,,%s,,,") a0 a1) /// In queries, '%s' must use a simple pattern - /// (Originally from ..\FSComp.txt:1200) + /// (Originally from ..\FSComp.txt:1199) static member tcJoinMustUseSimplePattern(a0 : System.String) = (3077, GetStringFunc("tcJoinMustUseSimplePattern",",,,%s,,,") a0) /// A custom query operation for '%s' is required but not specified - /// (Originally from ..\FSComp.txt:1201) + /// (Originally from ..\FSComp.txt:1200) static member tcMissingCustomOperation(a0 : System.String) = (3078, GetStringFunc("tcMissingCustomOperation",",,,%s,,,") a0) /// Named static arguments must come after all unnamed static arguments - /// (Originally from ..\FSComp.txt:1202) + /// (Originally from ..\FSComp.txt:1201) static member etBadUnnamedStaticArgs() = (3080, GetStringFunc("etBadUnnamedStaticArgs",",,,") ) /// The static parameter '%s' of the provided type or method '%s' requires a value. Static parameters to type providers may be optionally specified using named arguments, e.g. '%s<%s=...>'. - /// (Originally from ..\FSComp.txt:1203) + /// (Originally from ..\FSComp.txt:1202) static member etStaticParameterRequiresAValue(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3081, GetStringFunc("etStaticParameterRequiresAValue",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// No static parameter exists with name '%s' - /// (Originally from ..\FSComp.txt:1204) + /// (Originally from ..\FSComp.txt:1203) static member etNoStaticParameterWithName(a0 : System.String) = (3082, GetStringFunc("etNoStaticParameterWithName",",,,%s,,,") a0) /// The static parameter '%s' has already been given a value - /// (Originally from ..\FSComp.txt:1205) + /// (Originally from ..\FSComp.txt:1204) static member etStaticParameterAlreadyHasValue(a0 : System.String) = (3083, GetStringFunc("etStaticParameterAlreadyHasValue",",,,%s,,,") a0) /// Multiple static parameters exist with name '%s' - /// (Originally from ..\FSComp.txt:1206) + /// (Originally from ..\FSComp.txt:1205) static member etMultipleStaticParameterWithName(a0 : System.String) = (3084, GetStringFunc("etMultipleStaticParameterWithName",",,,%s,,,") a0) /// A custom operation may not be used in conjunction with a non-value or recursive 'let' binding in another part of this computation expression - /// (Originally from ..\FSComp.txt:1207) + /// (Originally from ..\FSComp.txt:1206) static member tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings() = (3085, GetStringFunc("tcCustomOperationMayNotBeUsedInConjunctionWithNonSimpleLetBindings",",,,") ) /// A custom operation may not be used in conjunction with 'use', 'try/with', 'try/finally', 'if/then/else' or 'match' operators within this computation expression - /// (Originally from ..\FSComp.txt:1208) + /// (Originally from ..\FSComp.txt:1207) static member tcCustomOperationMayNotBeUsedHere() = (3086, GetStringFunc("tcCustomOperationMayNotBeUsedHere",",,,") ) /// The custom operation '%s' refers to a method which is overloaded. The implementations of custom operations may not be overloaded. - /// (Originally from ..\FSComp.txt:1209) + /// (Originally from ..\FSComp.txt:1208) static member tcCustomOperationMayNotBeOverloaded(a0 : System.String) = (3087, GetStringFunc("tcCustomOperationMayNotBeOverloaded",",,,%s,,,") a0) /// An if/then/else expression may not be used within queries. Consider using either an if/then expression, or use a sequence expression instead. - /// (Originally from ..\FSComp.txt:1210) + /// (Originally from ..\FSComp.txt:1209) static member tcIfThenElseMayNotBeUsedWithinQueries() = (3090, GetStringFunc("tcIfThenElseMayNotBeUsedWithinQueries",",,,") ) /// Invalid argument to 'methodhandleof' during codegen - /// (Originally from ..\FSComp.txt:1211) + /// (Originally from ..\FSComp.txt:1210) static member ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen() = (3091, GetStringFunc("ilxgenUnexpectedArgumentToMethodHandleOfDuringCodegen",",,,") ) /// A reference to a provided type was missing a value for the static parameter '%s'. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1212) + /// (Originally from ..\FSComp.txt:1211) static member etProvidedTypeReferenceMissingArgument(a0 : System.String) = (3092, GetStringFunc("etProvidedTypeReferenceMissingArgument",",,,%s,,,") a0) /// A reference to a provided type had an invalid value '%s' for a static parameter. You may need to recompile one or more referenced assemblies. - /// (Originally from ..\FSComp.txt:1213) + /// (Originally from ..\FSComp.txt:1212) static member etProvidedTypeReferenceInvalidText(a0 : System.String) = (3093, GetStringFunc("etProvidedTypeReferenceInvalidText",",,,%s,,,") a0) /// '%s' is not used correctly. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1214) + /// (Originally from ..\FSComp.txt:1213) static member tcCustomOperationNotUsedCorrectly(a0 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly",",,,%s,,,") a0) /// '%s' is not used correctly. Usage: %s. This is a custom operation in this query or computation expression. - /// (Originally from ..\FSComp.txt:1215) + /// (Originally from ..\FSComp.txt:1214) static member tcCustomOperationNotUsedCorrectly2(a0 : System.String, a1 : System.String) = (3095, GetStringFunc("tcCustomOperationNotUsedCorrectly2",",,,%s,,,%s,,,") a0 a1) /// %s var in collection %s (outerKey = innerKey). Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1216) + /// (Originally from ..\FSComp.txt:1215) static member customOperationTextLikeJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection %s (outerKey = innerKey) into group. Note that parentheses are required after '%s' - /// (Originally from ..\FSComp.txt:1217) + /// (Originally from ..\FSComp.txt:1216) static member customOperationTextLikeGroupJoin(a0 : System.String, a1 : System.String, a2 : System.String) = (GetStringFunc("customOperationTextLikeGroupJoin",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s var in collection - /// (Originally from ..\FSComp.txt:1218) + /// (Originally from ..\FSComp.txt:1217) static member customOperationTextLikeZip(a0 : System.String) = (GetStringFunc("customOperationTextLikeZip",",,,%s,,,") a0) /// '%s' must be followed by a variable name. Usage: %s. - /// (Originally from ..\FSComp.txt:1219) + /// (Originally from ..\FSComp.txt:1218) static member tcBinaryOperatorRequiresVariable(a0 : System.String, a1 : System.String) = (3096, GetStringFunc("tcBinaryOperatorRequiresVariable",",,,%s,,,%s,,,") a0 a1) /// Incorrect syntax for '%s'. Usage: %s. - /// (Originally from ..\FSComp.txt:1220) + /// (Originally from ..\FSComp.txt:1219) static member tcOperatorIncorrectSyntax(a0 : System.String, a1 : System.String) = (3097, GetStringFunc("tcOperatorIncorrectSyntax",",,,%s,,,%s,,,") a0 a1) /// '%s' must come after a 'for' selection clause and be followed by the rest of the query. Syntax: ... %s ... - /// (Originally from ..\FSComp.txt:1221) + /// (Originally from ..\FSComp.txt:1220) static member tcBinaryOperatorRequiresBody(a0 : System.String, a1 : System.String) = (3098, GetStringFunc("tcBinaryOperatorRequiresBody",",,,%s,,,%s,,,") a0 a1) /// '%s' is used with an incorrect number of arguments. This is a custom operation in this query or computation expression. Expected %d argument(s), but given %d. - /// (Originally from ..\FSComp.txt:1222) + /// (Originally from ..\FSComp.txt:1221) static member tcCustomOperationHasIncorrectArgCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3099, GetStringFunc("tcCustomOperationHasIncorrectArgCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Expected an expression after this point - /// (Originally from ..\FSComp.txt:1223) + /// (Originally from ..\FSComp.txt:1222) static member parsExpectedExpressionAfterToken() = (3100, GetStringFunc("parsExpectedExpressionAfterToken",",,,") ) /// Expected a type after this point - /// (Originally from ..\FSComp.txt:1224) + /// (Originally from ..\FSComp.txt:1223) static member parsExpectedTypeAfterToken() = (3101, GetStringFunc("parsExpectedTypeAfterToken",",,,") ) /// Unmatched '[<'. Expected closing '>]' - /// (Originally from ..\FSComp.txt:1225) + /// (Originally from ..\FSComp.txt:1224) static member parsUnmatchedLBrackLess() = (3102, GetStringFunc("parsUnmatchedLBrackLess",",,,") ) /// Unexpected end of input in 'match' expression. Expected 'match with | -> | -> ...'. - /// (Originally from ..\FSComp.txt:1226) + /// (Originally from ..\FSComp.txt:1225) static member parsUnexpectedEndOfFileMatch() = (3103, GetStringFunc("parsUnexpectedEndOfFileMatch",",,,") ) /// Unexpected end of input in 'try' expression. Expected 'try with ' or 'try finally '. - /// (Originally from ..\FSComp.txt:1227) + /// (Originally from ..\FSComp.txt:1226) static member parsUnexpectedEndOfFileTry() = (3104, GetStringFunc("parsUnexpectedEndOfFileTry",",,,") ) /// Unexpected end of input in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1228) + /// (Originally from ..\FSComp.txt:1227) static member parsUnexpectedEndOfFileWhile() = (3105, GetStringFunc("parsUnexpectedEndOfFileWhile",",,,") ) /// Unexpected end of input in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1229) + /// (Originally from ..\FSComp.txt:1228) static member parsUnexpectedEndOfFileFor() = (3106, GetStringFunc("parsUnexpectedEndOfFileFor",",,,") ) /// Unexpected end of input in 'match' or 'try' expression - /// (Originally from ..\FSComp.txt:1230) + /// (Originally from ..\FSComp.txt:1229) static member parsUnexpectedEndOfFileWith() = (3107, GetStringFunc("parsUnexpectedEndOfFileWith",",,,") ) /// Unexpected end of input in 'then' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1231) + /// (Originally from ..\FSComp.txt:1230) static member parsUnexpectedEndOfFileThen() = (3108, GetStringFunc("parsUnexpectedEndOfFileThen",",,,") ) /// Unexpected end of input in 'else' branch of conditional expression. Expected 'if then ' or 'if then else '. - /// (Originally from ..\FSComp.txt:1232) + /// (Originally from ..\FSComp.txt:1231) static member parsUnexpectedEndOfFileElse() = (3109, GetStringFunc("parsUnexpectedEndOfFileElse",",,,") ) /// Unexpected end of input in body of lambda expression. Expected 'fun ... -> '. - /// (Originally from ..\FSComp.txt:1233) + /// (Originally from ..\FSComp.txt:1232) static member parsUnexpectedEndOfFileFunBody() = (3110, GetStringFunc("parsUnexpectedEndOfFileFunBody",",,,") ) /// Unexpected end of input in type arguments - /// (Originally from ..\FSComp.txt:1234) + /// (Originally from ..\FSComp.txt:1233) static member parsUnexpectedEndOfFileTypeArgs() = (3111, GetStringFunc("parsUnexpectedEndOfFileTypeArgs",",,,") ) /// Unexpected end of input in type signature - /// (Originally from ..\FSComp.txt:1235) + /// (Originally from ..\FSComp.txt:1234) static member parsUnexpectedEndOfFileTypeSignature() = (3112, GetStringFunc("parsUnexpectedEndOfFileTypeSignature",",,,") ) /// Unexpected end of input in type definition - /// (Originally from ..\FSComp.txt:1236) + /// (Originally from ..\FSComp.txt:1235) static member parsUnexpectedEndOfFileTypeDefinition() = (3113, GetStringFunc("parsUnexpectedEndOfFileTypeDefinition",",,,") ) /// Unexpected end of input in object members - /// (Originally from ..\FSComp.txt:1237) + /// (Originally from ..\FSComp.txt:1236) static member parsUnexpectedEndOfFileObjectMembers() = (3114, GetStringFunc("parsUnexpectedEndOfFileObjectMembers",",,,") ) /// Unexpected end of input in value, function or member definition - /// (Originally from ..\FSComp.txt:1238) + /// (Originally from ..\FSComp.txt:1237) static member parsUnexpectedEndOfFileDefinition() = (3115, GetStringFunc("parsUnexpectedEndOfFileDefinition",",,,") ) /// Unexpected end of input in expression - /// (Originally from ..\FSComp.txt:1239) + /// (Originally from ..\FSComp.txt:1238) static member parsUnexpectedEndOfFileExpression() = (3116, GetStringFunc("parsUnexpectedEndOfFileExpression",",,,") ) /// Unexpected end of type. Expected a name after this point. - /// (Originally from ..\FSComp.txt:1240) + /// (Originally from ..\FSComp.txt:1239) static member parsExpectedNameAfterToken() = (3117, GetStringFunc("parsExpectedNameAfterToken",",,,") ) /// Incomplete value or function definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let' keyword. - /// (Originally from ..\FSComp.txt:1241) + /// (Originally from ..\FSComp.txt:1240) static member parsUnmatchedLet() = (3118, GetStringFunc("parsUnmatchedLet",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'let!' keyword. - /// (Originally from ..\FSComp.txt:1242) + /// (Originally from ..\FSComp.txt:1241) static member parsUnmatchedLetBang() = (3119, GetStringFunc("parsUnmatchedLetBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use!' keyword. - /// (Originally from ..\FSComp.txt:1243) + /// (Originally from ..\FSComp.txt:1242) static member parsUnmatchedUseBang() = (3120, GetStringFunc("parsUnmatchedUseBang",",,,") ) /// Incomplete value definition. If this is in an expression, the body of the expression must be indented to the same column as the 'use' keyword. - /// (Originally from ..\FSComp.txt:1244) + /// (Originally from ..\FSComp.txt:1243) static member parsUnmatchedUse() = (3121, GetStringFunc("parsUnmatchedUse",",,,") ) /// Missing 'do' in 'while' expression. Expected 'while do '. - /// (Originally from ..\FSComp.txt:1245) + /// (Originally from ..\FSComp.txt:1244) static member parsWhileDoExpected() = (3122, GetStringFunc("parsWhileDoExpected",",,,") ) /// Missing 'do' in 'for' expression. Expected 'for in do '. - /// (Originally from ..\FSComp.txt:1246) + /// (Originally from ..\FSComp.txt:1245) static member parsForDoExpected() = (3123, GetStringFunc("parsForDoExpected",",,,") ) /// Invalid join relation in '%s'. Expected 'expr expr', where is =, =?, ?= or ?=?. - /// (Originally from ..\FSComp.txt:1247) + /// (Originally from ..\FSComp.txt:1246) static member tcInvalidRelationInJoin(a0 : System.String) = (3125, GetStringFunc("tcInvalidRelationInJoin",",,,%s,,,") a0) /// Calls - /// (Originally from ..\FSComp.txt:1248) + /// (Originally from ..\FSComp.txt:1247) static member typeInfoCallsWord() = (GetStringFunc("typeInfoCallsWord",",,,") ) /// Invalid number of generic arguments to type '%s' in provided type. Expected '%d' arguments, given '%d'. - /// (Originally from ..\FSComp.txt:1249) + /// (Originally from ..\FSComp.txt:1248) static member impInvalidNumberOfGenericArguments(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3126, GetStringFunc("impInvalidNumberOfGenericArguments",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Invalid value '%s' for unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1250) + /// (Originally from ..\FSComp.txt:1249) static member impInvalidMeasureArgument1(a0 : System.String, a1 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument1",",,,%s,,,%s,,,") a0 a1) /// Invalid value unit-of-measure parameter '%s' - /// (Originally from ..\FSComp.txt:1251) + /// (Originally from ..\FSComp.txt:1250) static member impInvalidMeasureArgument2(a0 : System.String) = (3127, GetStringFunc("impInvalidMeasureArgument2",",,,%s,,,") a0) /// Property '%s' on provided type '%s' is neither readable nor writable as it has CanRead=false and CanWrite=false - /// (Originally from ..\FSComp.txt:1252) + /// (Originally from ..\FSComp.txt:1251) static member etPropertyNeedsCanWriteOrCanRead(a0 : System.String, a1 : System.String) = (3128, GetStringFunc("etPropertyNeedsCanWriteOrCanRead",",,,%s,,,%s,,,") a0 a1) /// A use of 'into' must be followed by the remainder of the computation - /// (Originally from ..\FSComp.txt:1253) + /// (Originally from ..\FSComp.txt:1252) static member tcIntoNeedsRestOfQuery() = (3129, GetStringFunc("tcIntoNeedsRestOfQuery",",,,") ) /// The operator '%s' does not accept the use of 'into' - /// (Originally from ..\FSComp.txt:1254) + /// (Originally from ..\FSComp.txt:1253) static member tcOperatorDoesntAcceptInto(a0 : System.String) = (3130, GetStringFunc("tcOperatorDoesntAcceptInto",",,,%s,,,") a0) /// The definition of the custom operator '%s' does not use a valid combination of attribute flags - /// (Originally from ..\FSComp.txt:1255) + /// (Originally from ..\FSComp.txt:1254) static member tcCustomOperationInvalid(a0 : System.String) = (3131, GetStringFunc("tcCustomOperationInvalid",",,,%s,,,") a0) /// This type definition may not have the 'CLIMutable' attribute. Only record types may have this attribute. - /// (Originally from ..\FSComp.txt:1256) + /// (Originally from ..\FSComp.txt:1255) static member tcThisTypeMayNotHaveACLIMutableAttribute() = (3132, GetStringFunc("tcThisTypeMayNotHaveACLIMutableAttribute",",,,") ) /// 'member val' definitions are only permitted in types with a primary constructor. Consider adding arguments to your type definition, e.g. 'type X(args) = ...'. - /// (Originally from ..\FSComp.txt:1257) + /// (Originally from ..\FSComp.txt:1256) static member tcAutoPropertyRequiresImplicitConstructionSequence() = (3133, GetStringFunc("tcAutoPropertyRequiresImplicitConstructionSequence",",,,") ) /// Property definitions may not be declared mutable. To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1258) + /// (Originally from ..\FSComp.txt:1257) static member parsMutableOnAutoPropertyShouldBeGetSet() = (3134, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSet",",,,") ) /// To indicate that this property can be set, use 'member val PropertyName = expr with get,set'. - /// (Originally from ..\FSComp.txt:1259) + /// (Originally from ..\FSComp.txt:1258) static member parsMutableOnAutoPropertyShouldBeGetSetNotJustSet() = (3135, GetStringFunc("parsMutableOnAutoPropertyShouldBeGetSetNotJustSet",",,,") ) /// Type '%s' is illegal because in byref, T cannot contain byref types. - /// (Originally from ..\FSComp.txt:1260) + /// (Originally from ..\FSComp.txt:1259) static member chkNoByrefsOfByrefs(a0 : System.String) = (3136, GetStringFunc("chkNoByrefsOfByrefs",",,,%s,,,") a0) /// F# supports array ranks between 1 and 32. The value %d is not allowed. - /// (Originally from ..\FSComp.txt:1261) + /// (Originally from ..\FSComp.txt:1260) static member tastopsMaxArrayThirtyTwo(a0 : System.Int32) = (3138, GetStringFunc("tastopsMaxArrayThirtyTwo",",,,%d,,,") a0) /// In queries, use the form 'for x in n .. m do ...' for ranging over integers - /// (Originally from ..\FSComp.txt:1262) + /// (Originally from ..\FSComp.txt:1261) static member tcNoIntegerForLoopInQuery() = (3139, GetStringFunc("tcNoIntegerForLoopInQuery",",,,") ) /// 'while' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1263) + /// (Originally from ..\FSComp.txt:1262) static member tcNoWhileInQuery() = (3140, GetStringFunc("tcNoWhileInQuery",",,,") ) /// 'try/finally' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1264) + /// (Originally from ..\FSComp.txt:1263) static member tcNoTryFinallyInQuery() = (3141, GetStringFunc("tcNoTryFinallyInQuery",",,,") ) /// 'use' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1265) + /// (Originally from ..\FSComp.txt:1264) static member tcUseMayNotBeUsedInQueries() = (3142, GetStringFunc("tcUseMayNotBeUsedInQueries",",,,") ) /// 'let!', 'use!' and 'do!' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1266) + /// (Originally from ..\FSComp.txt:1265) static member tcBindMayNotBeUsedInQueries() = (3143, GetStringFunc("tcBindMayNotBeUsedInQueries",",,,") ) /// 'return' and 'return!' may not be used in queries - /// (Originally from ..\FSComp.txt:1267) + /// (Originally from ..\FSComp.txt:1266) static member tcReturnMayNotBeUsedInQueries() = (3144, GetStringFunc("tcReturnMayNotBeUsedInQueries",",,,") ) /// This is not a known query operator. Query operators are identifiers such as 'select', 'where', 'sortBy', 'thenBy', 'groupBy', 'groupValBy', 'join', 'groupJoin', 'sumBy' and 'averageBy', defined using corresponding methods on the 'QueryBuilder' type. - /// (Originally from ..\FSComp.txt:1268) + /// (Originally from ..\FSComp.txt:1267) static member tcUnrecognizedQueryOperator() = (3145, GetStringFunc("tcUnrecognizedQueryOperator",",,,") ) /// 'try/with' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1269) + /// (Originally from ..\FSComp.txt:1268) static member tcTryWithMayNotBeUsedInQueries() = (3146, GetStringFunc("tcTryWithMayNotBeUsedInQueries",",,,") ) /// This 'let' definition may not be used in a query. Only simple value definitions may be used in queries. - /// (Originally from ..\FSComp.txt:1270) + /// (Originally from ..\FSComp.txt:1269) static member tcNonSimpleLetBindingInQuery() = (3147, GetStringFunc("tcNonSimpleLetBindingInQuery",",,,") ) /// Too many static parameters. Expected at most %d parameters, but got %d unnamed and %d named parameters. - /// (Originally from ..\FSComp.txt:1271) + /// (Originally from ..\FSComp.txt:1270) static member etTooManyStaticParameters(a0 : System.Int32, a1 : System.Int32, a2 : System.Int32) = (3148, GetStringFunc("etTooManyStaticParameters",",,,%d,,,%d,,,%d,,,") a0 a1 a2) /// Invalid provided literal value '%s' - /// (Originally from ..\FSComp.txt:1272) + /// (Originally from ..\FSComp.txt:1271) static member infosInvalidProvidedLiteralValue(a0 : System.String) = (3149, GetStringFunc("infosInvalidProvidedLiteralValue",",,,%s,,,") a0) /// The 'anycpu32bitpreferred' platform can only be used with EXE targets. You must use 'anycpu' instead. - /// (Originally from ..\FSComp.txt:1273) + /// (Originally from ..\FSComp.txt:1272) static member invalidPlatformTarget() = (3150, GetStringFunc("invalidPlatformTarget",",,,") ) /// This member, function or value declaration may not be declared 'inline' - /// (Originally from ..\FSComp.txt:1274) + /// (Originally from ..\FSComp.txt:1273) static member tcThisValueMayNotBeInlined() = (3151, GetStringFunc("tcThisValueMayNotBeInlined",",,,") ) /// The provider '%s' returned a non-generated type '%s' in the context of a set of generated types. Consider adjusting the type provider to only return generated types. - /// (Originally from ..\FSComp.txt:1275) + /// (Originally from ..\FSComp.txt:1274) static member etErasedTypeUsedInGeneration(a0 : System.String, a1 : System.String) = (3152, GetStringFunc("etErasedTypeUsedInGeneration",",,,%s,,,%s,,,") a0 a1) /// Arguments to query operators may require parentheses, e.g. 'where (x > y)' or 'groupBy (x.Length / 10)' - /// (Originally from ..\FSComp.txt:1276) + /// (Originally from ..\FSComp.txt:1275) static member tcUnrecognizedQueryBinaryOperator() = (3153, GetStringFunc("tcUnrecognizedQueryBinaryOperator",",,,") ) /// A quotation may not involve an assignment to or taking the address of a captured local variable - /// (Originally from ..\FSComp.txt:1277) + /// (Originally from ..\FSComp.txt:1276) static member crefNoSetOfHole() = (3155, GetStringFunc("crefNoSetOfHole",",,,") ) /// + 1 overload - /// (Originally from ..\FSComp.txt:1278) + /// (Originally from ..\FSComp.txt:1277) static member nicePrintOtherOverloads1() = (GetStringFunc("nicePrintOtherOverloads1",",,,") ) /// + %d overloads - /// (Originally from ..\FSComp.txt:1279) + /// (Originally from ..\FSComp.txt:1278) static member nicePrintOtherOverloadsN(a0 : System.Int32) = (GetStringFunc("nicePrintOtherOverloadsN",",,,%d,,,") a0) /// Erased to - /// (Originally from ..\FSComp.txt:1280) + /// (Originally from ..\FSComp.txt:1279) static member erasedTo() = (GetStringFunc("erasedTo",",,,") ) /// Unexpected token '%s' or incomplete expression - /// (Originally from ..\FSComp.txt:1281) + /// (Originally from ..\FSComp.txt:1280) static member parsUnfinishedExpression(a0 : System.String) = (3156, GetStringFunc("parsUnfinishedExpression",",,,%s,,,") a0) /// Cannot find code target for this attribute, possibly because the code after the attribute is incomplete. - /// (Originally from ..\FSComp.txt:1282) + /// (Originally from ..\FSComp.txt:1281) static member parsAttributeOnIncompleteCode() = (3158, GetStringFunc("parsAttributeOnIncompleteCode",",,,") ) /// Type name cannot be empty. - /// (Originally from ..\FSComp.txt:1283) + /// (Originally from ..\FSComp.txt:1282) static member parsTypeNameCannotBeEmpty() = (3159, GetStringFunc("parsTypeNameCannotBeEmpty",",,,") ) /// Problem reading assembly '%s': %s - /// (Originally from ..\FSComp.txt:1284) + /// (Originally from ..\FSComp.txt:1283) static member buildProblemReadingAssembly(a0 : System.String, a1 : System.String) = (3160, GetStringFunc("buildProblemReadingAssembly",",,,%s,,,%s,,,") a0 a1) /// Invalid provided field. Provided fields of erased provided types must be literals. - /// (Originally from ..\FSComp.txt:1285) + /// (Originally from ..\FSComp.txt:1284) static member tcTPFieldMustBeLiteral() = (3161, GetStringFunc("tcTPFieldMustBeLiteral",",,,") ) /// (loading description...) - /// (Originally from ..\FSComp.txt:1286) + /// (Originally from ..\FSComp.txt:1285) static member loadingDescription() = (GetStringFunc("loadingDescription",",,,") ) /// (description unavailable...) - /// (Originally from ..\FSComp.txt:1287) + /// (Originally from ..\FSComp.txt:1286) static member descriptionUnavailable() = (GetStringFunc("descriptionUnavailable",",,,") ) /// A type variable has been constrained by multiple different class types. A type variable may only have one class constraint. - /// (Originally from ..\FSComp.txt:1288) + /// (Originally from ..\FSComp.txt:1287) static member chkTyparMultipleClassConstraints() = (3162, GetStringFunc("chkTyparMultipleClassConstraints",",,,") ) /// 'match' expressions may not be used in queries - /// (Originally from ..\FSComp.txt:1289) + /// (Originally from ..\FSComp.txt:1288) static member tcMatchMayNotBeUsedWithQuery() = (3163, GetStringFunc("tcMatchMayNotBeUsedWithQuery",",,,") ) /// Infix operator member '%s' has %d initial argument(s). Expected a tuple of 3 arguments - /// (Originally from ..\FSComp.txt:1290) + /// (Originally from ..\FSComp.txt:1289) static member memberOperatorDefinitionWithNonTripleArgument(a0 : System.String, a1 : System.Int32) = (3164, GetStringFunc("memberOperatorDefinitionWithNonTripleArgument",",,,%s,,,%d,,,") a0 a1) /// The operator '%s' cannot be resolved. Consider opening the module 'Microsoft.FSharp.Linq.NullableOperators'. - /// (Originally from ..\FSComp.txt:1291) + /// (Originally from ..\FSComp.txt:1290) static member cannotResolveNullableOperators(a0 : System.String) = (3165, GetStringFunc("cannotResolveNullableOperators",",,,%s,,,") a0) /// '%s' must be followed by 'in'. Usage: %s. - /// (Originally from ..\FSComp.txt:1292) + /// (Originally from ..\FSComp.txt:1291) static member tcOperatorRequiresIn(a0 : System.String, a1 : System.String) = (3167, GetStringFunc("tcOperatorRequiresIn",",,,%s,,,%s,,,") a0 a1) /// Neither 'member val' nor 'override val' definitions are permitted in object expressions. - /// (Originally from ..\FSComp.txt:1293) + /// (Originally from ..\FSComp.txt:1292) static member parsIllegalMemberVarInObjectImplementation() = (3168, GetStringFunc("parsIllegalMemberVarInObjectImplementation",",,,") ) /// Copy-and-update record expressions must include at least one field. - /// (Originally from ..\FSComp.txt:1294) + /// (Originally from ..\FSComp.txt:1293) static member tcEmptyCopyAndUpdateRecordInvalid() = (3169, GetStringFunc("tcEmptyCopyAndUpdateRecordInvalid",",,,") ) /// '_' cannot be used as field name - /// (Originally from ..\FSComp.txt:1295) + /// (Originally from ..\FSComp.txt:1294) static member parsUnderscoreInvalidFieldName() = (3170, GetStringFunc("parsUnderscoreInvalidFieldName",",,,") ) /// The provided types generated by this use of a type provider may not be used from other F# assemblies and should be marked internal or private. Consider using 'type internal TypeName = ...' or 'type private TypeName = ...'. - /// (Originally from ..\FSComp.txt:1296) + /// (Originally from ..\FSComp.txt:1295) static member tcGeneratedTypesShouldBeInternalOrPrivate() = (3171, GetStringFunc("tcGeneratedTypesShouldBeInternalOrPrivate",",,,") ) /// A property's getter and setter must have the same type. Property '%s' has getter of type '%s' but setter of type '%s'. - /// (Originally from ..\FSComp.txt:1297) + /// (Originally from ..\FSComp.txt:1296) static member chkGetterAndSetterHaveSamePropertyType(a0 : System.String, a1 : System.String, a2 : System.String) = (3172, GetStringFunc("chkGetterAndSetterHaveSamePropertyType",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// Array method '%s' is supplied by the runtime and cannot be directly used in code. For operations with array elements consider using family of GetArray/SetArray functions from LanguagePrimitives.IntrinsicFunctions module. - /// (Originally from ..\FSComp.txt:1298) + /// (Originally from ..\FSComp.txt:1297) static member tcRuntimeSuppliedMethodCannotBeUsedInUserCode(a0 : System.String) = (3173, GetStringFunc("tcRuntimeSuppliedMethodCannotBeUsedInUserCode",",,,%s,,,") a0) /// The union case '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1299) + /// (Originally from ..\FSComp.txt:1298) static member tcUnionCaseConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcUnionCaseConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// The exception '%s' does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1300) + /// (Originally from ..\FSComp.txt:1299) static member tcExceptionConstructorDoesNotHaveFieldWithGivenName(a0 : System.String, a1 : System.String) = (3174, GetStringFunc("tcExceptionConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,%s,,,") a0 a1) /// Active patterns do not have fields. This syntax is invalid. - /// (Originally from ..\FSComp.txt:1301) + /// (Originally from ..\FSComp.txt:1300) static member tcActivePatternsDoNotHaveFields() = (3174, GetStringFunc("tcActivePatternsDoNotHaveFields",",,,") ) /// The constructor does not have a field named '%s'. - /// (Originally from ..\FSComp.txt:1302) + /// (Originally from ..\FSComp.txt:1301) static member tcConstructorDoesNotHaveFieldWithGivenName(a0 : System.String) = (3174, GetStringFunc("tcConstructorDoesNotHaveFieldWithGivenName",",,,%s,,,") a0) /// Union case/exception field '%s' cannot be used more than once. - /// (Originally from ..\FSComp.txt:1303) + /// (Originally from ..\FSComp.txt:1302) static member tcUnionCaseFieldCannotBeUsedMoreThanOnce(a0 : System.String) = (3175, GetStringFunc("tcUnionCaseFieldCannotBeUsedMoreThanOnce",",,,%s,,,") a0) /// Named field '%s' is used more than once. - /// (Originally from ..\FSComp.txt:1304) + /// (Originally from ..\FSComp.txt:1303) static member tcFieldNameIsUsedModeThanOnce(a0 : System.String) = (3176, GetStringFunc("tcFieldNameIsUsedModeThanOnce",",,,%s,,,") a0) /// Named field '%s' conflicts with autogenerated name for anonymous field. - /// (Originally from ..\FSComp.txt:1305) + /// (Originally from ..\FSComp.txt:1304) static member tcFieldNameConflictsWithGeneratedNameForAnonymousField(a0 : System.String) = (3176, GetStringFunc("tcFieldNameConflictsWithGeneratedNameForAnonymousField",",,,%s,,,") a0) /// This literal expression or attribute argument results in an arithmetic overflow. - /// (Originally from ..\FSComp.txt:1306) + /// (Originally from ..\FSComp.txt:1305) static member tastConstantExpressionOverflow() = (3177, GetStringFunc("tastConstantExpressionOverflow",",,,") ) /// This is not valid literal expression. The [] attribute will be ignored. - /// (Originally from ..\FSComp.txt:1307) + /// (Originally from ..\FSComp.txt:1306) static member tcIllegalStructTypeForConstantExpression() = (3178, GetStringFunc("tcIllegalStructTypeForConstantExpression",",,,") ) /// System.Runtime.InteropServices assembly is required to use UnknownWrapper\DispatchWrapper classes. - /// (Originally from ..\FSComp.txt:1308) + /// (Originally from ..\FSComp.txt:1307) static member fscSystemRuntimeInteropServicesIsRequired() = (3179, GetStringFunc("fscSystemRuntimeInteropServicesIsRequired",",,,") ) /// The mutable local '%s' is implicitly allocated as a reference cell because it has been captured by a closure. This warning is for informational purposes only to indicate where implicit allocations are performed. - /// (Originally from ..\FSComp.txt:1309) + /// (Originally from ..\FSComp.txt:1308) static member abImplicitHeapAllocation(a0 : System.String) = (3180, GetStringFunc("abImplicitHeapAllocation",",,,%s,,,") a0) /// A type provider implemented GetStaticParametersForMethod, but ApplyStaticArgumentsForMethod was not implemented or invalid - /// (Originally from ..\FSComp.txt:1310) + /// (Originally from ..\FSComp.txt:1309) static member estApplyStaticArgumentsForMethodNotImplemented() = (GetStringFunc("estApplyStaticArgumentsForMethodNotImplemented",",,,") ) /// An error occured applying the static arguments to a provided method - /// (Originally from ..\FSComp.txt:1311) + /// (Originally from ..\FSComp.txt:1310) static member etErrorApplyingStaticArgumentsToMethod() = (3181, GetStringFunc("etErrorApplyingStaticArgumentsToMethod",",,,") ) /// Unexpected character '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1312) + /// (Originally from ..\FSComp.txt:1311) static member pplexUnexpectedChar(a0 : System.String) = (3182, GetStringFunc("pplexUnexpectedChar",",,,%s,,,") a0) /// Unexpected token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1313) + /// (Originally from ..\FSComp.txt:1312) static member ppparsUnexpectedToken(a0 : System.String) = (3183, GetStringFunc("ppparsUnexpectedToken",",,,%s,,,") a0) /// Incomplete preprocessor expression - /// (Originally from ..\FSComp.txt:1314) + /// (Originally from ..\FSComp.txt:1313) static member ppparsIncompleteExpression() = (3184, GetStringFunc("ppparsIncompleteExpression",",,,") ) /// Missing token '%s' in preprocessor expression - /// (Originally from ..\FSComp.txt:1315) + /// (Originally from ..\FSComp.txt:1314) static member ppparsMissingToken(a0 : System.String) = (3185, GetStringFunc("ppparsMissingToken",",,,%s,,,") a0) /// An error occurred while reading the F# metadata node at position %d in table '%s' of assembly '%s'. The node had no matching declaration. Please report this warning. You may need to recompile the F# assembly you are using. - /// (Originally from ..\FSComp.txt:1316) + /// (Originally from ..\FSComp.txt:1315) static member pickleMissingDefinition(a0 : System.Int32, a1 : System.String, a2 : System.String) = (3186, GetStringFunc("pickleMissingDefinition",",,,%d,,,%s,,,%s,,,") a0 a1 a2) /// Type inference caused the type variable %s to escape its scope. Consider adding an explicit type parameter declaration or adjusting your code to be less generic. - /// (Originally from ..\FSComp.txt:1317) + /// (Originally from ..\FSComp.txt:1316) static member checkNotSufficientlyGenericBecauseOfScope(a0 : System.String) = (3187, GetStringFunc("checkNotSufficientlyGenericBecauseOfScope",",,,%s,,,") a0) /// Type inference caused an inference type variable to escape its scope. Consider adding type annotations to make your code less generic. - /// (Originally from ..\FSComp.txt:1318) + /// (Originally from ..\FSComp.txt:1317) static member checkNotSufficientlyGenericBecauseOfScopeAnon() = (3188, GetStringFunc("checkNotSufficientlyGenericBecauseOfScopeAnon",",,,") ) /// Redundant arguments are being ignored in function '%s'. Expected %d but got %d arguments. - /// (Originally from ..\FSComp.txt:1319) + /// (Originally from ..\FSComp.txt:1318) static member checkRaiseFamilyFunctionArgumentCount(a0 : System.String, a1 : System.Int32, a2 : System.Int32) = (3189, GetStringFunc("checkRaiseFamilyFunctionArgumentCount",",,,%s,,,%d,,,%d,,,") a0 a1 a2) /// Lowercase literal '%s' is being shadowed by a new pattern with the same name. Only uppercase and module-prefixed literals can be used as named patterns. - /// (Originally from ..\FSComp.txt:1320) + /// (Originally from ..\FSComp.txt:1319) static member checkLowercaseLiteralBindingInPattern(a0 : System.String) = (3190, GetStringFunc("checkLowercaseLiteralBindingInPattern",",,,%s,,,") a0) /// This literal pattern does not take arguments - /// (Originally from ..\FSComp.txt:1321) + /// (Originally from ..\FSComp.txt:1320) static member tcLiteralDoesNotTakeArguments() = (3191, GetStringFunc("tcLiteralDoesNotTakeArguments",",,,") ) /// Constructors are not permitted as extension members - they must be defined as part of the original definition of the type - /// (Originally from ..\FSComp.txt:1322) + /// (Originally from ..\FSComp.txt:1321) static member tcConstructorsIllegalInAugmentation() = (3192, GetStringFunc("tcConstructorsIllegalInAugmentation",",,,") ) /// Invalid response file '%s' ( '%s' ) - /// (Originally from ..\FSComp.txt:1323) + /// (Originally from ..\FSComp.txt:1322) static member optsInvalidResponseFile(a0 : System.String, a1 : System.String) = (3193, GetStringFunc("optsInvalidResponseFile",",,,%s,,,%s,,,") a0 a1) /// Response file '%s' not found in '%s' - /// (Originally from ..\FSComp.txt:1324) + /// (Originally from ..\FSComp.txt:1323) static member optsResponseFileNotFound(a0 : System.String, a1 : System.String) = (3194, GetStringFunc("optsResponseFileNotFound",",,,%s,,,%s,,,") a0 a1) /// Response file name '%s' is empty, contains invalid characters, has a drive specification without an absolute path, or is too long - /// (Originally from ..\FSComp.txt:1325) + /// (Originally from ..\FSComp.txt:1324) static member optsResponseFileNameInvalid(a0 : System.String) = (3195, GetStringFunc("optsResponseFileNameInvalid",",,,%s,,,") a0) /// Cannot find FSharp.Core.dll in compiler's directory - /// (Originally from ..\FSComp.txt:1326) + /// (Originally from ..\FSComp.txt:1325) static member fsharpCoreNotFoundToBeCopied() = (3196, GetStringFunc("fsharpCoreNotFoundToBeCopied",",,,") ) /// One tuple type is a struct tuple, the other is a reference tuple - /// (Originally from ..\FSComp.txt:1327) + /// (Originally from ..\FSComp.txt:1326) static member tcTupleStructMismatch() = (GetStringFunc("tcTupleStructMismatch",",,,") ) /// This provided method requires static parameters - /// (Originally from ..\FSComp.txt:1328) + /// (Originally from ..\FSComp.txt:1327) static member etMissingStaticArgumentsToMethod() = (3197, GetStringFunc("etMissingStaticArgumentsToMethod",",,,") ) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using 'upcast' instead of 'downcast'. - /// (Originally from ..\FSComp.txt:1329) + /// (Originally from ..\FSComp.txt:1328) static member considerUpcast(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcast",",,,%s,,,%s,,,") a0 a1) /// The conversion from %s to %s is a compile-time safe upcast, not a downcast. Consider using the :> (upcast) operator instead of the :?> (downcast) operator. - /// (Originally from ..\FSComp.txt:1330) + /// (Originally from ..\FSComp.txt:1329) static member considerUpcastOperator(a0 : System.String, a1 : System.String) = (3198, GetStringFunc("considerUpcastOperator",",,,%s,,,%s,,,") a0 a1) /// The 'rec' on this module is implied by an outer 'rec' declaration and is being ignored - /// (Originally from ..\FSComp.txt:1331) + /// (Originally from ..\FSComp.txt:1330) static member tcRecImplied() = (3199, GetStringFunc("tcRecImplied",",,,") ) /// In a recursive declaration group, 'open' declarations must come first in each module - /// (Originally from ..\FSComp.txt:1332) + /// (Originally from ..\FSComp.txt:1331) static member tcOpenFirstInMutRec() = (3200, GetStringFunc("tcOpenFirstInMutRec",",,,") ) /// In a recursive declaration group, module abbreviations must come after all 'open' declarations and before other declarations - /// (Originally from ..\FSComp.txt:1333) + /// (Originally from ..\FSComp.txt:1332) static member tcModuleAbbrevFirstInMutRec() = (3201, GetStringFunc("tcModuleAbbrevFirstInMutRec",",,,") ) /// This declaration is not supported in recursive declaration groups - /// (Originally from ..\FSComp.txt:1334) + /// (Originally from ..\FSComp.txt:1333) static member tcUnsupportedMutRecDecl() = (3202, GetStringFunc("tcUnsupportedMutRecDecl",",,,") ) /// Invalid use of 'rec' keyword - /// (Originally from ..\FSComp.txt:1335) + /// (Originally from ..\FSComp.txt:1334) static member parsInvalidUseOfRec() = (3203, GetStringFunc("parsInvalidUseOfRec",",,,") ) /// If a union type has more than one case and is a struct, then all fields within the union type must be given unique names. - /// (Originally from ..\FSComp.txt:1336) + /// (Originally from ..\FSComp.txt:1335) static member tcStructUnionMultiCaseDistinctFields() = (3204, GetStringFunc("tcStructUnionMultiCaseDistinctFields",",,,") ) /// The CallerMemberNameAttribute applied to parameter '%s' will have no effect. It is overridden by the CallerFilePathAttribute. - /// (Originally from ..\FSComp.txt:1337) + /// (Originally from ..\FSComp.txt:1336) static member CallerMemberNameIsOverriden(a0 : System.String) = (3206, GetStringFunc("CallerMemberNameIsOverriden",",,,%s,,,") a0) /// Invalid use of 'fixed'. 'fixed' may only be used in a declaration of the form 'use x = fixed expr' where the expression is an array, the address of a field, the address of an array element or a string' - /// (Originally from ..\FSComp.txt:1338) + /// (Originally from ..\FSComp.txt:1337) static member tcFixedNotAllowed() = (3207, GetStringFunc("tcFixedNotAllowed",",,,") ) /// Could not find method System.Runtime.CompilerServices.OffsetToStringData in references when building 'fixed' expression. - /// (Originally from ..\FSComp.txt:1339) + /// (Originally from ..\FSComp.txt:1338) static member tcCouldNotFindOffsetToStringData() = (3208, GetStringFunc("tcCouldNotFindOffsetToStringData",",,,") ) /// The address of the variable '%s' or a related expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1340) + /// (Originally from ..\FSComp.txt:1339) static member chkNoByrefAddressOfLocal(a0 : System.String) = (3209, GetStringFunc("chkNoByrefAddressOfLocal",",,,%s,,,") a0) /// %s is an active pattern and cannot be treated as a discriminated union case with named fields. - /// (Originally from ..\FSComp.txt:1341) + /// (Originally from ..\FSComp.txt:1340) static member tcNamedActivePattern(a0 : System.String) = (3210, GetStringFunc("tcNamedActivePattern",",,,%s,,,") a0) /// The default value does not have the same type as the argument. The DefaultParameterValue attribute and any Optional attribute will be ignored. Note: 'null' needs to be annotated with the correct type, e.g. 'DefaultParameterValue(null:obj)'. - /// (Originally from ..\FSComp.txt:1342) + /// (Originally from ..\FSComp.txt:1341) static member DefaultParameterValueNotAppropriateForArgument() = (3211, GetStringFunc("DefaultParameterValueNotAppropriateForArgument",",,,") ) /// The system type '%s' was required but no referenced system DLL contained this type - /// (Originally from ..\FSComp.txt:1343) + /// (Originally from ..\FSComp.txt:1342) static member tcGlobalsSystemTypeNotFound(a0 : System.String) = (GetStringFunc("tcGlobalsSystemTypeNotFound",",,,%s,,,") a0) /// The member '%s' matches multiple overloads of the same method.\nPlease restrict it to one of the following:%s. - /// (Originally from ..\FSComp.txt:1344) + /// (Originally from ..\FSComp.txt:1343) static member typrelMemberHasMultiplePossibleDispatchSlots(a0 : System.String, a1 : System.String) = (3213, GetStringFunc("typrelMemberHasMultiplePossibleDispatchSlots",",,,%s,,,%s,,,") a0 a1) /// Method or object constructor '%s' is not static - /// (Originally from ..\FSComp.txt:1345) + /// (Originally from ..\FSComp.txt:1344) static member methodIsNotStatic(a0 : System.String) = (3214, GetStringFunc("methodIsNotStatic",",,,%s,,,") a0) /// Unexpected symbol '=' in expression. Did you intend to use 'for x in y .. z do' instead? - /// (Originally from ..\FSComp.txt:1346) + /// (Originally from ..\FSComp.txt:1345) static member parsUnexpectedSymbolEqualsInsteadOfIn() = (3215, GetStringFunc("parsUnexpectedSymbolEqualsInsteadOfIn",",,,") ) /// Two anonymous record types are from different assemblies '%s' and '%s' - /// (Originally from ..\FSComp.txt:1347) + /// (Originally from ..\FSComp.txt:1346) static member tcAnonRecdCcuMismatch(a0 : System.String, a1 : System.String) = (GetStringFunc("tcAnonRecdCcuMismatch",",,,%s,,,%s,,,") a0 a1) /// Two anonymous record types have mismatched sets of field names '%s' and '%s' - /// (Originally from ..\FSComp.txt:1348) + /// (Originally from ..\FSComp.txt:1347) static member tcAnonRecdFieldNameMismatch(a0 : System.String, a1 : System.String) = (GetStringFunc("tcAnonRecdFieldNameMismatch",",,,%s,,,%s,,,") a0 a1) /// Indicates a method that either has no implementation in the type in which it is declared or that is virtual and has a default implementation. - /// (Originally from ..\FSComp.txt:1349) + /// (Originally from ..\FSComp.txt:1348) static member keywordDescriptionAbstract() = (GetStringFunc("keywordDescriptionAbstract",",,,") ) /// Used in mutually recursive bindings, in property declarations, and with multiple constraints on generic parameters. - /// (Originally from ..\FSComp.txt:1350) + /// (Originally from ..\FSComp.txt:1349) static member keyworkDescriptionAnd() = (GetStringFunc("keyworkDescriptionAnd",",,,") ) /// Used to give the current class object an object name. Also used to give a name to a whole pattern within a pattern match. - /// (Originally from ..\FSComp.txt:1351) + /// (Originally from ..\FSComp.txt:1350) static member keywordDescriptionAs() = (GetStringFunc("keywordDescriptionAs",",,,") ) /// Used to verify code during debugging. - /// (Originally from ..\FSComp.txt:1352) + /// (Originally from ..\FSComp.txt:1351) static member keywordDescriptionAssert() = (GetStringFunc("keywordDescriptionAssert",",,,") ) /// Used as the name of the base class object. - /// (Originally from ..\FSComp.txt:1353) + /// (Originally from ..\FSComp.txt:1352) static member keywordDescriptionBase() = (GetStringFunc("keywordDescriptionBase",",,,") ) /// In verbose syntax, indicates the start of a code block. - /// (Originally from ..\FSComp.txt:1354) + /// (Originally from ..\FSComp.txt:1353) static member keywordDescriptionBegin() = (GetStringFunc("keywordDescriptionBegin",",,,") ) /// In verbose syntax, indicates the start of a class definition. - /// (Originally from ..\FSComp.txt:1355) + /// (Originally from ..\FSComp.txt:1354) static member keywordDescriptionClass() = (GetStringFunc("keywordDescriptionClass",",,,") ) /// Indicates an implementation of an abstract method; used together with an abstract method declaration to create a virtual method. - /// (Originally from ..\FSComp.txt:1356) + /// (Originally from ..\FSComp.txt:1355) static member keywordDescriptionDefault() = (GetStringFunc("keywordDescriptionDefault",",,,") ) /// Used to declare a delegate. - /// (Originally from ..\FSComp.txt:1357) + /// (Originally from ..\FSComp.txt:1356) static member keywordDescriptionDelegate() = (GetStringFunc("keywordDescriptionDelegate",",,,") ) /// Used in looping constructs or to execute imperative code. - /// (Originally from ..\FSComp.txt:1358) + /// (Originally from ..\FSComp.txt:1357) static member keywordDescriptionDo() = (GetStringFunc("keywordDescriptionDo",",,,") ) /// In verbose syntax, indicates the end of a block of code in a looping expression. - /// (Originally from ..\FSComp.txt:1359) + /// (Originally from ..\FSComp.txt:1358) static member keywordDescriptionDone() = (GetStringFunc("keywordDescriptionDone",",,,") ) /// Used to convert to a type that is lower in the inheritance chain. - /// (Originally from ..\FSComp.txt:1360) + /// (Originally from ..\FSComp.txt:1359) static member keywordDescriptionDowncast() = (GetStringFunc("keywordDescriptionDowncast",",,,") ) /// In a for expression, used when counting in reverse. - /// (Originally from ..\FSComp.txt:1361) + /// (Originally from ..\FSComp.txt:1360) static member keywordDescriptionDownto() = (GetStringFunc("keywordDescriptionDownto",",,,") ) /// Used in conditional branching. A short form of else if. - /// (Originally from ..\FSComp.txt:1362) + /// (Originally from ..\FSComp.txt:1361) static member keywordDescriptionElif() = (GetStringFunc("keywordDescriptionElif",",,,") ) /// Used in conditional branching. - /// (Originally from ..\FSComp.txt:1363) + /// (Originally from ..\FSComp.txt:1362) static member keywordDescriptionElse() = (GetStringFunc("keywordDescriptionElse",",,,") ) /// In type definitions and type extensions, indicates the end of a section of member definitions. In verbose syntax, used to specify the end of a code block that starts with the begin keyword. - /// (Originally from ..\FSComp.txt:1364) + /// (Originally from ..\FSComp.txt:1363) static member keywordDescriptionEnd() = (GetStringFunc("keywordDescriptionEnd",",,,") ) /// Used to declare an exception type. - /// (Originally from ..\FSComp.txt:1365) + /// (Originally from ..\FSComp.txt:1364) static member keywordDescriptionException() = (GetStringFunc("keywordDescriptionException",",,,") ) /// Indicates that a declared program element is defined in another binary or assembly. - /// (Originally from ..\FSComp.txt:1366) + /// (Originally from ..\FSComp.txt:1365) static member keywordDescriptionExtern() = (GetStringFunc("keywordDescriptionExtern",",,,") ) /// Used as a Boolean literal. - /// (Originally from ..\FSComp.txt:1367) + /// (Originally from ..\FSComp.txt:1366) static member keywordDescriptionTrueFalse() = (GetStringFunc("keywordDescriptionTrueFalse",",,,") ) /// Used together with try to introduce a block of code that executes regardless of whether an exception occurs. - /// (Originally from ..\FSComp.txt:1368) + /// (Originally from ..\FSComp.txt:1367) static member keywordDescriptionFinally() = (GetStringFunc("keywordDescriptionFinally",",,,") ) /// Used in looping constructs. - /// (Originally from ..\FSComp.txt:1369) + /// (Originally from ..\FSComp.txt:1368) static member keywordDescriptionFor() = (GetStringFunc("keywordDescriptionFor",",,,") ) /// Used in lambda expressions, also known as anonymous functions. - /// (Originally from ..\FSComp.txt:1370) + /// (Originally from ..\FSComp.txt:1369) static member keywordDescriptionFun() = (GetStringFunc("keywordDescriptionFun",",,,") ) /// Used as a shorter alternative to the fun keyword and a match expression in a lambda expression that has pattern matching on a single argument. - /// (Originally from ..\FSComp.txt:1371) + /// (Originally from ..\FSComp.txt:1370) static member keywordDescriptionFunction() = (GetStringFunc("keywordDescriptionFunction",",,,") ) /// Used to reference the top-level .NET namespace. - /// (Originally from ..\FSComp.txt:1372) + /// (Originally from ..\FSComp.txt:1371) static member keywordDescriptionGlobal() = (GetStringFunc("keywordDescriptionGlobal",",,,") ) /// Used in conditional branching constructs. - /// (Originally from ..\FSComp.txt:1373) + /// (Originally from ..\FSComp.txt:1372) static member keywordDescriptionIf() = (GetStringFunc("keywordDescriptionIf",",,,") ) /// Used for sequence expressions and, in verbose syntax, to separate expressions from bindings. - /// (Originally from ..\FSComp.txt:1374) + /// (Originally from ..\FSComp.txt:1373) static member keywordDescriptionIn() = (GetStringFunc("keywordDescriptionIn",",,,") ) /// Used to specify a base class or base interface. - /// (Originally from ..\FSComp.txt:1375) + /// (Originally from ..\FSComp.txt:1374) static member keywordDescriptionInherit() = (GetStringFunc("keywordDescriptionInherit",",,,") ) /// Used to indicate a function that should be integrated directly into the caller's code. - /// (Originally from ..\FSComp.txt:1376) + /// (Originally from ..\FSComp.txt:1375) static member keywordDescriptionInline() = (GetStringFunc("keywordDescriptionInline",",,,") ) /// Used to declare and implement interfaces. - /// (Originally from ..\FSComp.txt:1377) + /// (Originally from ..\FSComp.txt:1376) static member keywordDescriptionInterface() = (GetStringFunc("keywordDescriptionInterface",",,,") ) /// Used to specify that a member is visible inside an assembly but not outside it. - /// (Originally from ..\FSComp.txt:1378) + /// (Originally from ..\FSComp.txt:1377) static member keywordDescriptionInternal() = (GetStringFunc("keywordDescriptionInternal",",,,") ) /// Used to specify a computation that is to be performed only when a result is needed. - /// (Originally from ..\FSComp.txt:1379) + /// (Originally from ..\FSComp.txt:1378) static member keywordDescriptionLazy() = (GetStringFunc("keywordDescriptionLazy",",,,") ) /// Used to associate, or bind, a name to a value or function. - /// (Originally from ..\FSComp.txt:1380) + /// (Originally from ..\FSComp.txt:1379) static member keywordDescriptionLet() = (GetStringFunc("keywordDescriptionLet",",,,") ) /// Used in computation expressions to bind a name to the result of another computation expression. - /// (Originally from ..\FSComp.txt:1381) + /// (Originally from ..\FSComp.txt:1380) static member keywordDescriptionLetBang() = (GetStringFunc("keywordDescriptionLetBang",",,,") ) /// Used to branch by comparing a value to a pattern. - /// (Originally from ..\FSComp.txt:1382) + /// (Originally from ..\FSComp.txt:1381) static member keywordDescriptionMatch() = (GetStringFunc("keywordDescriptionMatch",",,,") ) /// Used in computation expressions to pattern match directly over the result of another computation expression. - /// (Originally from ..\FSComp.txt:1383) + /// (Originally from ..\FSComp.txt:1382) static member keywordDescriptionMatchBang() = (GetStringFunc("keywordDescriptionMatchBang",",,,") ) /// Used to declare a property or method in an object type. - /// (Originally from ..\FSComp.txt:1384) + /// (Originally from ..\FSComp.txt:1383) static member keywordDescriptionMember() = (GetStringFunc("keywordDescriptionMember",",,,") ) /// Used to associate a name with a group of related types, values, and functions, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1385) + /// (Originally from ..\FSComp.txt:1384) static member keywordDescriptionModule() = (GetStringFunc("keywordDescriptionModule",",,,") ) /// Used to declare a variable, that is, a value that can be changed. - /// (Originally from ..\FSComp.txt:1386) + /// (Originally from ..\FSComp.txt:1385) static member keywordDescriptionMutable() = (GetStringFunc("keywordDescriptionMutable",",,,") ) /// Used to associate a name with a group of related types and modules, to logically separate it from other code. - /// (Originally from ..\FSComp.txt:1387) + /// (Originally from ..\FSComp.txt:1386) static member keywordDescriptionNamespace() = (GetStringFunc("keywordDescriptionNamespace",",,,") ) /// Used to declare, define, or invoke a constructor that creates or that can create an object. Also used in generic parameter constraints to indicate that a type must have a certain constructor. - /// (Originally from ..\FSComp.txt:1388) + /// (Originally from ..\FSComp.txt:1387) static member keywordDescriptionNew() = (GetStringFunc("keywordDescriptionNew",",,,") ) /// Not actually a keyword. However, not struct in combination is used as a generic parameter constraint. - /// (Originally from ..\FSComp.txt:1389) + /// (Originally from ..\FSComp.txt:1388) static member keywordDescriptionNot() = (GetStringFunc("keywordDescriptionNot",",,,") ) /// Indicates the absence of an object. Also used in generic parameter constraints. - /// (Originally from ..\FSComp.txt:1390) + /// (Originally from ..\FSComp.txt:1389) static member keywordDescriptionNull() = (GetStringFunc("keywordDescriptionNull",",,,") ) /// Used in discriminated unions to indicate the type of categories of values, and in delegate and exception declarations. - /// (Originally from ..\FSComp.txt:1391) + /// (Originally from ..\FSComp.txt:1390) static member keywordDescriptionOf() = (GetStringFunc("keywordDescriptionOf",",,,") ) /// Used to make the contents of a namespace or module available without qualification. - /// (Originally from ..\FSComp.txt:1392) + /// (Originally from ..\FSComp.txt:1391) static member keywordDescriptionOpen() = (GetStringFunc("keywordDescriptionOpen",",,,") ) /// Used with Boolean conditions as a Boolean or operator. Equivalent to ||. Also used in member constraints. - /// (Originally from ..\FSComp.txt:1393) + /// (Originally from ..\FSComp.txt:1392) static member keywordDescriptionOr() = (GetStringFunc("keywordDescriptionOr",",,,") ) /// Used to implement a version of an abstract or virtual method that differs from the base version. - /// (Originally from ..\FSComp.txt:1394) + /// (Originally from ..\FSComp.txt:1393) static member keywordDescriptionOverride() = (GetStringFunc("keywordDescriptionOverride",",,,") ) /// Restricts access to a member to code in the same type or module. - /// (Originally from ..\FSComp.txt:1395) + /// (Originally from ..\FSComp.txt:1394) static member keywordDescriptionPrivate() = (GetStringFunc("keywordDescriptionPrivate",",,,") ) /// Allows access to a member from outside the type. - /// (Originally from ..\FSComp.txt:1396) + /// (Originally from ..\FSComp.txt:1395) static member keywordDescriptionPublic() = (GetStringFunc("keywordDescriptionPublic",",,,") ) /// Used to indicate that a function is recursive. - /// (Originally from ..\FSComp.txt:1397) + /// (Originally from ..\FSComp.txt:1396) static member keywordDescriptionRec() = (GetStringFunc("keywordDescriptionRec",",,,") ) /// Used to provide a value for the result of the containing computation expression. - /// (Originally from ..\FSComp.txt:1398) + /// (Originally from ..\FSComp.txt:1397) static member keywordDescriptionReturn() = (GetStringFunc("keywordDescriptionReturn",",,,") ) /// Used to provide a value for the result of the containing computation expression, where that value itself comes from the result another computation expression. - /// (Originally from ..\FSComp.txt:1399) + /// (Originally from ..\FSComp.txt:1398) static member keywordDescriptionReturnBang() = (GetStringFunc("keywordDescriptionReturnBang",",,,") ) /// Used in query expressions to specify what fields or columns to extract. Note that this is a contextual keyword, which means that it is not actually a reserved word and it only acts like a keyword in appropriate context. - /// (Originally from ..\FSComp.txt:1400) + /// (Originally from ..\FSComp.txt:1399) static member keywordDescriptionSelect() = (GetStringFunc("keywordDescriptionSelect",",,,") ) /// Used to indicate a method or property that can be called without an instance of a type, or a value member that is shared among all instances of a type. - /// (Originally from ..\FSComp.txt:1401) + /// (Originally from ..\FSComp.txt:1400) static member keywordDescriptionStatic() = (GetStringFunc("keywordDescriptionStatic",",,,") ) /// Used to declare a structure type. Also used in generic parameter constraints. Used for OCaml compatibility in module definitions. - /// (Originally from ..\FSComp.txt:1402) + /// (Originally from ..\FSComp.txt:1401) static member keywordDescriptionStruct() = (GetStringFunc("keywordDescriptionStruct",",,,") ) /// Used in conditional expressions. Also used to perform side effects after object construction. - /// (Originally from ..\FSComp.txt:1403) + /// (Originally from ..\FSComp.txt:1402) static member keywordDescriptionThen() = (GetStringFunc("keywordDescriptionThen",",,,") ) /// Used in for loops to indicate a range. - /// (Originally from ..\FSComp.txt:1404) + /// (Originally from ..\FSComp.txt:1403) static member keywordDescriptionTo() = (GetStringFunc("keywordDescriptionTo",",,,") ) /// Used to introduce a block of code that might generate an exception. Used together with with or finally. - /// (Originally from ..\FSComp.txt:1405) + /// (Originally from ..\FSComp.txt:1404) static member keywordDescriptionTry() = (GetStringFunc("keywordDescriptionTry",",,,") ) /// Used to declare a class, record, structure, discriminated union, enumeration type, unit of measure, or type abbreviation. - /// (Originally from ..\FSComp.txt:1406) + /// (Originally from ..\FSComp.txt:1405) static member keywordDescriptionType() = (GetStringFunc("keywordDescriptionType",",,,") ) /// Used to convert to a type that is higher in the inheritance chain. - /// (Originally from ..\FSComp.txt:1407) + /// (Originally from ..\FSComp.txt:1406) static member keywordDescriptionUpcast() = (GetStringFunc("keywordDescriptionUpcast",",,,") ) /// Used instead of let for values that implement IDisposable" - /// (Originally from ..\FSComp.txt:1408) + /// (Originally from ..\FSComp.txt:1407) static member keywordDescriptionUse() = (GetStringFunc("keywordDescriptionUse",",,,") ) /// Used instead of let! in computation expressions for computation expression results that implement IDisposable. - /// (Originally from ..\FSComp.txt:1409) + /// (Originally from ..\FSComp.txt:1408) static member keywordDescriptionUseBang() = (GetStringFunc("keywordDescriptionUseBang",",,,") ) /// Used in a signature to indicate a value, or in a type to declare a member, in limited situations. - /// (Originally from ..\FSComp.txt:1410) + /// (Originally from ..\FSComp.txt:1409) static member keywordDescriptionVal() = (GetStringFunc("keywordDescriptionVal",",,,") ) /// Indicates the .NET void type. Used when interoperating with other .NET languages. - /// (Originally from ..\FSComp.txt:1411) + /// (Originally from ..\FSComp.txt:1410) static member keywordDescriptionVoid() = (GetStringFunc("keywordDescriptionVoid",",,,") ) /// Used for Boolean conditions (when guards) on pattern matches and to introduce a constraint clause for a generic type parameter. - /// (Originally from ..\FSComp.txt:1412) + /// (Originally from ..\FSComp.txt:1411) static member keywordDescriptionWhen() = (GetStringFunc("keywordDescriptionWhen",",,,") ) /// Introduces a looping construct. - /// (Originally from ..\FSComp.txt:1413) + /// (Originally from ..\FSComp.txt:1412) static member keywordDescriptionWhile() = (GetStringFunc("keywordDescriptionWhile",",,,") ) /// Used together with the match keyword in pattern matching expressions. Also used in object expressions, record copying expressions, and type extensions to introduce member definitions, and to introduce exception handlers. - /// (Originally from ..\FSComp.txt:1414) + /// (Originally from ..\FSComp.txt:1413) static member keywordDescriptionWith() = (GetStringFunc("keywordDescriptionWith",",,,") ) /// Used in a sequence expression to produce a value for a sequence. - /// (Originally from ..\FSComp.txt:1415) + /// (Originally from ..\FSComp.txt:1414) static member keywordDescriptionYield() = (GetStringFunc("keywordDescriptionYield",",,,") ) /// Used in a computation expression to append the result of a given computation expression to a collection of results for the containing computation expression. - /// (Originally from ..\FSComp.txt:1416) + /// (Originally from ..\FSComp.txt:1415) static member keywordDescriptionYieldBang() = (GetStringFunc("keywordDescriptionYieldBang",",,,") ) /// In function types, delimits arguments and return values. Yields an expression (in sequence expressions); equivalent to the yield keyword. Used in match expressions - /// (Originally from ..\FSComp.txt:1417) + /// (Originally from ..\FSComp.txt:1416) static member keywordDescriptionRightArrow() = (GetStringFunc("keywordDescriptionRightArrow",",,,") ) /// Assigns a value to a variable. - /// (Originally from ..\FSComp.txt:1418) + /// (Originally from ..\FSComp.txt:1417) static member keywordDescriptionLeftArrow() = (GetStringFunc("keywordDescriptionLeftArrow",",,,") ) /// Converts a type to type that is higher in the hierarchy. - /// (Originally from ..\FSComp.txt:1419) + /// (Originally from ..\FSComp.txt:1418) static member keywordDescriptionCast() = (GetStringFunc("keywordDescriptionCast",",,,") ) /// Converts a type to a type that is lower in the hierarchy. - /// (Originally from ..\FSComp.txt:1420) + /// (Originally from ..\FSComp.txt:1419) static member keywordDescriptionDynamicCast() = (GetStringFunc("keywordDescriptionDynamicCast",",,,") ) /// Delimits a typed code quotation. - /// (Originally from ..\FSComp.txt:1421) + /// (Originally from ..\FSComp.txt:1420) static member keywordDescriptionTypedQuotation() = (GetStringFunc("keywordDescriptionTypedQuotation",",,,") ) /// Delimits a untyped code quotation. - /// (Originally from ..\FSComp.txt:1422) + /// (Originally from ..\FSComp.txt:1421) static member keywordDescriptionUntypedQuotation() = (GetStringFunc("keywordDescriptionUntypedQuotation",",,,") ) /// %s '%s' not found in assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1423) + /// (Originally from ..\FSComp.txt:1422) static member itemNotFoundDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String) = (3216, GetStringFunc("itemNotFoundDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,") a0 a1 a2) /// %s '%s' not found in type '%s' from assembly '%s'. A possible cause may be a version incompatibility. You may need to explicitly reference the correct version of this assembly to allow all referenced components to use the correct version. - /// (Originally from ..\FSComp.txt:1424) + /// (Originally from ..\FSComp.txt:1423) static member itemNotFoundInTypeDuringDynamicCodeGen(a0 : System.String, a1 : System.String, a2 : System.String, a3 : System.String) = (3216, GetStringFunc("itemNotFoundInTypeDuringDynamicCodeGen",",,,%s,,,%s,,,%s,,,%s,,,") a0 a1 a2 a3) /// is - /// (Originally from ..\FSComp.txt:1425) + /// (Originally from ..\FSComp.txt:1424) static member descriptionWordIs() = (GetStringFunc("descriptionWordIs",",,,") ) /// This value is not a function and cannot be applied. - /// (Originally from ..\FSComp.txt:1426) + /// (Originally from ..\FSComp.txt:1425) static member notAFunction() = (GetStringFunc("notAFunction",",,,") ) /// This value is not a function and cannot be applied. Did you intend to access the indexer via %s.[index] instead? - /// (Originally from ..\FSComp.txt:1427) + /// (Originally from ..\FSComp.txt:1426) static member notAFunctionButMaybeIndexerWithName(a0 : System.String) = (GetStringFunc("notAFunctionButMaybeIndexerWithName",",,,%s,,,") a0) /// This expression is not a function and cannot be applied. Did you intend to access the indexer via expr.[index] instead? - /// (Originally from ..\FSComp.txt:1428) + /// (Originally from ..\FSComp.txt:1427) static member notAFunctionButMaybeIndexer() = (GetStringFunc("notAFunctionButMaybeIndexer",",,,") ) /// - /// (Originally from ..\FSComp.txt:1429) + /// (Originally from ..\FSComp.txt:1428) static member notAFunctionButMaybeIndexerErrorCode() = (3217, GetStringFunc("notAFunctionButMaybeIndexerErrorCode",",,,") ) /// This value is not a function and cannot be applied. Did you forget to terminate a declaration? - /// (Originally from ..\FSComp.txt:1430) + /// (Originally from ..\FSComp.txt:1429) static member notAFunctionButMaybeDeclaration() = (GetStringFunc("notAFunctionButMaybeDeclaration",",,,") ) /// The argument names in the signature '%s' and implementation '%s' do not match. The argument name from the signature file will be used. This may cause problems when debugging or profiling. - /// (Originally from ..\FSComp.txt:1431) + /// (Originally from ..\FSComp.txt:1430) static member ArgumentsInSigAndImplMismatch(a0 : System.String, a1 : System.String) = (3218, GetStringFunc("ArgumentsInSigAndImplMismatch",",,,%s,,,%s,,,") a0 a1) /// An error occurred while reading the F# metadata of assembly '%s'. A reserved construct was utilized. You may need to upgrade your F# compiler or use an earlier version of the assembly that doesn't make use of a specific construct. - /// (Originally from ..\FSComp.txt:1432) + /// (Originally from ..\FSComp.txt:1431) static member pickleUnexpectedNonZero(a0 : System.String) = (3219, GetStringFunc("pickleUnexpectedNonZero",",,,%s,,,") a0) /// This method or property is not normally used from F# code, use an explicit tuple pattern for deconstruction instead. - /// (Originally from ..\FSComp.txt:1433) + /// (Originally from ..\FSComp.txt:1432) static member tcTupleMemberNotNormallyUsed() = (3220, GetStringFunc("tcTupleMemberNotNormallyUsed",",,,") ) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield'. - /// (Originally from ..\FSComp.txt:1434) + /// (Originally from ..\FSComp.txt:1433) static member implicitlyDiscardedInSequenceExpression(a0 : System.String) = (3221, GetStringFunc("implicitlyDiscardedInSequenceExpression",",,,%s,,,") a0) /// This expression returns a value of type '%s' but is implicitly discarded. Consider using 'let' to bind the result to a name, e.g. 'let result = expression'. If you intended to use the expression as a value in the sequence then use an explicit 'yield!'. - /// (Originally from ..\FSComp.txt:1435) + /// (Originally from ..\FSComp.txt:1434) static member implicitlyDiscardedSequenceInSequenceExpression(a0 : System.String) = (3222, GetStringFunc("implicitlyDiscardedSequenceInSequenceExpression",",,,%s,,,") a0) /// The file '%s' changed on disk unexpectedly, please reload. - /// (Originally from ..\FSComp.txt:1436) + /// (Originally from ..\FSComp.txt:1435) static member ilreadFileChanged(a0 : System.String) = (3223, GetStringFunc("ilreadFileChanged",",,,%s,,,") a0) /// The byref pointer is readonly, so this write is not permitted. - /// (Originally from ..\FSComp.txt:1437) + /// (Originally from ..\FSComp.txt:1436) static member writeToReadOnlyByref() = (3224, GetStringFunc("writeToReadOnlyByref",",,,") ) /// A ReadOnly attribute has been applied to a struct type with a mutable field. - /// (Originally from ..\FSComp.txt:1438) + /// (Originally from ..\FSComp.txt:1437) static member readOnlyAttributeOnStructWithMutableField() = (3225, GetStringFunc("readOnlyAttributeOnStructWithMutableField",",,,") ) /// A byref pointer returned by a function or method is implicitly dereferenced as of F# 4.5. To acquire the return value as a pointer, use the address-of operator, e.g. '&f(x)' or '&obj.Method(arg1, arg2)'. - /// (Originally from ..\FSComp.txt:1439) + /// (Originally from ..\FSComp.txt:1438) static member tcByrefReturnImplicitlyDereferenced() = (3226, GetStringFunc("tcByrefReturnImplicitlyDereferenced",",,,") ) /// A type annotated with IsByRefLike must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1440) + /// (Originally from ..\FSComp.txt:1439) static member tcByRefLikeNotStruct() = (3227, GetStringFunc("tcByRefLikeNotStruct",",,,") ) /// The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1441) + /// (Originally from ..\FSComp.txt:1440) static member chkNoByrefAddressOfValueFromExpression() = (3228, GetStringFunc("chkNoByrefAddressOfValueFromExpression",",,,") ) - /// The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope. - /// (Originally from ..\FSComp.txt:1442) - static member chkNoReturnOfLimitedSpan() = (3229, GetStringFunc("chkNoReturnOfLimitedSpan",",,,") ) /// This value can't be assigned because the target '%s' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope. - /// (Originally from ..\FSComp.txt:1443) - static member chkNoWriteToLimitedSpan(a0 : System.String) = (3230, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0) + /// (Originally from ..\FSComp.txt:1441) + static member chkNoWriteToLimitedSpan(a0 : System.String) = (3229, GetStringFunc("chkNoWriteToLimitedSpan",",,,%s,,,") a0) /// A value defined in a module must be mutable in order to take its address, e.g. 'let mutable x = ...' - /// (Originally from ..\FSComp.txt:1444) - static member tastValueMustBeLocal() = (3231, GetStringFunc("tastValueMustBeLocal",",,,") ) + /// (Originally from ..\FSComp.txt:1442) + static member tastValueMustBeLocal() = (3230, GetStringFunc("tastValueMustBeLocal",",,,") ) /// A type annotated with IsReadOnly must also be a struct. Consider adding the [] attribute to the type. - /// (Originally from ..\FSComp.txt:1445) - static member tcIsReadOnlyNotStruct() = (3232, GetStringFunc("tcIsReadOnlyNotStruct",",,,") ) + /// (Originally from ..\FSComp.txt:1443) + static member tcIsReadOnlyNotStruct() = (3231, GetStringFunc("tcIsReadOnlyNotStruct",",,,") ) /// Struct members cannot return the address of fields of the struct by reference - /// (Originally from ..\FSComp.txt:1446) - static member chkStructsMayNotReturnAddressesOfContents() = (3233, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,") ) + /// (Originally from ..\FSComp.txt:1444) + static member chkStructsMayNotReturnAddressesOfContents() = (3232, GetStringFunc("chkStructsMayNotReturnAddressesOfContents",",,,") ) /// The function or method call cannot be used at this point, because one argument that is a byref of a non-stack-local Span or IsByRefLike type is used with another argument that is a stack-local Span or IsByRefLike type. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1447) - static member chkNoByrefLikeFunctionCall() = (3234, GetStringFunc("chkNoByrefLikeFunctionCall",",,,") ) + /// (Originally from ..\FSComp.txt:1445) + static member chkNoByrefLikeFunctionCall() = (3233, GetStringFunc("chkNoByrefLikeFunctionCall",",,,") ) /// The Span or IsByRefLike variable '%s' cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1448) - static member chkNoSpanLikeVariable(a0 : System.String) = (3235, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0) + /// (Originally from ..\FSComp.txt:1446) + static member chkNoSpanLikeVariable(a0 : System.String) = (3234, GetStringFunc("chkNoSpanLikeVariable",",,,%s,,,") a0) /// A Span or IsByRefLike value returned from the expression cannot be used at ths point. This is to ensure the address of the local value does not escape its scope. - /// (Originally from ..\FSComp.txt:1449) - static member chkNoSpanLikeValueFromExpression() = (3236, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,") ) + /// (Originally from ..\FSComp.txt:1447) + static member chkNoSpanLikeValueFromExpression() = (3235, GetStringFunc("chkNoSpanLikeValueFromExpression",",,,") ) /// Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address. + /// (Originally from ..\FSComp.txt:1448) + static member tastCantTakeAddressOfExpression() = (3236, GetStringFunc("tastCantTakeAddressOfExpression",",,,") ) + /// Cannot call the byref extension method '%s. The first parameter requires the value to be mutable or a non-readonly byref type. + /// (Originally from ..\FSComp.txt:1449) + static member tcCannotCallExtensionMethodInrefToByref(a0 : System.String) = (3237, GetStringFunc("tcCannotCallExtensionMethodInrefToByref",",,,%s,,,") a0) + /// Byref types are not allowed to have optional type extensions. /// (Originally from ..\FSComp.txt:1450) - static member tastCantTakeAddressOfExpression() = (3237, GetStringFunc("tastCantTakeAddressOfExpression",",,,") ) - /// This type does not inherit Attribute, it will not work correctly with other .NET languages. + static member tcByrefsMayNotHaveTypeExtensions() = (3238, GetStringFunc("tcByrefsMayNotHaveTypeExtensions",",,,") ) + /// Cannot partially apply the extension method '%s' because the first parameter is a byref type. /// (Originally from ..\FSComp.txt:1451) + static member tcCannotPartiallyApplyExtensionMethodForByref(a0 : System.String) = (3239, GetStringFunc("tcCannotPartiallyApplyExtensionMethodForByref",",,,%s,,,") a0) + /// This type does not inherit Attribute, it will not work correctly with other .NET languages. + /// (Originally from ..\FSComp.txt:1452) static member tcTypeDoesNotInheritAttribute() = (3242, GetStringFunc("tcTypeDoesNotInheritAttribute",",,,") ) /// Invalid anonymous record expression - /// (Originally from ..\FSComp.txt:1452) + /// (Originally from ..\FSComp.txt:1453) static member parsInvalidAnonRecdExpr() = (3243, GetStringFunc("parsInvalidAnonRecdExpr",",,,") ) /// Invalid anonymous record type - /// (Originally from ..\FSComp.txt:1453) + /// (Originally from ..\FSComp.txt:1454) static member parsInvalidAnonRecdType() = (3244, GetStringFunc("parsInvalidAnonRecdType",",,,") ) /// The input to a copy-and-update expression that creates an anonymous record must be either an anonymous record or a record - /// (Originally from ..\FSComp.txt:1454) - static member tcCopyAndUpdateNeedsRecordType() = (3245, GetStringFunc("tcCopyAndUpdateNeedsRecordType",",,,") ) - /// The dependency manager extension %s could not be loaded: %s /// (Originally from ..\FSComp.txt:1455) - static member couldNotLoadDependencyManagerExtension(a0 : System.String, a1 : System.String) = (3246, GetStringFunc("couldNotLoadDependencyManagerExtension",",,,%s,,,%s,,,") a0 a1) - /// Package manager key '%s' was not registered in %s. Currently registered: %s + static member tcCopyAndUpdateNeedsRecordType() = (3245, GetStringFunc("tcCopyAndUpdateNeedsRecordType",",,,") ) + /// The type '%s' does not support a nullness qualitification. /// (Originally from ..\FSComp.txt:1456) - static member packageManagerUnknown(a0 : System.String, a1 : System.String, a2 : System.String) = (3247, GetStringFunc("packageManagerUnknown",",,,%s,,,%s,,,%s,,,") a0 a1 a2) - /// %s - /// (Originally from ..\FSComp.txt:1457) - static member packageManagerError(a0 : System.String) = (3248, GetStringFunc("packageManagerError",",,,%s,,,") a0) + static member tcTypeDoesNotHaveAnyNull(a0 : System.String) = (3260, GetStringFunc("tcTypeDoesNotHaveAnyNull",",,,%s,,,") a0) + /// This language feature is not enabled, use /langversion:5.0 or greater to enable it + /// (Originally from ..\FSComp.txt:1461) + static member tcLangFeatureNotEnabled50() = (3265, GetStringFunc("tcLangFeatureNotEnabled50",",,,") ) + /// Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + /// (Originally from ..\FSComp.txt:1462) + static member tcDefaultStructConstructorCallNulls() = (3266, GetStringFunc("tcDefaultStructConstructorCallNulls",",,,") ) + /// Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + /// (Originally from ..\FSComp.txt:1463) + static member chkValueWithDefaultValueMustHaveDefaultValueNulls() = (3267, GetStringFunc("chkValueWithDefaultValueMustHaveDefaultValueNulls",",,,") ) + /// The constraints 'null' and 'not null' are inconsistent + /// (Originally from ..\FSComp.txt:1464) + static member csNullNotNullConstraintInconsistent() = (3268, GetStringFunc("csNullNotNullConstraintInconsistent",",,,") ) + /// The constraints 'struct' and 'null' are inconsistent + /// (Originally from ..\FSComp.txt:1465) + static member csStructNullConstraintInconsistent() = (3269, GetStringFunc("csStructNullConstraintInconsistent",",,,") ) + /// The constraints 'delegate' and 'comparison' are inconsistent + /// (Originally from ..\FSComp.txt:1466) + static member csDelegateComparisonConstraintInconsistent() = (3270, GetStringFunc("csDelegateComparisonConstraintInconsistent",",,,") ) + /// The /checknulls language feature is not enabled + /// (Originally from ..\FSComp.txt:1467) + static member tcNullnessCheckingNotEnabled() = (3271, GetStringFunc("tcNullnessCheckingNotEnabled",",,,") ) + /// The type '%s' has 'null' as a true representation value but a constraint does not permit this + /// (Originally from ..\FSComp.txt:1468) + static member csTypeHasNullAsTrueValue(a0 : System.String) = (GetStringFunc("csTypeHasNullAsTrueValue",",,,%s,,,") a0) + /// The type '%s' has 'null' as an extra value but a constraint does not permit this + /// (Originally from ..\FSComp.txt:1469) + static member csTypeHasNullAsExtraValue(a0 : System.String) = (GetStringFunc("csTypeHasNullAsExtraValue",",,,%s,,,") a0) + /// The parameter '%s' has an invalid type '%s'. This is not permitted by the rules of Common IL. + /// (Originally from ..\FSComp.txt:1470) + static member chkInvalidFunctionParameterType(a0 : System.String, a1 : System.String) = (3300, GetStringFunc("chkInvalidFunctionParameterType",",,,%s,,,%s,,,") a0 a1) + /// The function or method has an invalid return type '%s'. This is not permitted by the rules of Common IL. + /// (Originally from ..\FSComp.txt:1471) + static member chkInvalidFunctionReturnType(a0 : System.String) = (3301, GetStringFunc("chkInvalidFunctionReturnType",",,,%s,,,") a0) + /// Enable nullness declarations and checks + /// (Originally from ..\FSComp.txt:1472) + static member optsCheckNulls() = (GetStringFunc("optsCheckNulls",",,,") ) + /// Specify the language version + /// (Originally from ..\FSComp.txt:1473) + static member optsLangVersion() = (GetStringFunc("optsLangVersion",",,,") ) /// Call this method once to validate that all known resources are valid; throws if not static member RunStartupValidation() = @@ -5234,7 +5270,6 @@ type internal SR private() = ignore(GetString("optsNoInterface")) ignore(GetString("optsSig")) ignore(GetString("optsReference")) - ignore(GetString("optsCompilerTool")) ignore(GetString("optsWin32res")) ignore(GetString("optsWin32manifest")) ignore(GetString("optsNowin32manifest")) @@ -5814,7 +5849,6 @@ type internal SR private() = ignore(GetString("tcByrefReturnImplicitlyDereferenced")) ignore(GetString("tcByRefLikeNotStruct")) ignore(GetString("chkNoByrefAddressOfValueFromExpression")) - ignore(GetString("chkNoReturnOfLimitedSpan")) ignore(GetString("chkNoWriteToLimitedSpan")) ignore(GetString("tastValueMustBeLocal")) ignore(GetString("tcIsReadOnlyNotStruct")) @@ -5823,11 +5857,25 @@ type internal SR private() = ignore(GetString("chkNoSpanLikeVariable")) ignore(GetString("chkNoSpanLikeValueFromExpression")) ignore(GetString("tastCantTakeAddressOfExpression")) + ignore(GetString("tcCannotCallExtensionMethodInrefToByref")) + ignore(GetString("tcByrefsMayNotHaveTypeExtensions")) + ignore(GetString("tcCannotPartiallyApplyExtensionMethodForByref")) ignore(GetString("tcTypeDoesNotInheritAttribute")) ignore(GetString("parsInvalidAnonRecdExpr")) ignore(GetString("parsInvalidAnonRecdType")) ignore(GetString("tcCopyAndUpdateNeedsRecordType")) - ignore(GetString("couldNotLoadDependencyManagerExtension")) - ignore(GetString("packageManagerUnknown")) - ignore(GetString("packageManagerError")) + ignore(GetString("tcTypeDoesNotHaveAnyNull")) + ignore(GetString("tcLangFeatureNotEnabled50")) + ignore(GetString("tcDefaultStructConstructorCallNulls")) + ignore(GetString("chkValueWithDefaultValueMustHaveDefaultValueNulls")) + ignore(GetString("csNullNotNullConstraintInconsistent")) + ignore(GetString("csStructNullConstraintInconsistent")) + ignore(GetString("csDelegateComparisonConstraintInconsistent")) + ignore(GetString("tcNullnessCheckingNotEnabled")) + ignore(GetString("csTypeHasNullAsTrueValue")) + ignore(GetString("csTypeHasNullAsExtraValue")) + ignore(GetString("chkInvalidFunctionParameterType")) + ignore(GetString("chkInvalidFunctionReturnType")) + ignore(GetString("optsCheckNulls")) + ignore(GetString("optsLangVersion")) () diff --git a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx index a38c71bb2bc..8f130e8f0c9 100644 --- a/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx +++ b/src/buildfromsource/FSharp.Compiler.Private/FSComp.resx @@ -2613,9 +2613,6 @@ Reference an assembly (Short form: -r) - - Reference an assembly or diretory containing a design time tool (Short form: -t) - Specify a Win32 resource file (.res) @@ -4354,9 +4351,6 @@ The address of a value returned from the expression cannot be used at this point. This is to ensure the address of the local value does not escape its scope. - - The Span or IsByRefLike expression cannot be returned from this function or method, because it is composed using elements that may escape their scope. - This value can't be assigned because the target '{0}' may refer to non-stack-local memory, while the expression being assigned is assessed to potentially refer to stack-local memory. This is to help prevent pointers to stack-bound memory escaping their scope. @@ -4381,6 +4375,15 @@ Cannot take the address of the value returned from the expression. Assign the returned value to a let-bound value before taking the address. + + Cannot call the byref extension method '{0}. The first parameter requires the value to be mutable or a non-readonly byref type. + + + Byref types are not allowed to have optional type extensions. + + + Cannot partially apply the extension method '{0}' because the first parameter is a byref type. + This type does not inherit Attribute, it will not work correctly with other .NET languages. @@ -4393,13 +4396,46 @@ The input to a copy-and-update expression that creates an anonymous record must be either an anonymous record or a record - - The dependency manager extension {0} could not be loaded: {1} + + The type '{0}' does not support a nullness qualitification. + + + This language feature is not enabled, use /langversion:5.0 or greater to enable it + + + Nullness warning. The default constructor of a struct type is required but one of the fields of struct type is non-nullable. + + + Nullness warning. The 'DefaultValue' attribute is used but the type (or one of its fields if a struct) is non-nullable. + + + The constraints 'null' and 'not null' are inconsistent + + + The constraints 'struct' and 'null' are inconsistent + + + The constraints 'delegate' and 'comparison' are inconsistent + + + The /checknulls language feature is not enabled + + + The type '{0}' has 'null' as a true representation value but a constraint does not permit this + + + The type '{0}' has 'null' as an extra value but a constraint does not permit this + + + The parameter '{0}' has an invalid type '{1}'. This is not permitted by the rules of Common IL. + + + The function or method has an invalid return type '{0}'. This is not permitted by the rules of Common IL. - - Package manager key '{0}' was not registered in {1}. Currently registered: {2} + + Enable nullness declarations and checks - - {0} + + Specify the language version \ No newline at end of file diff --git a/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs b/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs index 3f1a3b3695d..1e7bc604f5f 100644 --- a/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs +++ b/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs @@ -4,7 +4,6 @@ // I'm adding these cases to make sure we do not accidentally change the behavior from version to version // Eventually, we will deprecated them - and the specs will be updated. //The type 'int' does not match the type 'unit'$ -//Type mismatch\. Expecting a. ''a -> unit' .but given a. ''a -> 'b' .The type 'int' does not match the type 'unit'$ //The result of this expression has type 'bool' and is implicitly ignored\. Consider using 'ignore' to discard this value explicitly, e\.g\. 'expr \|> ignore', or 'let' to bind the result to a name, e\.g\. 'let result = expr'.$ module E = let a = 3 in From cad00e6b422ffe5ef27a5c723fa7f4ec37bd3de4 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 19 Feb 2019 19:13:51 +0000 Subject: [PATCH 052/137] fix build --- src/fsharp/TastOps.fsi | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi index 34c946937ac..fd08baeacf2 100755 --- a/src/fsharp/TastOps.fsi +++ b/src/fsharp/TastOps.fsi @@ -564,7 +564,7 @@ val generalizeTypars : Typars -> TypeInst val generalizeTyconRef : TcGlobals -> TyconRef -> TTypes * TType -val generalizedTyconRef : TcGlobals -> TyconRef -> TType +val generalizedTyOfTyconRef : TcGlobals -> TyconRef -> TType val mkTyparToTyparRenaming : Typars -> Typars -> TyparInst * TTypes @@ -1806,8 +1806,6 @@ val mkCallBox : TcGlobals -> range -> TType -> Expr -> Expr val mkCallIsNull : TcGlobals -> range -> TType -> Expr -> Expr -val mkCallIsNotNull : TcGlobals -> range -> TType -> Expr -> Expr - val mkCallRaise : TcGlobals -> range -> TType -> Expr -> Expr val mkCallGenericComparisonWithComparerOuter : TcGlobals -> range -> TType -> Expr -> Expr -> Expr -> Expr From c6ebf6860b35547cfd7389f9fad6ec6a2285d508 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 19 Feb 2019 23:03:59 +0000 Subject: [PATCH 053/137] fix flakey test (?) --- tests/service/PerfTests.fs | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/service/PerfTests.fs b/tests/service/PerfTests.fs index 662e00c5645..7e9c9912e62 100644 --- a/tests/service/PerfTests.fs +++ b/tests/service/PerfTests.fs @@ -47,6 +47,7 @@ let ``Test request for parse and check doesn't check whole project`` () = checker.FileChecked.Add (fun x -> incr backgroundCheckCount) checker.FileParsed.Add (fun x -> incr backgroundParseCount) + checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients() let pB, tB = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic let parseResults1 = checker.ParseFile(Project1.fileNames.[5], Project1.fileSources2.[5], Project1.parsingOptions) |> Async.RunSynchronously let pC, tC = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic From a3d6676e0850f1684f67e4dcac1cbef9e5bee77f Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 19 Feb 2019 22:50:15 +0000 Subject: [PATCH 054/137] merge help text fix --- build.cmd | 8 +- src/fsharp/CompileOptions.fs | 4 +- .../CompilerOptions/fsc/help/comparer.fsx | 31 ++-- .../fsc/help/help40.437.1033.bsl | 168 ++++++++++-------- .../CompilerOptions/fsi/help/comparer.fsx | 45 +++-- .../fsi/help/help-nologo.437.1033.bsl | 67 ------- .../fsi/help/help40-nologo.437.1033.bsl | 103 ++++++----- .../fsi/help/help40.437.1033.bsl | 103 ++++++----- .../BindingExpressions/Binding/in05.fs | 1 + 9 files changed, 265 insertions(+), 265 deletions(-) delete mode 100644 tests/fsharpqa/Source/CompilerOptions/fsi/help/help-nologo.437.1033.bsl diff --git a/build.cmd b/build.cmd index 4c0c4234d9f..abbc0fd1e40 100644 --- a/build.cmd +++ b/build.cmd @@ -789,8 +789,12 @@ if not exist "%link_exe%" ( if /I not "%single_threaded%" == "true" (set PARALLEL_ARG=-procs:%NUMBER_OF_PROCESSORS%) else set PARALLEL_ARG=-procs:0 set FSCBINPATH=%~dp0artifacts\bin\fsc\%BUILD_CONFIG%\net46 +set FSIANYCPUBINPATH=%~dp0artifacts\bin\fsiAnyCpu\%BUILD_CONFIG%\net46 +set FSIBINPATH=%~dp0artifacts\bin\fsi\%BUILD_CONFIG%\net46 ECHO FSCBINPATH=%FSCBINPATH% +ECHO FSIANYCPUBINPATH=%FSIANYCPUBINPATH% +ECHO FSIBINPATH=%FSIBINPATH% ECHO link_exe=%link_exe% REM ---------------- test-net40-fsharp ----------------------- @@ -886,8 +890,10 @@ if "%TEST_NET40_FSHARPQA_SUITE%" == "1" ( set CSC_PIPE=%USERPROFILE%\.nuget\packages\Microsoft.Net.Compilers\2.7.0\tools\csc.exe set FSC=!FSCBINPATH!\fsc.exe + set FSI=!FSIBINPATH!\fsi.exe + set FSIANYCPU=!FSIANYCPUBINPATH!\fsi.exe set FSCOREDLLPATH=!FSCBinPath!\FSharp.Core.dll - set PATH=!FSCBINPATH!;!PATH! + set PATH=!FSCBINPATH!;!FSIBINPATH!;!FSIANYCPUBINPATH!;!PATH! set perlexe=%USERPROFILE%\.nuget\packages\StrawberryPerl64\5.22.2.1\Tools\perl\bin\perl.exe if not exist !perlexe! (echo Error: perl was not downloaded from check the packages directory: !perlexe! && goto :failure ) diff --git a/src/fsharp/CompileOptions.fs b/src/fsharp/CompileOptions.fs index 42c9a721d6e..4ddf1dea678 100644 --- a/src/fsharp/CompileOptions.fs +++ b/src/fsharp/CompileOptions.fs @@ -102,7 +102,7 @@ let compilerOptionUsage (CompilerOption(s,tag,spec,_,_)) = | OptionGeneral _ -> if tag="" then sprintf "%s" s else sprintf "%s:%s" s tag (* still being decided *) let PrintCompilerOption (CompilerOption(_s,_tag,_spec,_,help) as compilerOption) = - let flagWidth = 30 // fixed width for printing of flags, e.g. --warnaserror: + let flagWidth = 42 // fixed width for printing of flags, e.g. --debug:{full|pdbonly|portable|embedded} let defaultLineWidth = 80 // the fallback width let lineWidth = try @@ -113,7 +113,6 @@ let PrintCompilerOption (CompilerOption(_s,_tag,_spec,_,help) as compilerOption) // flagWidth chars - for flags description or padding on continuation lines. // single space - space. // description - words upto but excluding the final character of the line. - assert(flagWidth = 30) printf "%-40s" (compilerOptionUsage compilerOption) let printWord column (word:string) = // Have printed upto column. @@ -121,7 +120,6 @@ let PrintCompilerOption (CompilerOption(_s,_tag,_spec,_,help) as compilerOption) // Returns the column printed to (suited to folding). if column + 1 (*space*) + word.Length >= lineWidth then // NOTE: "equality" ensures final character of the line is never printed printfn "" (* newline *) - assert(flagWidth = 30) printf "%-40s %s" ""(*<--flags*) word flagWidth + 1 + word.Length else diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx index eee9590f48a..9ca3060ab41 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/help/comparer.fsx @@ -3,22 +3,27 @@ open System open System.IO +let arg0 = System.Environment.GetCommandLineArgs().[0] +let path = System.Environment.GetEnvironmentVariable("PATH") let fn1 = fsi.CommandLineArgs.[1] let fn2 = fsi.CommandLineArgs.[2] -let f1 = File.ReadAllLines fn1 |> Array.toList -let f2 = File.ReadAllLines fn2 |> Array.toList +// Read file into an array +let File2List (filename:string) = System.IO.File.ReadAllLines(filename) -let mutable i = 0 -let compare (f1:string list) (f2:string list) = - (f1,f2) ||> List.forall2 (fun (a:string) (b:string) -> - let aa = System.Text.RegularExpressions.Regex.Replace(a, @"F# Compiler version .+", "F# Compiler") - let bb = System.Text.RegularExpressions.Regex.Replace(b, @"F# Compiler version .+", "F# Compiler") +let f1 = File2List fn1 +let f2 = File2List fn2 - i <- i+1 - if (aa = bb) then +let mutable i = 0 +let compare (f1:string[]) (f2:string[]) = + if f1.Length <> f2.Length then failwithf "Help text did not match. f1.Length = %d, f2.Length = %d. Check you have fsc on path, arg0 = %s, PATH=%s" f1.Length f2.Length arg0 path + (f1, f2) ||> Array.forall2 (fun (a:string) (b:string) -> + let aa = System.Text.RegularExpressions.Regex.Replace(a, @"F# Compiler version .+", "F# Compiler") + let bb = System.Text.RegularExpressions.Regex.Replace(b, @"F# Compiler version .+", "F# Compiler") + i <- i+1 + if (aa = bb) then true - else + else printfn "Files differ at line %d:" i printfn "\t>> %s" a printfn "\t<< %s" b @@ -32,9 +37,7 @@ if update then File.Copy(fn1, fn2, true) let exitCode = - if f1.Length = f2.Length then - if compare f1 f2 then 0 - else printfn "File contents differ"; 1 - else printfn "File lengths differ"; 1 + if compare f1 f2 then 0 + else printfn "File contents differ"; 1 exit exitCode diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl index abbdd587455..bb4dd86c6b4 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl @@ -3,69 +3,85 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. - OUTPUT FILES - ---out: Name of the output file (Short form: -o) +--out: Name of the output file (Short form: + -o) --target:exe Build a console executable --target:winexe Build a Windows executable --target:library Build a library (Short form: -a) ---target:module Build a module that can be added to another - assembly ---delaysign[+|-] Delay-sign the assembly using only the public - portion of the strong name key ---publicsign[+|-] Public-sign the assembly using only the public - portion of the strong name key, and mark the - assembly as signed ---doc: Write the xmldoc of the assembly to the given - file +--target:module Build a module that can be added to + another assembly +--delaysign[+|-] Delay-sign the assembly using only + the public portion of the strong + name key +--publicsign[+|-] Public-sign the assembly using only + the public portion of the strong + name key, and mark the assembly as + signed +--doc: Write the xmldoc of the assembly to + the given file --keyfile: Specify a strong name key file --keycontainer: Specify a strong name key container ---platform: Limit which platforms this code can run on: x86, - Itanium, x64, anycpu32bitpreferred, or anycpu. - The default is anycpu. ---nooptimizationdata Only include optimization information essential - for implementing inlined constructs. Inhibits - cross-module inlining but improves binary - compatibility. ---nointerfacedata Don't add a resource to the generated assembly - containing F#-specific metadata ---sig: Print the inferred interface of the assembly to - a file ---nocopyfsharpcore Don't copy FSharp.Core.dll along the produced - binaries +--platform: Limit which platforms this code can + run on: x86, Itanium, x64, + anycpu32bitpreferred, or anycpu. The + default is anycpu. +--nooptimizationdata Only include optimization + information essential for + implementing inlined constructs. + Inhibits cross-module inlining but + improves binary compatibility. +--nointerfacedata Don't add a resource to the + generated assembly containing + F#-specific metadata +--sig: Print the inferred interface of the + assembly to a file +--nocopyfsharpcore Don't copy FSharp.Core.dll along the + produced binaries - INPUT FILES - ---reference: Reference an assembly (Short form: -r) +--reference: Reference an assembly (Short form: + -r) - RESOURCES - --win32res: Specify a Win32 resource file (.res) --win32manifest: Specify a Win32 manifest file ---nowin32manifest Do not include the default Win32 manifest +--nowin32manifest Do not include the default Win32 + manifest --resource: Embed the specified managed resource ---linkresource: Link the specified resource to this assembly - where the resinfo format is [, Link the specified resource to this + assembly where the resinfo format is + [,[,public|private]] - CODE GENERATION - ---debug[+|-] Emit debug information (Short form: -g) ---debug:{full|pdbonly|portable|embedded} Specify debugging type: full, portable, - embedded, pdbonly. ('full' is the default if no - debuggging type specified and enables attaching - a debugger to a running program, 'portable' is a - cross-platform format, 'embedded' is a - cross-platform format embedded into the output - file). ---embed[+|-] Embed all source files in the portable PDB file ---embed: Embed specific source files in the portable PDB - file ---sourcelink: Source link information file to embed in the +--debug[+|-] Emit debug information (Short form: + -g) +--debug:{full|pdbonly|portable|embedded} Specify debugging type: full, + portable, embedded, pdbonly. ('full' + is the default if no debuggging type + specified and enables attaching a + debugger to a running program, + 'portable' is a cross-platform + format, 'embedded' is a + cross-platform format embedded into + the output file). +--embed[+|-] Embed all source files in the + portable PDB file +--embed: Embed specific source files in the portable PDB file ---optimize[+|-] Enable optimizations (Short form: -O) +--sourcelink: Source link information file to + embed in the portable PDB file +--optimize[+|-] Enable optimizations (Short form: + -O) --tailcalls[+|-] Enable or disable tailcalls ---deterministic[+|-] Produce a deterministic assembly (including - module version GUID and timestamp) ---crossoptimize[+|-] Enable or disable cross-module optimizations +--deterministic[+|-] Produce a deterministic assembly + (including module version GUID and + timestamp) +--crossoptimize[+|-] Enable or disable cross-module + optimizations - ERRORS AND WARNINGS - @@ -73,51 +89,61 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. --warnaserror[+|-]: Report specific warnings as errors --warn: Set a warning level (0-5) --nowarn: Disable specific warning messages ---warnon: Enable specific warnings that may be off by - default +--warnon: Enable specific warnings that may be + off by default --checknulls[+|-] Enable nullness declarations and checks --langversion: Specify the language version ---consolecolors[+|-] Output warning and error messages in color +--consolecolors[+|-] Output warning and error messages in + color - LANGUAGE - --checked[+|-] Generate overflow checks ---define: Define conditional compilation symbols (Short - form: -d) +--define: Define conditional compilation + symbols (Short form: -d) --mlcompatibility Ignore ML compatibility warnings - MISCELLANEOUS - --nologo Suppress compiler copyright message ---help Display this usage message (Short form: -?) +--help Display this usage message (Short + form: -?) --@ Read response file for more options - ADVANCED - ---codepage: Specify the codepage used to read source files +--codepage: Specify the codepage used to read + source files --utf8output Output messages in UTF-8 encoding ---preferreduilang: Specify the preferred output language culture - name (e.g. es-ES, ja-JP) ---fullpaths Output messages with fully qualified paths ---lib: Specify a directory for the include path which - is used to resolve source files and assemblies - (Short form: -I) +--preferreduilang: Specify the preferred output + language culture name (e.g. es-ES, + ja-JP) +--fullpaths Output messages with fully qualified + paths +--lib: Specify a directory for the include + path which is used to resolve source + files and assemblies (Short form: + -I) --simpleresolution Resolve assembly references using - directory-based rules rather than MSBuild - resolution ---targetprofile: Specify target framework profile of this - assembly. Valid values are mscorlib, netcore or - netstandard. Default - mscorlib ---baseaddress:
Base address for the library to be built ---noframework Do not reference the default CLI assemblies by - default ---standalone Statically link the F# library and all - referenced DLLs that depend on it into the - assembly being generated ---staticlink: Statically link the given assembly and all - referenced DLLs that depend on this assembly. - Use an assembly name e.g. mylib, not a DLL name. + directory-based rules rather than + MSBuild resolution +--targetprofile: Specify target framework profile of + this assembly. Valid values are + mscorlib, netcore or netstandard. + Default - mscorlib +--baseaddress:
Base address for the library to be + built +--noframework Do not reference the default CLI + assemblies by default +--standalone Statically link the F# library and + all referenced DLLs that depend on + it into the assembly being generated +--staticlink: Statically link the given assembly + and all referenced DLLs that depend + on this assembly. Use an assembly + name e.g. mylib, not a DLL name. --pdb: Name the output debug file --highentropyva[+|-] Enable high-entropy ASLR ---subsystemversion: Specify subsystem version of this assembly +--subsystemversion: Specify subsystem version of this + assembly --quotations-debug[+|-] Emit debug information in quotations diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/comparer.fsx b/tests/fsharpqa/Source/CompilerOptions/fsi/help/comparer.fsx index 611eb2394bd..69938a4a679 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/comparer.fsx +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/comparer.fsx @@ -2,38 +2,37 @@ open System open System.IO +let arg0 = System.Environment.GetCommandLineArgs().[0] +let path = System.Environment.GetEnvironmentVariable("PATH") let fn1 = fsi.CommandLineArgs.[1] let fn2 = fsi.CommandLineArgs.[2] // Read file into an array -let File2List (filename:string) = - use s = new System.IO.StreamReader(filename) - let mutable l = [] - while not s.EndOfStream do - l <- List.append l ( s.ReadLine() :: []) - l +let File2List (filename:string) = System.IO.File.ReadAllLines(filename) let f1 = File2List fn1 let f2 = File2List fn2 let mutable i = 0 -let compare (f1:string list) (f2:string list) = List.forall2 (fun (a:string) (b:string) -> - let aa = System.Text.RegularExpressions.Regex.Replace(a, @"F# Interactive build .+", "F# Interactive build") - let bb = System.Text.RegularExpressions.Regex.Replace(b, @"F# Interactive build .+", "F# Interactive build") - - // unify fsi.exe and FsiAnyCPU.exe - let aa = aa.Replace("FsiAnyCPU.exe", "fsi.exe") - let bb = aa.Replace("FsiAnyCPU.exe", "fsi.exe") - - i <- i+1 - if (aa = bb) then - true - else - printfn "Files differ at line %d:" i - printfn "\t>> %s" a - printfn "\t<< %s" b - false - ) f1 f2 +let compare (f1:string[]) (f2:string[]) = + if f1.Length <> f2.Length then failwithf "Help text did not match. f1.Length = %d, f2.Length = %d, Check you have right fsi on path. fsi = %s, PATH=%s" f1.Length f2.Length arg0 path + (f1, f2) ||> Array.forall2 (fun (a:string) (b:string) -> + let aa = System.Text.RegularExpressions.Regex.Replace(a, @"F# Interactive build .+", "F# Interactive build") + let bb = System.Text.RegularExpressions.Regex.Replace(b, @"F# Interactive build .+", "F# Interactive build") + + // unify fsi.exe and FsiAnyCPU.exe + let aa = aa.Replace("FsiAnyCPU.exe", "fsi.exe") + let bb = aa.Replace("FsiAnyCPU.exe", "fsi.exe") + + i <- i+1 + if (aa = bb) then + true + else + printfn "Files differ at line %d:" i + printfn "\t>> %s" a + printfn "\t<< %s" b + false + ) let update = try Environment.GetEnvironmentVariable("TEST_UPDATE_BSL") = "1" with _ -> false diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help-nologo.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help-nologo.437.1033.bsl deleted file mode 100644 index 28a991afa86..00000000000 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help-nologo.437.1033.bsl +++ /dev/null @@ -1,67 +0,0 @@ - -Usage: fsi.exe [script.fsx []] - - - - INPUT FILES - ---use: Use the given file on startup as initial input ---load: #load the given file on startup ---reference: Reference an assembly (Short form: -r) --- ... Treat remaining arguments as command line - arguments, accessed using fsi.CommandLineArgs - - - - CODE GENERATION - ---debug[+|-] Emit debug information (Short form: -g) ---debug:{full|pdbonly|portable} Specify debugging type: full, portable, pdbonly. - ('pdbonly' is the default if no debuggging type - specified and enables attaching a debugger to a - running program. 'portable' is a cross-platform - format). ---optimize[+|-] Enable optimizations (Short form: -O) ---tailcalls[+|-] Enable or disable tailcalls ---deterministic[+|-] Produce a deterministic assembly (including - module version GUID and timestamp) ---crossoptimize[+|-] Enable or disable cross-module optimizations - - - - ERRORS AND WARNINGS - ---warnaserror[+|-] Report all warnings as errors ---warnaserror[+|-]: Report specific warnings as errors ---warn: Set a warning level (0-4) ---nowarn: Disable specific warning messages - - - - LANGUAGE - ---checked[+|-] Generate overflow checks ---define: Define conditional compilation symbols (Short - form: -d) ---mlcompatibility Ignore ML compatibility warnings - - - - MISCELLANEOUS - ---nologo Suppress compiler copyright message ---help Display this usage message (Short form: -?) - - - - ADVANCED - ---codepage: Specify the codepage used to read source files ---utf8output Output messages in UTF-8 encoding ---fullpaths Output messages with fully qualified paths ---lib: Specify a directory for the include path which - is used to resolve source files and assemblies - (Short form: -I) ---simpleresolution Resolve assembly references using - directory-based rules rather than MSBuild - resolution ---targetprofile: Specify target framework profile of this - assembly. Valid values are mscorlib or netcore. - Default - mscorlib ---noframework Do not reference the default CLI assemblies by - default ---exec Exit fsi after loading the files or running the - .fsx script given on the command line ---gui[+|-] Execute interactions on a Windows Forms event - loop (on by default) ---quiet Suppress fsi writing to stdout ---readline[+|-] Support TAB completion in console (on by - default) diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl index 9f8e58c4c9f..7d9e394c024 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl @@ -3,27 +3,36 @@ Usage: fsiAnyCpu.exe [script.fsx []] - INPUT FILES - ---use: Use the given file on startup as initial input +--use: Use the given file on startup as + initial input --load: #load the given file on startup ---reference: Reference an assembly (Short form: -r) --- ... Treat remaining arguments as command line - arguments, accessed using fsi.CommandLineArgs +--reference: Reference an assembly (Short form: + -r) +-- ... Treat remaining arguments as command + line arguments, accessed using + fsi.CommandLineArgs - CODE GENERATION - ---debug[+|-] Emit debug information (Short form: -g) ---debug:{full|pdbonly|portable|embedded} Specify debugging type: full, portable, - embedded, pdbonly. ('pdbonly' is the default if - no debuggging type specified and enables - attaching a debugger to a running program, - 'portable' is a cross-platform format, - 'embedded' is a cross-platform format embedded +--debug[+|-] Emit debug information (Short form: + -g) +--debug:{full|pdbonly|portable|embedded} Specify debugging type: full, + portable, embedded, pdbonly. + ('pdbonly' is the default if no + debuggging type specified and + enables attaching a debugger to a + running program, 'portable' is a + cross-platform format, 'embedded' is + a cross-platform format embedded into the output file). ---optimize[+|-] Enable optimizations (Short form: -O) +--optimize[+|-] Enable optimizations (Short form: + -O) --tailcalls[+|-] Enable or disable tailcalls ---deterministic[+|-] Produce a deterministic assembly (including - module version GUID and timestamp) ---crossoptimize[+|-] Enable or disable cross-module optimizations +--deterministic[+|-] Produce a deterministic assembly + (including module version GUID and + timestamp) +--crossoptimize[+|-] Enable or disable cross-module + optimizations - ERRORS AND WARNINGS - @@ -31,49 +40,57 @@ Usage: fsiAnyCpu.exe [script.fsx []] --warnaserror[+|-]: Report specific warnings as errors --warn: Set a warning level (0-5) --nowarn: Disable specific warning messages ---warnon: Enable specific warnings that may be off by - default +--warnon: Enable specific warnings that may be + off by default --checknulls[+|-] Enable nullness declarations and checks --langversion: Specify the language version ---consolecolors[+|-] Output warning and error messages in color +--consolecolors[+|-] Output warning and error messages in + color - LANGUAGE - --checked[+|-] Generate overflow checks ---define: Define conditional compilation symbols (Short - form: -d) +--define: Define conditional compilation + symbols (Short form: -d) --mlcompatibility Ignore ML compatibility warnings - MISCELLANEOUS - --nologo Suppress compiler copyright message ---help Display this usage message (Short form: -?) +--help Display this usage message (Short + form: -?) - ADVANCED - ---codepage: Specify the codepage used to read source files +--codepage: Specify the codepage used to read + source files --utf8output Output messages in UTF-8 encoding ---preferreduilang: Specify the preferred output language culture - name (e.g. es-ES, ja-JP) ---fullpaths Output messages with fully qualified paths ---lib: Specify a directory for the include path which - is used to resolve source files and assemblies - (Short form: -I) +--preferreduilang: Specify the preferred output + language culture name (e.g. es-ES, + ja-JP) +--fullpaths Output messages with fully qualified + paths +--lib: Specify a directory for the include + path which is used to resolve source + files and assemblies (Short form: + -I) --simpleresolution Resolve assembly references using - directory-based rules rather than MSBuild - resolution ---targetprofile: Specify target framework profile of this - assembly. Valid values are mscorlib, netcore or - netstandard. Default - mscorlib ---noframework Do not reference the default CLI assemblies by - default ---exec Exit fsi after loading the files or running the - .fsx script given on the command line ---gui[+|-] Execute interactions on a Windows Forms event - loop (on by default) + directory-based rules rather than + MSBuild resolution +--targetprofile: Specify target framework profile of + this assembly. Valid values are + mscorlib, netcore or netstandard. + Default - mscorlib +--noframework Do not reference the default CLI + assemblies by default +--exec Exit fsi after loading the files or + running the .fsx script given on the + command line +--gui[+|-] Execute interactions on a Windows + Forms event loop (on by default) --quiet Suppress fsi writing to stdout ---readline[+|-] Support TAB completion in console (on by - default) +--readline[+|-] Support TAB completion in console + (on by default) --quotations-debug[+|-] Emit debug information in quotations ---shadowcopyreferences[+|-] Prevents references from being locked by the F# - Interactive process +--shadowcopyreferences[+|-] Prevents references from being + locked by the F# Interactive process diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl index 8ed871e1552..45dedf873fc 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl @@ -5,27 +5,36 @@ Usage: fsiAnyCpu.exe [script.fsx []] - INPUT FILES - ---use: Use the given file on startup as initial input +--use: Use the given file on startup as + initial input --load: #load the given file on startup ---reference: Reference an assembly (Short form: -r) --- ... Treat remaining arguments as command line - arguments, accessed using fsi.CommandLineArgs +--reference: Reference an assembly (Short form: + -r) +-- ... Treat remaining arguments as command + line arguments, accessed using + fsi.CommandLineArgs - CODE GENERATION - ---debug[+|-] Emit debug information (Short form: -g) ---debug:{full|pdbonly|portable|embedded} Specify debugging type: full, portable, - embedded, pdbonly. ('pdbonly' is the default if - no debuggging type specified and enables - attaching a debugger to a running program, - 'portable' is a cross-platform format, - 'embedded' is a cross-platform format embedded +--debug[+|-] Emit debug information (Short form: + -g) +--debug:{full|pdbonly|portable|embedded} Specify debugging type: full, + portable, embedded, pdbonly. + ('pdbonly' is the default if no + debuggging type specified and + enables attaching a debugger to a + running program, 'portable' is a + cross-platform format, 'embedded' is + a cross-platform format embedded into the output file). ---optimize[+|-] Enable optimizations (Short form: -O) +--optimize[+|-] Enable optimizations (Short form: + -O) --tailcalls[+|-] Enable or disable tailcalls ---deterministic[+|-] Produce a deterministic assembly (including - module version GUID and timestamp) ---crossoptimize[+|-] Enable or disable cross-module optimizations +--deterministic[+|-] Produce a deterministic assembly + (including module version GUID and + timestamp) +--crossoptimize[+|-] Enable or disable cross-module + optimizations - ERRORS AND WARNINGS - @@ -33,49 +42,57 @@ Usage: fsiAnyCpu.exe [script.fsx []] --warnaserror[+|-]: Report specific warnings as errors --warn: Set a warning level (0-5) --nowarn: Disable specific warning messages ---warnon: Enable specific warnings that may be off by - default +--warnon: Enable specific warnings that may be + off by default --checknulls[+|-] Enable nullness declarations and checks --langversion: Specify the language version ---consolecolors[+|-] Output warning and error messages in color +--consolecolors[+|-] Output warning and error messages in + color - LANGUAGE - --checked[+|-] Generate overflow checks ---define: Define conditional compilation symbols (Short - form: -d) +--define: Define conditional compilation + symbols (Short form: -d) --mlcompatibility Ignore ML compatibility warnings - MISCELLANEOUS - --nologo Suppress compiler copyright message ---help Display this usage message (Short form: -?) +--help Display this usage message (Short + form: -?) - ADVANCED - ---codepage: Specify the codepage used to read source files +--codepage: Specify the codepage used to read + source files --utf8output Output messages in UTF-8 encoding ---preferreduilang: Specify the preferred output language culture - name (e.g. es-ES, ja-JP) ---fullpaths Output messages with fully qualified paths ---lib: Specify a directory for the include path which - is used to resolve source files and assemblies - (Short form: -I) +--preferreduilang: Specify the preferred output + language culture name (e.g. es-ES, + ja-JP) +--fullpaths Output messages with fully qualified + paths +--lib: Specify a directory for the include + path which is used to resolve source + files and assemblies (Short form: + -I) --simpleresolution Resolve assembly references using - directory-based rules rather than MSBuild - resolution ---targetprofile: Specify target framework profile of this - assembly. Valid values are mscorlib, netcore or - netstandard. Default - mscorlib ---noframework Do not reference the default CLI assemblies by - default ---exec Exit fsi after loading the files or running the - .fsx script given on the command line ---gui[+|-] Execute interactions on a Windows Forms event - loop (on by default) + directory-based rules rather than + MSBuild resolution +--targetprofile: Specify target framework profile of + this assembly. Valid values are + mscorlib, netcore or netstandard. + Default - mscorlib +--noframework Do not reference the default CLI + assemblies by default +--exec Exit fsi after loading the files or + running the .fsx script given on the + command line +--gui[+|-] Execute interactions on a Windows + Forms event loop (on by default) --quiet Suppress fsi writing to stdout ---readline[+|-] Support TAB completion in console (on by - default) +--readline[+|-] Support TAB completion in console + (on by default) --quotations-debug[+|-] Emit debug information in quotations ---shadowcopyreferences[+|-] Prevents references from being locked by the F# - Interactive process +--shadowcopyreferences[+|-] Prevents references from being + locked by the F# Interactive process diff --git a/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs b/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs index 1e7bc604f5f..0c386d1676d 100644 --- a/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs +++ b/tests/fsharpqa/Source/Conformance/Expressions/BindingExpressions/Binding/in05.fs @@ -5,6 +5,7 @@ // Eventually, we will deprecated them - and the specs will be updated. //The type 'int' does not match the type 'unit'$ //The result of this expression has type 'bool' and is implicitly ignored\. Consider using 'ignore' to discard this value explicitly, e\.g\. 'expr \|> ignore', or 'let' to bind the result to a name, e\.g\. 'let result = expr'.$ + module E = let a = 3 in a + 1 |> ignore From 943486c683b1d1672dc3548c9fdd4a5018b1ba85 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 19 Feb 2019 23:41:21 +0000 Subject: [PATCH 055/137] update baselines --- build.cmd | 1 + .../AsyncExpressionSteppingTest1.il.bsl | 18 +- .../AsyncExpressionSteppingTest2.il.bsl | 64 +- .../AsyncExpressionSteppingTest3.il.bsl | 32 +- .../AsyncExpressionSteppingTest4.il.bsl | 90 +- .../AsyncExpressionSteppingTest5.il.bsl | 110 +- .../AsyncExpressionSteppingTest6.il.bsl | 224 +- .../EmittedIL/AttributeTargets/Default.il.bsl | 12 +- .../EmittedIL/AttributeTargets/Field.il.bsl | 12 +- .../AttributeTargets/Property.il.bsl | 12 +- .../CCtorDUWithMember01.il.bsl | 10 +- .../CCtorDUWithMember02.il.bsl | 4 +- .../CCtorDUWithMember03.il.bsl | 4 +- .../CCtorDUWithMember04.il.bsl | 4 +- .../CompiledNameAttribute01.il.bsl | 6 +- .../CompiledNameAttribute02.il.bsl | 4 +- .../CompiledNameAttribute03.il.bsl | 6 +- .../CompiledNameAttribute04.il.bsl | 10 +- .../ComputationExpr01.il.bsl | 24 +- .../ComputationExpr02.il.bsl | 24 +- .../ComputationExpr03.il.bsl | 90 +- .../ComputationExpr04.il.bsl | 58 +- .../ComputationExpr05.il.bsl | 50 +- .../ComputationExpr06.il.bsl | 82 +- .../ComputationExpr07.il.bsl | 74 +- ...tBoxStruct_ArrayOfArray_CSInterface.il.bsl | 6 +- ...tBoxStruct_ArrayOfArray_FSInterface.il.bsl | 16 +- ..._ArrayOfArray_FSInterface_NoExtMeth.il.bsl | 20 +- .../DoNotBoxStruct_Array_CSInterface.il.bsl | 6 +- .../DoNotBoxStruct_Array_FSInterface.il.bsl | 16 +- ...xStruct_Array_FSInterface_NoExtMeth.il.bsl | 20 +- .../DoNotBoxStruct_MDArray_CSInterface.il.bsl | 6 +- .../DoNotBoxStruct_MDArray_FSInterface.il.bsl | 16 +- ...truct_MDArray_FSInterface_NoExtMeth.il.bsl | 20 +- .../DoNotBoxStruct_NoArray_CSInterface.il.bsl | 10 +- .../DoNotBoxStruct_NoArray_FSInterface.il.bsl | 16 +- ...truct_NoArray_FSInterface_NoExtMeth.il.bsl | 20 +- .../DoNotBoxStruct_ToString.il.bsl | 6 +- .../GeneratedIterators/GenIter01.il.bsl | 78 +- .../GeneratedIterators/GenIter02.il.bsl | 78 +- .../GeneratedIterators/GenIter03.il.bsl | 78 +- .../GeneratedIterators/GenIter04.il.bsl | 84 +- .../InequalityComparison01.il.bsl | 4 +- .../InequalityComparison02.il.bsl | 4 +- .../InequalityComparison03.il.bsl | 4 +- .../InequalityComparison04.il.bsl | 4 +- .../InequalityComparison05.il.bsl | 6 +- .../ListExpressionSteppingTest1.il.bsl | 4 +- .../ListExpressionSteppingTest2.il.bsl | 4 +- .../ListExpressionSteppingTest3.il.bsl | 4 +- .../ListExpressionSteppingTest4.il.bsl | 4 +- .../ListExpressionSteppingTest5.il.bsl | 4 +- .../ListExpressionSteppingTest6.il.bsl | 4 +- .../LiteralValue/LiteralValue.il.bsl | 4 +- ...hodImplAttribute.AggressiveInlining.il.bsl | 4 +- .../MethodImplAttribute.ForwardRef.il.bsl | 4 +- .../MethodImplAttribute.InternalCall.il.bsl | 4 +- .../MethodImplAttribute.NoInlining.il.bsl | 4 +- .../MethodImplAttribute.NoOptimization.il.bsl | 4 +- .../MethodImplAttribute.PreserveSig.il.bsl | 4 +- .../MethodImplAttribute.Synchronized.il.bsl | 4 +- .../MethodImplAttribute.Unmanaged.il.bsl | 4 +- .../EmittedIL/Misc/AbstractClass.il.bsl | 4 +- .../Misc/ArgumentNamesInClosures01.il.bsl | 4 +- .../EmittedIL/Misc/CodeGenRenamings01.il.bsl | 4 +- .../CustomAttributeGenericParameter01.il.bsl | 6 +- .../CodeGen/EmittedIL/Misc/Decimal01.il.bsl | 4 +- .../EmittedIL/Misc/EntryPoint01.il.bsl | 4 +- .../EmittedIL/Misc/EqualsOnUnions01.il.bsl | 6 +- .../CodeGen/EmittedIL/Misc/ForLoop01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/ForLoop02.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/ForLoop03.il.bsl | 4 +- .../Misc/GeneralizationOnUnions01.il.bsl | 6 +- .../Misc/GenericTypeStaticField01.il.bsl | 10 +- .../EmittedIL/Misc/IfThenElse01.il.bsl | 4 +- .../EmittedIL/Misc/LetIfThenElse01.il.bsl | 6 +- .../CodeGen/EmittedIL/Misc/Lock01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/Marshal.il.bsl | 4 +- .../EmittedIL/Misc/MethodImplNoInline.il.bsl | 4 +- .../Misc/MethodImplNoInline02.il.bsl | 4 +- .../Misc/ModuleWithExpression01.il.bsl | 4 +- .../EmittedIL/Misc/NoBoxingOnDispose01.il.bsl | 10 +- .../Misc/NonEscapingArguments02.il.bsl | 8 +- .../CodeGen/EmittedIL/Misc/PreserveSig.il.bsl | 4 +- .../EmittedIL/Misc/Seq_for_all01.il.bsl | 4 +- .../CodeGen/EmittedIL/Misc/Structs01.il.bsl | 6 +- .../CodeGen/EmittedIL/Misc/Structs02.il.bsl | 10 +- .../Misc/StructsAsArrayElements01.il.bsl | 6 +- .../Misc/TryWith_NoFilterBlocks01.il.bsl | 4 +- .../Source/CodeGen/EmittedIL/Misc/cas.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation01.il.bsl | 10 +- .../EmittedIL/Mutation/Mutation02.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation03.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation04.il.bsl | 4 +- .../EmittedIL/Mutation/Mutation05.il.bsl | 4 +- .../Operators/comparison_decimal01.il.bsl | 4 +- .../Linq101Aggregates01.il.bsl | 1836 ++++++++--------- .../Linq101ElementOperators01.il.bsl | 372 ++-- .../Linq101Grouping01.il.bsl | 372 ++-- .../Linq101Joins01.il.bsl | 316 +-- .../Linq101Ordering01.il.bsl | 482 ++--- .../Linq101Partitioning01.il.bsl | 484 ++--- .../Linq101Quantifiers01.il.bsl | 374 ++-- .../Linq101Select01.il.bsl | 982 ++++----- .../Linq101SetOperators01.il.bsl | 364 ++-- .../Linq101Where01.il.bsl | 298 +-- .../SeqExpressionSteppingTest1.il.bsl | 48 +- .../SeqExpressionSteppingTest2.il.bsl | 52 +- .../SeqExpressionSteppingTest3.il.bsl | 62 +- .../SeqExpressionSteppingTest4.il.bsl | 82 +- .../SeqExpressionSteppingTest5.il.bsl | 96 +- .../SeqExpressionSteppingTest6.il.bsl | 112 +- .../SeqExpressionSteppingTest7.il.bsl | 54 +- .../SeqExpressionTailCalls01.il.bsl | 4 +- .../SeqExpressionTailCalls02.il.bsl | 4 +- .../EmittedIL/StaticInit/LetBinding01.il.bsl | 4 +- .../StaticInit/StaticInit_Class01.il.bsl | 12 +- .../StaticInit/StaticInit_Module01.il.bsl | 22 +- .../StaticInit/StaticInit_Struct01.il.bsl | 14 +- .../SteppingMatch/SteppingMatch01.il.bsl | 6 +- .../SteppingMatch/SteppingMatch02.il.bsl | 6 +- .../SteppingMatch/SteppingMatch03.il.bsl | 6 +- .../SteppingMatch/SteppingMatch04.il.bsl | 6 +- .../SteppingMatch/SteppingMatch05.il.bsl | 6 +- .../SteppingMatch/SteppingMatch06.il.bsl | 10 +- .../SteppingMatch/SteppingMatch07.il.bsl | 10 +- .../SteppingMatch/SteppingMatch08.il.bsl | 4 +- .../SteppingMatch/SteppingMatch09.il.bsl | 6 +- .../EmittedIL/TailCalls/TailCall01.il.bsl | 6 +- .../EmittedIL/TailCalls/TailCall02.il.bsl | 4 +- .../EmittedIL/TailCalls/TailCall03.il.bsl | 10 +- .../EmittedIL/TailCalls/TailCall04.il.bsl | 6 +- .../EmittedIL/TailCalls/TailCall05.il.bsl | 6 +- .../TestFunctions/TestFunction1.il.bsl | 4 +- .../TestFunctions/TestFunction10.il.bsl | 4 +- .../TestFunctions/TestFunction13.il.bsl | 6 +- .../TestFunctions/TestFunction14.il.bsl | 4 +- .../TestFunctions/TestFunction16.il.bsl | 6 +- .../TestFunctions/TestFunction17.il.bsl | 10 +- .../TestFunctions/TestFunction19.il.bsl | 4 +- .../TestFunctions/TestFunction20.il.bsl | 4 +- .../TestFunctions/TestFunction21.il.bsl | 10 +- .../TestFunctions/TestFunction23.il.bsl | 6 +- .../TestFunctions/TestFunction24.il.bsl | 6 +- .../TestFunctions/TestFunction3b.il.bsl | 4 +- .../TestFunctions/TestFunction3c.il.bsl | 4 +- .../TestFunctions/TestFunction9b4.il.bsl | 6 +- .../TestFunctions/Testfunction11.il.bsl | 4 +- .../TestFunctions/Testfunction12.il.bsl | 4 +- .../TestFunctions/Testfunction15.il.bsl | 4 +- .../TestFunctions/Testfunction18.il.bsl | 6 +- .../TestFunctions/Testfunction2.il.bsl | 4 +- .../TestFunctions/Testfunction22.il.bsl | 4 +- .../TestFunctions/Testfunction22b.il.bsl | 4 +- .../TestFunctions/Testfunction22c.il.bsl | 4 +- .../TestFunctions/Testfunction22d.il.bsl | 4 +- .../TestFunctions/Testfunction22e.il.bsl | 4 +- .../TestFunctions/Testfunction22f.il.bsl | 4 +- .../TestFunctions/Testfunction22g.il.bsl | 4 +- .../TestFunctions/Testfunction22h.il.bsl | 4 +- .../TestFunctions/Testfunction3.il.bsl | 4 +- .../TestFunctions/Testfunction4.il.bsl | 4 +- .../TestFunctions/Testfunction5.il.bsl | 4 +- .../TestFunctions/Testfunction6.il.bsl | 4 +- .../TestFunctions/Testfunction7.il.bsl | 4 +- .../TestFunctions/Testfunction8.il.bsl | 4 +- .../TestFunctions/Testfunction9.il.bsl | 4 +- .../TestFunctions/Testfunction9b.il.bsl | 4 +- .../TestFunctions/Testfunction9b1.il.bsl | 4 +- .../TestFunctions/Testfunction9b2.il.bsl | 4 +- .../TestFunctions/Testfunction9b3.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple01.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple02.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple03.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple04.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple05.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple06.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple07.il.bsl | 4 +- .../CodeGen/EmittedIL/Tuples/Tuple08.il.bsl | 4 +- .../EmittedIL/Tuples/TupleElimination.il.bsl | 4 +- .../EmittedIL/Tuples/TupleMonster.il.bsl | 4 +- .../Tuples/ValueTupleAliasConstructor.il.bsl | 13 +- .../fsc/help/help40.437.1033.bsl | 3 +- .../fsi/exename/help40.437.1033.bsl | 106 +- .../fsi/help/help40-nologo.437.1033.bsl | 3 +- .../fsi/help/help40.437.1033.bsl | 3 +- 186 files changed, 4339 insertions(+), 4322 deletions(-) diff --git a/build.cmd b/build.cmd index abbc0fd1e40..8a79267d5ab 100644 --- a/build.cmd +++ b/build.cmd @@ -901,6 +901,7 @@ if "%TEST_NET40_FSHARPQA_SUITE%" == "1" ( set OUTPUTFILE=test-net40-fsharpqa-results.log set ERRORFILE=test-net40-fsharpqa-errors.log set FAILENV=test-net40-fsharpqa-errors + mkdir !RESULTSDIR! pushd %~dp0tests\fsharpqa\source echo !perlexe! %~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot !RESULTSDIR! -results !OUTPUTFILE! -log !ERRORFILE! -fail !FAILENV! -cleanup:no !TTAGS_ARG_RUNALL! !PARALLEL_ARG! diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl index 74660c32df2..a45c4e67570 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000330 Length: 0x00000000 } .module AsyncExpressionSteppingTest1.dll -// MVID: {5BF2D3CD-6394-B5D4-A745-0383CDD3F25B} +// MVID: {5C6C9329-2A83-7E0E-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02A30000 +// Image base: 0x01A80000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f1@6-3' + .class auto ansi serializable sealed nested assembly beforefieldinit f1@6 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/'f1@6-3'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/f1@6::builder@ IL_000d: ret - } // end of method 'f1@6-3'::.ctor + } // end of method f1@6::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -107,13 +107,13 @@ IL_002a: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_002f: pop IL_0030: ldarg.0 - IL_0031: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/'f1@6-3'::builder@ + IL_0031: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/f1@6::builder@ IL_0036: tail. IL_0038: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Zero() IL_003d: ret - } // end of method 'f1@6-3'::Invoke + } // end of method f1@6::Invoke - } // end of class 'f1@6-3' + } // end of class f1@6 .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f1() cil managed @@ -126,7 +126,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/'f1@6-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest1/AsyncExpressionSteppingTest1/f1@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl index 5c5a7277783..b191b2d1dc9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000330 Length: 0x00000000 } .module AsyncExpressionSteppingTest2.dll -// MVID: {5BF2D3CD-6394-D499-A745-0383CDD3F25B} +// MVID: {5C6C9329-331E-82E3-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02B90000 +// Image base: 0x012E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@6-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@6-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -78,9 +78,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-16'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-1'::x IL_000d: ret - } // end of method 'f2@6-16'::.ctor + } // end of method 'f2@6-1'::.ctor .method public strict virtual instance bool Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -90,16 +90,16 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 6,6 : 23,29 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\AsyncExpressionStepping\\AsyncExpressionSteppingTest2.fs' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-16'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-1'::x IL_0006: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000b: ldc.i4.4 IL_000c: clt IL_000e: ret - } // end of method 'f2@6-16'::Invoke + } // end of method 'f2@6-1'::Invoke - } // end of class 'f2@6-16' + } // end of class 'f2@6-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@7-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@7-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -119,12 +119,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::x IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::builder@ + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::builder@ IL_0014: ret - } // end of method 'f2@7-17'::.ctor + } // end of method 'f2@7-2'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -133,7 +133,7 @@ .maxstack 8 .line 7,7 : 20,26 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::x IL_0006: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000b: nop .line 8,8 : 20,35 '' @@ -142,15 +142,15 @@ IL_0016: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_001b: pop IL_001c: ldarg.0 - IL_001d: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::builder@ + IL_001d: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::builder@ IL_0022: tail. IL_0024: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Zero() IL_0029: ret - } // end of method 'f2@7-17'::Invoke + } // end of method 'f2@7-2'::Invoke - } // end of class 'f2@7-17' + } // end of class 'f2@7-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@6-15' + .class auto ansi serializable sealed nested assembly beforefieldinit f2@6 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -170,12 +170,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::x IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::builder@ + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::builder@ IL_0014: ret - } // end of method 'f2@6-15'::.ctor + } // end of method f2@6::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -184,26 +184,26 @@ .maxstack 9 .line 6,6 : 17,29 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::builder@ + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::builder@ IL_0006: ldarg.0 - IL_0007: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::x - IL_000c: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-16'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0007: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::x + IL_000c: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0011: ldarg.0 - IL_0012: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::builder@ + IL_0012: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::builder@ IL_0017: ldarg.0 - IL_0018: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::x + IL_0018: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::x IL_001d: ldarg.0 - IL_001e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::builder@ - IL_0023: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-17'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_001e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::builder@ + IL_0023: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@7-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0028: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002d: tail. IL_002f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::While(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1) IL_0034: ret - } // end of method 'f2@6-15'::Invoke + } // end of method f2@6::Invoke - } // end of class 'f2@6-15' + } // end of class f2@6 .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f2() cil managed @@ -222,8 +222,8 @@ IL_000d: ldloc.1 IL_000e: ldloc.0 IL_000f: ldloc.1 - IL_0010: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/'f2@6-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0010: newobj instance void AsyncExpressionSteppingTest2/AsyncExpressionSteppingTest2/f2@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0015: tail. IL_0017: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001c: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl index dabfaea9c6f..b8e13505fef 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module AsyncExpressionSteppingTest3.dll -// MVID: {5BF2D3CD-6394-F35E-A745-0383CDD3F25B} +// MVID: {5C6C9329-3BB9-87B8-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01640000 +// Image base: 0x00570000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@10-37' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@10-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public int32 'value' @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-37'::'value' + IL_0008: stfld int32 AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-1'::'value' IL_000d: ret - } // end of method 'f3@10-37'::.ctor + } // end of method 'f3@10-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -94,14 +94,14 @@ .line 10,10 : 17,25 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\AsyncExpressionStepping\\AsyncExpressionSteppingTest3.fs' IL_0000: ldarga.s ctxt IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-37'::'value' + IL_0003: ldfld int32 AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-1'::'value' IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1::OnSuccess(!0) IL_000d: ret - } // end of method 'f3@10-37'::Invoke + } // end of method 'f3@10-1'::Invoke - } // end of class 'f3@10-37' + } // end of class 'f3@10-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@5-36' + .class auto ansi serializable sealed nested assembly beforefieldinit f3@5 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -119,9 +119,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@5-36'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/f3@5::builder@ IL_000d: ret - } // end of method 'f3@5-36'::.ctor + } // end of method f3@5::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -158,18 +158,18 @@ IL_0029: stloc.2 .line 10,10 : 17,25 '' IL_002a: ldarg.0 - IL_002b: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@5-36'::builder@ + IL_002b: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/f3@5::builder@ IL_0030: stloc.3 IL_0031: ldloc.2 IL_0032: stloc.s V_4 IL_0034: ldloc.s V_4 - IL_0036: newobj instance void AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-37'::.ctor(int32) + IL_0036: newobj instance void AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@10-1'::.ctor(int32) IL_003b: tail. IL_003d: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0042: ret - } // end of method 'f3@5-36'::Invoke + } // end of method f3@5::Invoke - } // end of class 'f3@5-36' + } // end of class f3@5 .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f3() cil managed @@ -182,7 +182,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/'f3@5-36'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest3/AsyncExpressionSteppingTest3/f3@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl index 9ce2db2204d..6b1465a58ae 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module AsyncExpressionSteppingTest4.dll -// MVID: {5BF2D3CD-6394-6D4B-A745-0383CDD3F25B} +// MVID: {5C6C9329-A47C-E149-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013C0000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@10-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@10-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public int32 'value' @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-17'::'value' + IL_0008: stfld int32 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-2'::'value' IL_000d: ret - } // end of method 'f4@10-17'::.ctor + } // end of method 'f4@10-2'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -94,14 +94,14 @@ .line 10,10 : 21,29 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\AsyncExpressionStepping\\AsyncExpressionSteppingTest4.fs' IL_0000: ldarga.s ctxt IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-17'::'value' + IL_0003: ldfld int32 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-2'::'value' IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1::OnSuccess(!0) IL_000d: ret - } // end of method 'f4@10-17'::Invoke + } // end of method 'f4@10-2'::Invoke - } // end of class 'f4@10-17' + } // end of class 'f4@10-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@7-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@7-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -121,12 +121,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::x + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::x IL_0014: ret - } // end of method 'f4@7-16'::.ctor + } // end of method 'f4@7-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -147,7 +147,7 @@ IL_000d: nop .line 9,9 : 21,36 '' IL_000e: ldarg.0 - IL_000f: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::x + IL_000f: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::x IL_0014: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0019: ldloc.0 IL_001a: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) @@ -155,20 +155,20 @@ IL_0020: stloc.1 .line 10,10 : 21,29 '' IL_0021: ldarg.0 - IL_0022: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::builder@ + IL_0022: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::builder@ IL_0027: stloc.2 IL_0028: ldloc.1 IL_0029: stloc.3 IL_002a: ldloc.3 - IL_002b: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-17'::.ctor(int32) + IL_002b: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@10-2'::.ctor(int32) IL_0030: tail. IL_0032: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0037: ret - } // end of method 'f4@7-16'::Invoke + } // end of method 'f4@7-1'::Invoke - } // end of class 'f4@7-16' + } // end of class 'f4@7-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@12-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@12-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -183,9 +183,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-18'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-3'::x IL_000d: ret - } // end of method 'f4@12-18'::.ctor + } // end of method 'f4@12-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -194,7 +194,7 @@ .maxstack 8 .line 12,12 : 20,26 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-18'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-3'::x IL_0006: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000b: nop .line 13,13 : 20,34 '' @@ -203,11 +203,11 @@ IL_0016: tail. IL_0018: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_001d: ret - } // end of method 'f4@12-18'::Invoke + } // end of method 'f4@12-3'::Invoke - } // end of class 'f4@12-18' + } // end of class 'f4@12-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@6-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@6-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -230,12 +230,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::compensation + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::compensation IL_0014: ret - } // end of method 'f4@6-19'::.ctor + } // end of method 'f4@6-4'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -245,19 +245,19 @@ .line 6,6 : 17,20 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::compensation + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::compensation IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::TryFinally(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0014: ret - } // end of method 'f4@6-19'::Invoke + } // end of method 'f4@6-4'::Invoke - } // end of class 'f4@6-19' + } // end of class 'f4@6-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f4@5-15' + .class auto ansi serializable sealed nested assembly beforefieldinit f4@5 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -275,9 +275,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::builder@ IL_000d: ret - } // end of method 'f4@5-15'::.ctor + } // end of method f4@5::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -294,30 +294,30 @@ IL_0006: stloc.0 .line 6,6 : 17,20 '' IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::builder@ + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::builder@ IL_000d: stloc.1 IL_000e: ldarg.0 - IL_000f: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::builder@ + IL_000f: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::builder@ IL_0014: ldarg.0 - IL_0015: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::builder@ + IL_0015: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::builder@ IL_001a: ldloc.0 - IL_001b: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-16'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_001b: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@7-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0020: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0025: stloc.2 IL_0026: ldloc.0 - IL_0027: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0027: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@12-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_002c: stloc.3 IL_002d: ldloc.2 IL_002e: ldloc.3 - IL_002f: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-19'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) + IL_002f: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@6-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0034: tail. IL_0036: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_003b: ret - } // end of method 'f4@5-15'::Invoke + } // end of method f4@5::Invoke - } // end of class 'f4@5-15' + } // end of class f4@5 .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f4() cil managed @@ -330,7 +330,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/'f4@5-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest4/AsyncExpressionSteppingTest4/f4@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl index 1c91181a086..0cb3c79f21e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000398 Length: 0x00000000 } .module AsyncExpressionSteppingTest5.dll -// MVID: {5BF2D3CD-6394-30E8-A745-0383CDD3F25B} +// MVID: {5C6C9329-A817-7C26-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C20000 +// Image base: 0x007C0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-19'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-1'::builder@ IL_000d: ret - } // end of method 'f7@6-19'::.ctor + } // end of method 'f7@6-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg1) cil managed @@ -106,15 +106,15 @@ IL_001c: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_0021: pop IL_0022: ldarg.0 - IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-19'::builder@ + IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-1'::builder@ IL_0028: tail. IL_002a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Zero() IL_002f: ret - } // end of method 'f7@6-19'::Invoke + } // end of method 'f7@6-1'::Invoke - } // end of class 'f7@6-19' + } // end of class 'f7@6-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@9-21' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@9-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -132,9 +132,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-21'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-3'::builder@ IL_000d: ret - } // end of method 'f7@9-21'::.ctor + } // end of method 'f7@9-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg2) cil managed @@ -156,15 +156,15 @@ IL_001c: call !!0 [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::PrintFormatLine(class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4) IL_0021: pop IL_0022: ldarg.0 - IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-21'::builder@ + IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-3'::builder@ IL_0028: tail. IL_002a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Zero() IL_002f: ret - } // end of method 'f7@9-21'::Invoke + } // end of method 'f7@9-3'::Invoke - } // end of class 'f7@9-21' + } // end of class 'f7@9-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@9-20' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@9-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -182,9 +182,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-20'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-2'::builder@ IL_000d: ret - } // end of method 'f7@9-20'::.ctor + } // end of method 'f7@9-2'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -193,20 +193,20 @@ .maxstack 8 .line 9,9 : 17,31 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-20'::builder@ + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-2'::builder@ IL_0006: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5::get_es() IL_000b: ldarg.0 - IL_000c: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-20'::builder@ - IL_0011: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_000c: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-2'::builder@ + IL_0011: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0016: tail. IL_0018: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::For(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001d: ret - } // end of method 'f7@9-20'::Invoke + } // end of method 'f7@9-2'::Invoke - } // end of class 'f7@9-20' + } // end of class 'f7@9-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-22' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation2 @@ -224,9 +224,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-22'::computation2 + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-4'::computation2 IL_000d: ret - } // end of method 'f7@6-22'::.ctor + } // end of method 'f7@6-4'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar0) cil managed @@ -235,13 +235,13 @@ .maxstack 8 .line 6,6 : 17,31 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-22'::computation2 + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-4'::computation2 IL_0006: ret - } // end of method 'f7@6-22'::Invoke + } // end of method 'f7@6-4'::Invoke - } // end of class 'f7@6-22' + } // end of class 'f7@6-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-23' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-5' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation1 @@ -264,12 +264,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::computation1 + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::computation1 IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::part2 + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::part2 IL_0014: ret - } // end of method 'f7@6-23'::.ctor + } // end of method 'f7@6-5'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -279,19 +279,19 @@ .line 6,6 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::computation1 + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::computation1 IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::part2 + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::part2 IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f7@6-23'::Invoke + } // end of method 'f7@6-5'::Invoke - } // end of class 'f7@6-23' + } // end of class 'f7@6-5' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f7@6-18' + .class auto ansi serializable sealed nested assembly beforefieldinit f7@6 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -309,9 +309,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ IL_000d: ret - } // end of method 'f7@6-18'::.ctor + } // end of method f7@6::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -324,44 +324,44 @@ [3] class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> V_3) .line 6,6 : 17,31 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ IL_0006: stloc.0 IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ IL_000d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5::get_es() IL_0012: ldarg.0 - IL_0013: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ - IL_0018: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-19'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0013: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ + IL_0018: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_001d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::For(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0022: stloc.1 IL_0023: ldarg.0 - IL_0024: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ + IL_0024: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ IL_0029: ldarg.0 - IL_002a: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::builder@ - IL_002f: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-20'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_002a: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::builder@ + IL_002f: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@9-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0034: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0039: stloc.2 IL_003a: ldloc.2 - IL_003b: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-22'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1) + IL_003b: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1) IL_0040: stloc.3 IL_0041: ldloc.1 IL_0042: ldloc.3 - IL_0043: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-23'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) + IL_0043: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-5'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0048: tail. IL_004a: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_004f: ret - } // end of method 'f7@6-18'::Invoke + } // end of method f7@6::Invoke - } // end of class 'f7@6-18' + } // end of class f7@6 .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_es() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$AsyncExpressionSteppingTest5::'es@4-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$AsyncExpressionSteppingTest5::es@4 IL_0005: ret } // end of method AsyncExpressionSteppingTest5::get_es @@ -376,7 +376,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/'f7@6-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5/f7@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret @@ -395,7 +395,7 @@ .class private abstract auto ansi sealed ''.$AsyncExpressionSteppingTest5 extends [mscorlib]System.Object { - .field static assembly initonly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'es@4-6' + .field static assembly initonly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 es@4 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -421,7 +421,7 @@ IL_0012: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0017: dup - IL_0018: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$AsyncExpressionSteppingTest5::'es@4-6' + IL_0018: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$AsyncExpressionSteppingTest5::es@4 IL_001d: stloc.0 .line 13,13 : 13,43 '' IL_001e: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest5/AsyncExpressionSteppingTest5::f7() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl index 7f22f694cd7..9c7cd83cb1d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest6.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000380 Length: 0x00000000 } .module AsyncExpressionSteppingTest6.dll -// MVID: {5BF2D3CD-6394-4FAD-A745-0383CDD3F25B} +// MVID: {5C6C9329-B0B2-80FB-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x001E0000 +// Image base: 0x019B0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@10-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@10-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public int32 'value' @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-19'::'value' + IL_0008: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-4'::'value' IL_000d: ret - } // end of method 'f2@10-19'::.ctor + } // end of method 'f2@10-4'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -94,14 +94,14 @@ .line 10,10 : 17,25 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\AsyncExpressionStepping\\AsyncExpressionSteppingTest6.fs' IL_0000: ldarga.s ctxt IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-19'::'value' + IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-4'::'value' IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1::OnSuccess(!0) IL_000d: ret - } // end of method 'f2@10-19'::Invoke + } // end of method 'f2@10-4'::Invoke - } // end of class 'f2@10-19' + } // end of class 'f2@10-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@5-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f2@5-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -119,9 +119,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-3'::builder@ IL_000d: ret - } // end of method 'f2@5-18'::.ctor + } // end of method 'f2@5-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -158,20 +158,20 @@ IL_0029: stloc.2 .line 10,10 : 17,25 '' IL_002a: ldarg.0 - IL_002b: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-18'::builder@ + IL_002b: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-3'::builder@ IL_0030: stloc.3 IL_0031: ldloc.2 IL_0032: stloc.s V_4 IL_0034: ldloc.s V_4 - IL_0036: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-19'::.ctor(int32) + IL_0036: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@10-4'::.ctor(int32) IL_003b: tail. IL_003d: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0042: ret - } // end of method 'f2@5-18'::Invoke + } // end of method 'f2@5-3'::Invoke - } // end of class 'f2@5-18' + } // end of class 'f2@5-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@20-43' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@20-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public int32 'value' @@ -189,9 +189,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-43'::'value' + IL_0008: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-7'::'value' IL_000d: ret - } // end of method 'f3@20-43'::.ctor + } // end of method 'f3@20-7'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -201,14 +201,14 @@ .line 20,20 : 17,25 '' IL_0000: ldarga.s ctxt IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-43'::'value' + IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-7'::'value' IL_0008: call instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1::OnSuccess(!0) IL_000d: ret - } // end of method 'f3@20-43'::Invoke + } // end of method 'f3@20-7'::Invoke - } // end of class 'f3@20-43' + } // end of class 'f3@20-7' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@19-42' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@19-6' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -230,15 +230,15 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::x1 + IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::x1 IL_0014: ldarg.0 IL_0015: ldarg.3 - IL_0016: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::y + IL_0016: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::y IL_001b: ret - } // end of method 'f3@19-42'::.ctor + } // end of method 'f3@19-6'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg4) cil managed @@ -254,9 +254,9 @@ IL_0001: stloc.0 .line 19,19 : 17,37 '' IL_0002: ldarg.0 - IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::x1 + IL_0003: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::x1 IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::y + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::y IL_000e: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0013: add IL_0014: ldloc.0 @@ -264,20 +264,20 @@ IL_0016: stloc.1 .line 20,20 : 17,25 '' IL_0017: ldarg.0 - IL_0018: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::builder@ + IL_0018: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::builder@ IL_001d: stloc.2 IL_001e: ldloc.1 IL_001f: stloc.3 IL_0020: ldloc.3 - IL_0021: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-43'::.ctor(int32) + IL_0021: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@20-7'::.ctor(int32) IL_0026: tail. IL_0028: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_002d: ret - } // end of method 'f3@19-42'::Invoke + } // end of method 'f3@19-6'::Invoke - } // end of class 'f3@19-42' + } // end of class 'f3@19-6' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@18-44' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@18-8' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -300,12 +300,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::binder + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::binder IL_0014: ret - } // end of method 'f3@18-44'::.ctor + } // end of method 'f3@18-8'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -315,19 +315,19 @@ .line 18,18 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::binder + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::binder IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f3@18-44'::Invoke + } // end of method 'f3@18-8'::Invoke - } // end of class 'f3@18-44' + } // end of class 'f3@18-8' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@16-41' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@16-5' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -347,12 +347,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::x1 + IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::x1 IL_0014: ret - } // end of method 'f3@16-41'::.ctor + } // end of method 'f3@16-5'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg3) cil managed @@ -377,31 +377,31 @@ IL_000f: nop .line 18,18 : 17,31 '' IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::builder@ IL_0016: stloc.2 IL_0017: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6::f2() IL_001c: stloc.3 IL_001d: ldarg.0 - IL_001e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::builder@ + IL_001e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::builder@ IL_0023: ldarg.0 - IL_0024: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::x1 + IL_0024: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::x1 IL_0029: ldloc.1 - IL_002a: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-42'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, - int32, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_002a: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@19-6'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, + int32, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_002f: stloc.s V_4 IL_0031: ldloc.3 IL_0032: ldloc.s V_4 - IL_0034: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-44'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) + IL_0034: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@18-8'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0039: tail. IL_003b: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0040: ret - } // end of method 'f3@16-41'::Invoke + } // end of method 'f3@16-5'::Invoke - } // end of class 'f3@16-41' + } // end of class 'f3@16-5' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@15-45' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@15-9' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -424,12 +424,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::binder + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::binder IL_0014: ret - } // end of method 'f3@15-45'::.ctor + } // end of method 'f3@15-9'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -439,19 +439,19 @@ .line 15,15 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::binder + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::binder IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f3@15-45'::Invoke + } // end of method 'f3@15-9'::Invoke - } // end of class 'f3@15-45' + } // end of class 'f3@15-9' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@15-40' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@15-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -471,12 +471,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::x1 + IL_000f: stfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::x1 IL_0014: ret - } // end of method 'f3@15-40'::.ctor + } // end of method 'f3@15-4'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg2) cil managed @@ -492,29 +492,29 @@ IL_0001: stloc.0 .line 15,15 : 17,31 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::builder@ IL_0008: stloc.1 IL_0009: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6::f2() IL_000e: stloc.2 IL_000f: ldarg.0 - IL_0010: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::builder@ + IL_0010: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::builder@ IL_0015: ldarg.0 - IL_0016: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::x1 - IL_001b: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-41'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, - int32) + IL_0016: ldfld int32 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::x1 + IL_001b: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@16-5'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, + int32) IL_0020: stloc.3 IL_0021: ldloc.2 IL_0022: ldloc.3 - IL_0023: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-45'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) + IL_0023: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0028: tail. IL_002a: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_002f: ret - } // end of method 'f3@15-40'::Invoke + } // end of method 'f3@15-4'::Invoke - } // end of class 'f3@15-40' + } // end of class 'f3@15-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@14-46' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@14-10' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -537,12 +537,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::binder + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::binder IL_0014: ret - } // end of method 'f3@14-46'::.ctor + } // end of method 'f3@14-10'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -552,19 +552,19 @@ .line 14,14 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::binder + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::binder IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f3@14-46'::Invoke + } // end of method 'f3@14-10'::Invoke - } // end of class 'f3@14-46' + } // end of class 'f3@14-10' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@14-39' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@14-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -582,9 +582,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-39'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-3'::builder@ IL_000d: ret - } // end of method 'f3@14-39'::.ctor + } // end of method 'f3@14-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(int32 _arg1) cil managed @@ -600,28 +600,28 @@ IL_0001: stloc.0 .line 14,14 : 17,31 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-39'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-3'::builder@ IL_0008: stloc.1 IL_0009: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6::f2() IL_000e: stloc.2 IL_000f: ldarg.0 - IL_0010: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-39'::builder@ + IL_0010: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-3'::builder@ IL_0015: ldloc.0 - IL_0016: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-40'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, - int32) + IL_0016: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@15-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder, + int32) IL_001b: stloc.3 IL_001c: ldloc.2 IL_001d: ldloc.3 - IL_001e: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-46'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + IL_001e: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-10'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0023: tail. IL_0025: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_002a: ret - } // end of method 'f3@14-39'::Invoke + } // end of method 'f3@14-3'::Invoke - } // end of class 'f3@14-39' + } // end of class 'f3@14-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@13-47' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@13-11' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 computation @@ -644,12 +644,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::computation + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::computation IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::binder + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::binder IL_0014: ret - } // end of method 'f3@13-47'::.ctor + } // end of method 'f3@13-11'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn Invoke(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1 ctxt) cil managed @@ -659,19 +659,19 @@ .line 13,13 : 17,31 '' IL_0000: ldarg.1 IL_0001: ldarg.0 - IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::computation + IL_0002: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::computation IL_0007: ldarg.0 - IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::binder + IL_0008: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::binder IL_000d: tail. IL_000f: call class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::Bind(valuetype [FSharp.Core]Microsoft.FSharp.Control.AsyncActivation`1, class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret - } // end of method 'f3@13-47'::Invoke + } // end of method 'f3@13-11'::Invoke - } // end of class 'f3@13-47' + } // end of class 'f3@13-11' - .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@13-38' + .class auto ansi serializable sealed nested assembly beforefieldinit 'f3@13-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder builder@ @@ -689,9 +689,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-38'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-2'::builder@ IL_000d: ret - } // end of method 'f3@13-38'::.ctor + } // end of method 'f3@13-2'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -703,24 +703,24 @@ [2] class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> V_2) .line 13,13 : 17,31 '' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-38'::builder@ + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-2'::builder@ IL_0006: stloc.0 IL_0007: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6::f2() IL_000c: stloc.1 IL_000d: ldarg.0 - IL_000e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-38'::builder@ - IL_0013: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-39'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_000e: ldfld class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-2'::builder@ + IL_0013: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@14-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_0018: stloc.2 IL_0019: ldloc.1 IL_001a: ldloc.2 - IL_001b: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-47'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, + IL_001b: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-11'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0020: tail. IL_0022: call class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.AsyncPrimitives::MakeAsync(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Control.AsyncReturn>) IL_0027: ret - } // end of method 'f3@13-38'::Invoke + } // end of method 'f3@13-2'::Invoke - } // end of class 'f3@13-38' + } // end of class 'f3@13-2' .method public static class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 f2() cil managed @@ -733,7 +733,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f2@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret @@ -750,7 +750,7 @@ IL_0005: stloc.0 IL_0006: ldloc.0 IL_0007: ldloc.0 - IL_0008: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-38'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) + IL_0008: newobj instance void AsyncExpressionSteppingTest6/AsyncExpressionSteppingTest6/'f3@13-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder) IL_000d: tail. IL_000f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Control.FSharpAsync`1 [FSharp.Core]Microsoft.FSharp.Control.FSharpAsyncBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0014: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl index b4cd97e17e5..19a696361a6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Default.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.Default { - // Offset: 0x00000408 Length: 0x00000019 + // Offset: 0x00000408 Length: 0x0000001A } .mresource public FSharpOptimizationData.Default { @@ -44,13 +44,13 @@ // Offset: 0x000004E8 Length: 0x00000003 } .module Default.dll -// MVID: {5BF2D3CD-AAA9-67BB-A745-0383CDD3F25B} +// MVID: {5C6C9329-B299-AA6D-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x006F0000 +// Image base: 0x01050000 // =============== CLASS MEMBERS DECLARATION =================== @@ -86,7 +86,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$M::'T@12-18' + IL_0000: ldsfld int32 ''.$M::T@12 IL_0005: ret } // end of method M::get_T @@ -101,7 +101,7 @@ .class private abstract auto ansi sealed ''.$M extends [mscorlib]System.Object { - .field static assembly initonly int32 'T@12-18' + .field static assembly initonly int32 T@12 .custom instance void M/ExportAttribute::.ctor() = ( 01 00 00 00 ) .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ @@ -122,7 +122,7 @@ .line 12,12 : 27,28 '' IL_0010: ldc.i4.1 IL_0011: dup - IL_0012: stsfld int32 ''.$M::'T@12-18' + IL_0012: stsfld int32 ''.$M::T@12 IL_0017: stloc.0 IL_0018: ret } // end of method $M::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl index d576c428303..24c19745239 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Field.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.Field { - // Offset: 0x00000400 Length: 0x00000019 + // Offset: 0x00000400 Length: 0x0000001A } .mresource public FSharpOptimizationData.Field { @@ -44,13 +44,13 @@ // Offset: 0x000004E0 Length: 0x00000003 } .module Field.dll -// MVID: {5BF2D3CD-96F8-CD6E-A745-0383CDD3F25B} +// MVID: {5C6C9329-94F4-D3EF-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007B0000 +// Image base: 0x014C0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -86,7 +86,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$M::'T@12-20' + IL_0000: ldsfld int32 ''.$M::'T@12-2' IL_0005: ret } // end of method M::get_T @@ -100,7 +100,7 @@ .class private abstract auto ansi sealed ''.$M extends [mscorlib]System.Object { - .field static assembly initonly int32 'T@12-20' + .field static assembly initonly int32 'T@12-2' .custom instance void M/ExportAttribute::.ctor() = ( 01 00 00 00 ) .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ @@ -121,7 +121,7 @@ .line 12,12 : 27,28 '' IL_0010: ldc.i4.1 IL_0011: dup - IL_0012: stsfld int32 ''.$M::'T@12-20' + IL_0012: stsfld int32 ''.$M::'T@12-2' IL_0017: stloc.0 IL_0018: ret } // end of method $M::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl index 910135fd524..3846b7bd5ff 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/AttributeTargets/Property.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.Property { - // Offset: 0x00000410 Length: 0x00000019 + // Offset: 0x00000410 Length: 0x0000001A } .mresource public FSharpOptimizationData.Property { @@ -44,13 +44,13 @@ // Offset: 0x000004F0 Length: 0x00000003 } .module Property.dll -// MVID: {5BF2D3CD-9B5C-7949-A745-0383CDD3F25B} +// MVID: {5C6C9329-845D-34D4-A745-038329936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01250000 +// Image base: 0x011D0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -86,7 +86,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$M::'T@12-22' + IL_0000: ldsfld int32 ''.$M::'T@12-4' IL_0005: ret } // end of method M::get_T @@ -101,7 +101,7 @@ .class private abstract auto ansi sealed ''.$M extends [mscorlib]System.Object { - .field static assembly initonly int32 'T@12-22' + .field static assembly initonly int32 'T@12-4' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -121,7 +121,7 @@ .line 12,12 : 27,28 '' IL_0010: ldc.i4.1 IL_0011: dup - IL_0012: stsfld int32 ''.$M::'T@12-22' + IL_0012: stsfld int32 ''.$M::'T@12-4' IL_0017: stloc.0 IL_0018: ret } // end of method $M::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl index b65e3b0079e..244b83cbd1f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember01.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.CCtorDUWithMember01 { - // Offset: 0x00000788 Length: 0x00000083 + // Offset: 0x00000788 Length: 0x00000085 } .mresource public FSharpOptimizationData.CCtorDUWithMember01 { - // Offset: 0x00000810 Length: 0x00000227 + // Offset: 0x00000818 Length: 0x00000227 } .mresource public FSharpOptimizationDataB.CCtorDUWithMember01 { - // Offset: 0x00000A40 Length: 0x0000002F + // Offset: 0x00000A48 Length: 0x0000002F } .module CCtorDUWithMember01.exe -// MVID: {5BF2DEA9-26F1-14EE-A745-0383A9DEF25B} +// MVID: {5C6C932A-6E31-E300-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018F0000 +// Image base: 0x00360000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl index 64223fdce8b..dbd403aa996 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000408 Length: 0x00000000 } .module CCtorDUWithMember02.exe -// MVID: {5BF2DEA9-D176-C99D-A745-0383A9DEF25B} +// MVID: {5C6C932A-8374-E300-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x016A0000 +// Image base: 0x00DB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl index a3fc1880e4a..08f3be6d20f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000370 Length: 0x00000000 } .module CCtorDUWithMember03.exe -// MVID: {5BF2DEA9-C97B-D207-A745-0383A9DEF25B} +// MVID: {5C6C932A-6633-E300-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00AF0000 +// Image base: 0x00A60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl index fe4c90df41b..504767919e0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CCtorDUWithMember/CCtorDUWithMember04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000370 Length: 0x00000000 } .module CCtorDUWithMember04.exe -// MVID: {5BF2DEA9-CF28-717B-A745-0383A9DEF25B} +// MVID: {5C6C932A-7A76-E300-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00300000 +// Image base: 0x016D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl index 575e62d5e0f..2974444b675 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.CompiledNameAttribute01 { - // Offset: 0x00000278 Length: 0x00000008 + // Offset: 0x00000278 Length: 0x00000009 } .mresource public FSharpOptimizationData.CompiledNameAttribute01 { @@ -44,13 +44,13 @@ // Offset: 0x00000318 Length: 0x00000000 } .module CompiledNameAttribute01.exe -// MVID: {5BF2DEA9-EF5A-FC2A-A745-0383A9DEF25B} +// MVID: {5C6C932A-F6D9-B06C-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01950000 +// Image base: 0x03310000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl index 3942227ee24..a84d0cf6e74 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E8 Length: 0x00000006 } .module CompiledNameAttribute02.exe -// MVID: {5BF2DEA9-F755-F3C0-A745-0383A9DEF25B} +// MVID: {5C6C932A-139A-B06D-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026B0000 +// Image base: 0x003A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl index 725047f0c76..96b0f19e42d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute03.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.CompiledNameAttribute03 { - // Offset: 0x00000288 Length: 0x00000008 + // Offset: 0x00000288 Length: 0x00000009 } .mresource public FSharpOptimizationData.CompiledNameAttribute03 { @@ -44,13 +44,13 @@ // Offset: 0x00000328 Length: 0x00000000 } .module CompiledNameAttribute03.exe -// MVID: {5BF2DEA9-2CE4-60B9-A745-0383A9DEF25B} +// MVID: {5C6C932A-0FDB-B06D-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01620000 +// Image base: 0x00B30000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl index eefcad4311e..1258b54de0b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/CompiledNameAttribute/CompiledNameAttribute04.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.CompiledNameAttribute04 { - // Offset: 0x00000CE8 Length: 0x00000109 + // Offset: 0x00000CE8 Length: 0x00000110 } .mresource public FSharpOptimizationData.CompiledNameAttribute04 { - // Offset: 0x00000DF8 Length: 0x000002CB + // Offset: 0x00000E00 Length: 0x000002CB } .mresource public FSharpOptimizationDataB.CompiledNameAttribute04 { - // Offset: 0x000010C8 Length: 0x0000004C + // Offset: 0x000010D0 Length: 0x0000004E } .module CompiledNameAttribute04.exe -// MVID: {5BF2DEA9-34DF-584F-A745-0383A9DEF25B} +// MVID: {5C6C932A-0A9C-B06D-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x009F0000 +// Image base: 0x011F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl index 6144f7ae6d1..05a83321a9f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr01.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr01.exe -// MVID: {5BF2D3C6-3703-E566-A745-0383C6D3F25B} +// MVID: {5C6C932A-9F41-ACD5-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x030C0000 +// Image base: 0x00700000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res1@8-3' + .class auto ansi serializable sealed nested assembly beforefieldinit res1@8 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/'res1@8-3'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/res1@8::builder@ IL_000d: ret - } // end of method 'res1@8-3'::.ctor + } // end of method res1@8::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -93,21 +93,21 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 8,8 : 9,17 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr01.fs' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/'res1@8-3'::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr01/res1@8::builder@ IL_0006: ldc.i4.1 IL_0007: tail. IL_0009: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_000e: ret - } // end of method 'res1@8-3'::Invoke + } // end of method res1@8::Invoke - } // end of class 'res1@8-3' + } // end of class res1@8 .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res1() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr01::'res1@6-22' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr01::res1@6 IL_0005: ret } // end of method ComputationExpr01::get_res1 @@ -122,7 +122,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr01 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res1@6-22' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res1@6 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -140,10 +140,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr01/'res1@8-3'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr01/res1@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr01::'res1@6-22' + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr01::res1@6 IL_0018: stloc.0 .line 10,10 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr01::get_res1() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl index 788ca1397ae..cc875d8b7ab 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr02.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr02.exe -// MVID: {5BF2D3C6-3624-E566-A745-0383C6D3F25B} +// MVID: {5C6C932A-8AFE-ACD5-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02CA0000 +// Image base: 0x01100000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res2@8-6' + .class auto ansi serializable sealed nested assembly beforefieldinit res2@8 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr02/'res2@8-6'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr02/res2@8::builder@ IL_000d: ret - } // end of method 'res2@8-6'::.ctor + } // end of method res2@8::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -103,23 +103,23 @@ IL_001a: stloc.0 .line 9,9 : 9,21 '' IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr02/'res2@8-6'::builder@ + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr02/res2@8::builder@ IL_0021: ldloc.0 IL_0022: ldloc.0 IL_0023: add IL_0024: tail. IL_0026: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_002b: ret - } // end of method 'res2@8-6'::Invoke + } // end of method res2@8::Invoke - } // end of class 'res2@8-6' + } // end of class res2@8 .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res2() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr02::'res2@6-28' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr02::res2@6 IL_0005: ret } // end of method ComputationExpr02::get_res2 @@ -134,7 +134,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr02 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res2@6-28' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res2@6 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -152,10 +152,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr02/'res2@8-6'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr02/res2@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr02::'res2@6-28' + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr02::res2@6 IL_0018: stloc.0 .line 10,10 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr02::get_res2() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl index eb12fe63cbd..fc61c8f25ed 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr03.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000002E0 Length: 0x00000000 } .module ComputationExpr03.exe -// MVID: {5BF2D3C6-3649-E566-A745-0383C6D3F25B} +// MVID: {5C6C932A-A73F-ACD5-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x008E0000 +// Image base: 0x00D80000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res2@8-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res2@8-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res2@8-7'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res2@8-1'::builder@ IL_000d: ret - } // end of method 'res2@8-7'::.ctor + } // end of method 'res2@8-1'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -103,18 +103,18 @@ IL_001a: stloc.0 .line 9,9 : 9,21 '' IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res2@8-7'::builder@ + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res2@8-1'::builder@ IL_0021: ldloc.0 IL_0022: ldloc.0 IL_0023: add IL_0024: tail. IL_0026: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_002b: ret - } // end of method 'res2@8-7'::Invoke + } // end of method 'res2@8-1'::Invoke - } // end of class 'res2@8-7' + } // end of class 'res2@8-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@17-14' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@17-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -132,9 +132,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@17-14'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@17-2'::builder@ IL_000d: ret - } // end of method 'res3@17-14'::.ctor + } // end of method 'res3@17-2'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -153,16 +153,16 @@ IL_001a: stloc.0 .line 18,18 : 17,25 '' IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@17-14'::builder@ + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@17-2'::builder@ IL_0021: ldc.i4.1 IL_0022: tail. IL_0024: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_0029: ret - } // end of method 'res3@17-14'::Invoke + } // end of method 'res3@17-2'::Invoke - } // end of class 'res3@17-14' + } // end of class 'res3@17-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@20-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@20-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -180,9 +180,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@20-15'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@20-3'::builder@ IL_000d: ret - } // end of method 'res3@20-15'::.ctor + } // end of method 'res3@20-3'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(int32 _arg2) cil managed @@ -195,16 +195,16 @@ IL_0001: stloc.0 .line 20,20 : 9,17 '' IL_0002: ldarg.0 - IL_0003: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@20-15'::builder@ + IL_0003: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@20-3'::builder@ IL_0008: ldc.i4.1 IL_0009: tail. IL_000b: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_0010: ret - } // end of method 'res3@20-15'::Invoke + } // end of method 'res3@20-3'::Invoke - } // end of class 'res3@20-15' + } // end of class 'res3@20-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@15-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@15-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -222,9 +222,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-13'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-1'::builder@ IL_000d: ret - } // end of method 'res3@15-13'::.ctor + } // end of method 'res3@15-1'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(int32 _arg1) cil managed @@ -238,25 +238,25 @@ IL_0001: stloc.0 .line 15,19 : 9,14 '' IL_0002: ldarg.0 - IL_0003: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-13'::builder@ + IL_0003: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-1'::builder@ IL_0008: call class [ComputationExprLibrary]Library.EventuallyBuilder [ComputationExprLibrary]Library.TheEventuallyBuilder::get_eventually() IL_000d: stloc.1 IL_000e: ldloc.1 IL_000f: ldloc.1 - IL_0010: newobj instance void ComputationExpr03/'res3@17-14'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0010: newobj instance void ComputationExpr03/'res3@17-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0015: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001a: ldarg.0 - IL_001b: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-13'::builder@ - IL_0020: newobj instance void ComputationExpr03/'res3@20-15'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_001b: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@15-1'::builder@ + IL_0020: newobj instance void ComputationExpr03/'res3@20-3'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0025: tail. IL_0027: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Bind(class [ComputationExprLibrary]Library.Eventually`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'res3@15-13'::Invoke + } // end of method 'res3@15-1'::Invoke - } // end of class 'res3@15-13' + } // end of class 'res3@15-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res3@14-12' + .class auto ansi serializable sealed nested assembly beforefieldinit res3@14 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -274,9 +274,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@14-12'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/res3@14::builder@ IL_000d: ret - } // end of method 'res3@14-12'::.ctor + } // end of method res3@14::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -285,25 +285,25 @@ .maxstack 8 .line 14,14 : 9,23 '' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@14-12'::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/res3@14::builder@ IL_0006: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr03::get_res2() IL_000b: ldarg.0 - IL_000c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/'res3@14-12'::builder@ - IL_0011: newobj instance void ComputationExpr03/'res3@15-13'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_000c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr03/res3@14::builder@ + IL_0011: newobj instance void ComputationExpr03/'res3@15-1'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0016: tail. IL_0018: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Bind(class [ComputationExprLibrary]Library.Eventually`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001d: ret - } // end of method 'res3@14-12'::Invoke + } // end of method res3@14::Invoke - } // end of class 'res3@14-12' + } // end of class res3@14 .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res2() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res2@6-30' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res2@6-2' IL_0005: ret } // end of method ComputationExpr03::get_res2 @@ -312,7 +312,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res3@12-6' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::res3@12 IL_0005: ret } // end of method ComputationExpr03::get_res3 @@ -333,9 +333,9 @@ .class private abstract auto ansi sealed ''.$ComputationExpr03 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res2@6-30' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res2@6-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res3@12-6' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res3@12 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -355,10 +355,10 @@ IL_0005: stloc.2 IL_0006: ldloc.2 IL_0007: ldloc.2 - IL_0008: newobj instance void ComputationExpr03/'res2@8-7'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr03/'res2@8-1'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res2@6-30' + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res2@6-2' IL_0018: stloc.0 .line 10,10 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr03::get_res2() @@ -368,10 +368,10 @@ IL_0029: stloc.3 IL_002a: ldloc.3 IL_002b: ldloc.3 - IL_002c: newobj instance void ComputationExpr03/'res3@14-12'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_002c: newobj instance void ComputationExpr03/res3@14::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0031: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0036: dup - IL_0037: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::'res3@12-6' + IL_0037: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr03::res3@12 IL_003c: stloc.1 .line 22,22 : 1,26 '' IL_003d: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr03::get_res3() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl index 9b59927709d..d34fc4647ed 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr04.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr04.exe -// MVID: {5BF2D3C6-366A-E566-A745-0383C6D3F25B} +// MVID: {5C6C932A-B404-ACD5-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01A20000 +// Image base: 0x00730000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@7-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@7-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@7-10'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@7-1'::builder@ IL_000d: ret - } // end of method 'res4@7-10'::.ctor + } // end of method 'res4@7-1'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -119,16 +119,16 @@ IL_0033: pop .line 9,9 : 13,21 '' IL_0034: ldarg.0 - IL_0035: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@7-10'::builder@ + IL_0035: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@7-1'::builder@ IL_003a: ldloc.0 IL_003b: tail. IL_003d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_0042: ret - } // end of method 'res4@7-10'::Invoke + } // end of method 'res4@7-1'::Invoke - } // end of class 'res4@7-10' + } // end of class 'res4@7-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@6-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@6-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -146,9 +146,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-11'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-2'::builder@ IL_000d: ret - } // end of method 'res4@6-11'::.ctor + } // end of method 'res4@6-2'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [mscorlib]System.Exception _arg1) cil managed @@ -173,16 +173,16 @@ IL_001d: stloc.1 .line 12,12 : 13,21 '' IL_001e: ldarg.0 - IL_001f: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-11'::builder@ + IL_001f: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-2'::builder@ IL_0024: ldloc.1 IL_0025: tail. IL_0027: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_002c: ret - } // end of method 'res4@6-11'::Invoke + } // end of method 'res4@6-2'::Invoke - } // end of class 'res4@6-11' + } // end of class 'res4@6-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res4@6-9' + .class auto ansi serializable sealed nested assembly beforefieldinit res4@6 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -200,9 +200,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ IL_000d: ret - } // end of method 'res4@6-9'::.ctor + } // end of method res4@6::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -211,30 +211,30 @@ .maxstack 8 .line 6,6 : 9,12 '' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ IL_0006: ldarg.0 - IL_0007: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ + IL_0007: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ IL_000c: ldarg.0 - IL_000d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ - IL_0012: newobj instance void ComputationExpr04/'res4@7-10'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_000d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ + IL_0012: newobj instance void ComputationExpr04/'res4@7-1'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0017: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_001c: ldarg.0 - IL_001d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/'res4@6-9'::builder@ - IL_0022: newobj instance void ComputationExpr04/'res4@6-11'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_001d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr04/res4@6::builder@ + IL_0022: newobj instance void ComputationExpr04/'res4@6-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0027: tail. IL_0029: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::TryWith(class [ComputationExprLibrary]Library.Eventually`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002e: ret - } // end of method 'res4@6-9'::Invoke + } // end of method res4@6::Invoke - } // end of class 'res4@6-9' + } // end of class res4@6 .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res4() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr04::'res4@4-6' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr04::res4@4 IL_0005: ret } // end of method ComputationExpr04::get_res4 @@ -249,7 +249,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr04 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res4@4-6' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res4@4 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -267,10 +267,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr04/'res4@6-9'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr04/res4@6::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr04::'res4@4-6' + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr04::res4@4 IL_0018: stloc.0 .line 14,14 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr04::get_res4() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl index fe605a1c581..d3d57afb667 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr05.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr05.exe -// MVID: {5BF2D3C6-3687-E566-A745-0383C6D3F25B} +// MVID: {5C6C932A-AF45-ACD5-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01430000 +// Image base: 0x00640000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'res5@9-10' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'res5@9-1' extends [mscorlib]System.Object implements [mscorlib]System.IDisposable { @@ -78,7 +78,7 @@ IL_0006: ldarg.0 IL_0007: pop IL_0008: ret - } // end of method 'res5@9-10'::.ctor + } // end of method 'res5@9-1'::.ctor .method private hidebysig newslot virtual final instance void 'System-IDisposable-Dispose'() cil managed @@ -89,11 +89,11 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 9,9 : 68,70 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr05.fs' IL_0000: ret - } // end of method 'res5@9-10'::'System-IDisposable-Dispose' + } // end of method 'res5@9-1'::'System-IDisposable-Dispose' - } // end of class 'res5@9-10' + } // end of class 'res5@9-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res5@10-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res5@10-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -111,9 +111,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@10-11'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@10-2'::builder@ IL_000d: ret - } // end of method 'res5@10-11'::.ctor + } // end of method 'res5@10-2'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [mscorlib]System.IDisposable _arg1) cil managed @@ -138,16 +138,16 @@ IL_001d: stloc.1 .line 11,11 : 9,17 '' IL_001e: ldarg.0 - IL_001f: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@10-11'::builder@ + IL_001f: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@10-2'::builder@ IL_0024: ldc.i4.1 IL_0025: tail. IL_0027: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_002c: ret - } // end of method 'res5@10-11'::Invoke + } // end of method 'res5@10-2'::Invoke - } // end of class 'res5@10-11' + } // end of class 'res5@10-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res5@8-9' + .class auto ansi serializable sealed nested assembly beforefieldinit res5@8 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -165,9 +165,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@8-9'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/res5@8::builder@ IL_000d: ret - } // end of method 'res5@8-9'::.ctor + } // end of method res5@8::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -186,25 +186,25 @@ IL_001a: stloc.0 .line 9,9 : 17,72 '' IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@8-9'::builder@ - IL_0021: newobj instance void ComputationExpr05/'res5@9-10'::.ctor() + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/res5@8::builder@ + IL_0021: newobj instance void ComputationExpr05/'res5@9-1'::.ctor() IL_0026: ldarg.0 - IL_0027: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/'res5@8-9'::builder@ - IL_002c: newobj instance void ComputationExpr05/'res5@10-11'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0027: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr05/res5@8::builder@ + IL_002c: newobj instance void ComputationExpr05/'res5@10-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0031: tail. IL_0033: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Using(class [mscorlib]System.IDisposable, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0038: ret - } // end of method 'res5@8-9'::Invoke + } // end of method res5@8::Invoke - } // end of class 'res5@8-9' + } // end of class res5@8 .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res5() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr05::'res5@6-6' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr05::res5@6 IL_0005: ret } // end of method ComputationExpr05::get_res5 @@ -219,7 +219,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr05 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res5@6-6' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res5@6 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -237,10 +237,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr05/'res5@8-9'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr05/res5@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr05::'res5@6-6' + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr05::res5@6 IL_0018: stloc.0 .line 13,13 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr05::get_res5() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl index ef90e20f095..6cf3e339f66 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr06.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr06.exe -// MVID: {5BF2D3C6-35A8-E566-A745-0383C6D3F25B} +// MVID: {5C6C932A-9B02-ACD5-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00AE0000 +// Image base: 0x015D0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@9-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@9-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 x @@ -78,9 +78,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-13'::x + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-1'::x IL_000d: ret - } // end of method 'res6@9-13'::.ctor + } // end of method 'res6@9-1'::.ctor .method public strict virtual instance bool Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -90,16 +90,16 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 9,9 : 15,21 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\ComputationExpressions\\ComputationExpr06.fs' IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-13'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@9-1'::x IL_0006: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000b: ldc.i4.0 IL_000c: cgt IL_000e: ret - } // end of method 'res6@9-13'::Invoke + } // end of method 'res6@9-1'::Invoke - } // end of class 'res6@9-13' + } // end of class 'res6@9-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@10-14' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@10-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -119,12 +119,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@10-14'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@10-2'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@10-14'::x + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@10-2'::x IL_0014: ret - } // end of method 'res6@10-14'::.ctor + } // end of method 'res6@10-2'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -158,19 +158,19 @@ IL_004f: pop .line 15,15 : 13,19 '' IL_0050: ldarg.0 - IL_0051: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@10-14'::x + IL_0051: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr06/'res6@10-2'::x IL_0056: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Decrement(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_005b: nop IL_005c: ldarg.0 - IL_005d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@10-14'::builder@ + IL_005d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@10-2'::builder@ IL_0062: tail. IL_0064: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Zero() IL_0069: ret - } // end of method 'res6@10-14'::Invoke + } // end of method 'res6@10-2'::Invoke - } // end of class 'res6@10-14' + } // end of class 'res6@10-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@16-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@16-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -188,9 +188,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@16-15'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@16-3'::builder@ IL_000d: ret - } // end of method 'res6@16-15'::.ctor + } // end of method 'res6@16-3'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -199,16 +199,16 @@ .maxstack 8 .line 16,16 : 9,17 '' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@16-15'::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@16-3'::builder@ IL_0006: ldc.i4.1 IL_0007: tail. IL_0009: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_000e: ret - } // end of method 'res6@16-15'::Invoke + } // end of method 'res6@16-3'::Invoke - } // end of class 'res6@16-15' + } // end of class 'res6@16-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res6@8-12' + .class auto ansi serializable sealed nested assembly beforefieldinit res6@8 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -226,9 +226,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ IL_000d: ret - } // end of method 'res6@8-12'::.ctor + } // end of method res6@8::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -242,41 +242,41 @@ IL_0006: stloc.0 .line 9,9 : 9,21 '' IL_0007: ldarg.0 - IL_0008: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ + IL_0008: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ IL_000d: ldarg.0 - IL_000e: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ + IL_000e: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ IL_0013: ldloc.0 - IL_0014: newobj instance void ComputationExpr06/'res6@9-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0014: newobj instance void ComputationExpr06/'res6@9-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0019: ldarg.0 - IL_001a: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ + IL_001a: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ IL_001f: ldarg.0 - IL_0020: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ + IL_0020: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ IL_0025: ldloc.0 - IL_0026: newobj instance void ComputationExpr06/'res6@10-14'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0026: newobj instance void ComputationExpr06/'res6@10-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_002b: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0030: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::While(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [ComputationExprLibrary]Library.Eventually`1) IL_0035: ldarg.0 - IL_0036: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ + IL_0036: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ IL_003b: ldarg.0 - IL_003c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/'res6@8-12'::builder@ - IL_0041: newobj instance void ComputationExpr06/'res6@16-15'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_003c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr06/res6@8::builder@ + IL_0041: newobj instance void ComputationExpr06/'res6@16-3'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_0046: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_004b: tail. IL_004d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Combine(class [ComputationExprLibrary]Library.Eventually`1, class [ComputationExprLibrary]Library.Eventually`1) IL_0052: ret - } // end of method 'res6@8-12'::Invoke + } // end of method res6@8::Invoke - } // end of class 'res6@8-12' + } // end of class res6@8 .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res6() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr06::'res6@6-6' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr06::res6@6 IL_0005: ret } // end of method ComputationExpr06::get_res6 @@ -291,7 +291,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr06 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res6@6-6' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res6@6 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -309,10 +309,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr06/'res6@8-12'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr06/res6@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr06::'res6@6-6' + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr06::res6@6 IL_0018: stloc.0 .line 18,18 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr06::get_res6() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl index 67b90acc1cd..720c1f54e5f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ComputationExpressions/ComputationExpr07.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module ComputationExpr07.exe -// MVID: {5BF2D3C6-35BD-E566-A745-0383C6D3F25B} +// MVID: {5C6C932A-B743-ACD5-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00500000 +// Image base: 0x00360000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@9-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@9-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -83,12 +83,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@9-10'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@9-1'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-10'::x + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-1'::x IL_0014: ret - } // end of method 'res7@9-10'::.ctor + } // end of method 'res7@9-1'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(int32 _arg1) cil managed @@ -102,9 +102,9 @@ IL_0001: stloc.0 .line 10,10 : 13,24 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-10'::x + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-1'::x IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-10'::x + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@9-1'::x IL_000e: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0013: ldloc.0 IL_0014: sub @@ -112,15 +112,15 @@ !!0) IL_001a: nop IL_001b: ldarg.0 - IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@9-10'::builder@ + IL_001c: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@9-1'::builder@ IL_0021: tail. IL_0023: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Zero() IL_0028: ret - } // end of method 'res7@9-10'::Invoke + } // end of method 'res7@9-1'::Invoke - } // end of class 'res7@9-10' + } // end of class 'res7@9-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@11-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@11-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -140,12 +140,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@11-11'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@11-2'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@11-11'::x + IL_000f: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@11-2'::x IL_0014: ret - } // end of method 'res7@11-11'::.ctor + } // end of method 'res7@11-2'::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -154,18 +154,18 @@ .maxstack 8 .line 11,11 : 9,18 '' IL_0000: ldarg.0 - IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@11-11'::builder@ + IL_0001: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@11-2'::builder@ IL_0006: ldarg.0 - IL_0007: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@11-11'::x + IL_0007: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ComputationExpr07/'res7@11-2'::x IL_000c: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0011: tail. IL_0013: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Return(!!0) IL_0018: ret - } // end of method 'res7@11-11'::Invoke + } // end of method 'res7@11-2'::Invoke - } // end of class 'res7@11-11' + } // end of class 'res7@11-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'res7@8-9' + .class auto ansi serializable sealed nested assembly beforefieldinit res7@8 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [ComputationExprLibrary]Library.EventuallyBuilder builder@ @@ -183,9 +183,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ + IL_0008: stfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ IL_000d: ret - } // end of method 'res7@8-9'::.ctor + } // end of method res7@8::.ctor .method public strict virtual instance class [ComputationExprLibrary]Library.Eventually`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.Unit unitVar) cil managed @@ -199,9 +199,9 @@ IL_0006: stloc.0 .line 9,9 : 9,29 '' IL_0007: ldarg.0 - IL_0008: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ + IL_0008: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ IL_000d: ldarg.0 - IL_000e: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ + IL_000e: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ IL_0013: ldc.i4.0 IL_0014: ldc.i4.1 IL_0015: ldc.i4.3 @@ -211,34 +211,34 @@ IL_001b: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::CreateSequence(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0020: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0025: ldarg.0 - IL_0026: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ + IL_0026: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ IL_002b: ldloc.0 - IL_002c: newobj instance void ComputationExpr07/'res7@9-10'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_002c: newobj instance void ComputationExpr07/'res7@9-1'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0031: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::For(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0036: ldarg.0 - IL_0037: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ + IL_0037: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ IL_003c: ldarg.0 - IL_003d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/'res7@8-9'::builder@ + IL_003d: ldfld class [ComputationExprLibrary]Library.EventuallyBuilder ComputationExpr07/res7@8::builder@ IL_0042: ldloc.0 - IL_0043: newobj instance void ComputationExpr07/'res7@11-11'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0043: newobj instance void ComputationExpr07/'res7@11-2'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0048: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_004d: tail. IL_004f: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Combine(class [ComputationExprLibrary]Library.Eventually`1, class [ComputationExprLibrary]Library.Eventually`1) IL_0054: ret - } // end of method 'res7@8-9'::Invoke + } // end of method res7@8::Invoke - } // end of class 'res7@8-9' + } // end of class res7@8 .method public specialname static class [ComputationExprLibrary]Library.Eventually`1 get_res7() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr07::'res7@6-6' + IL_0000: ldsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr07::res7@6 IL_0005: ret } // end of method ComputationExpr07::get_res7 @@ -253,7 +253,7 @@ .class private abstract auto ansi sealed ''.$ComputationExpr07 extends [mscorlib]System.Object { - .field static assembly class [ComputationExprLibrary]Library.Eventually`1 'res7@6-6' + .field static assembly class [ComputationExprLibrary]Library.Eventually`1 res7@6 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -271,10 +271,10 @@ IL_0005: stloc.1 IL_0006: ldloc.1 IL_0007: ldloc.1 - IL_0008: newobj instance void ComputationExpr07/'res7@8-9'::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) + IL_0008: newobj instance void ComputationExpr07/res7@8::.ctor(class [ComputationExprLibrary]Library.EventuallyBuilder) IL_000d: callvirt instance class [ComputationExprLibrary]Library.Eventually`1 [ComputationExprLibrary]Library.EventuallyBuilder::Delay(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0012: dup - IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr07::'res7@6-6' + IL_0013: stsfld class [ComputationExprLibrary]Library.Eventually`1 ''.$ComputationExpr07::res7@6 IL_0018: stloc.0 .line 13,13 : 1,25 '' IL_0019: call class [ComputationExprLibrary]Library.Eventually`1 ComputationExpr07::get_res7() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl index 9c2fb69bc0d..877cdf3b477 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_CSInterface.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_CSInterface { - // Offset: 0x00000280 Length: 0x00000006 + // Offset: 0x00000280 Length: 0x00000007 } .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_CSInterface { @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module DoNotBoxStruct_ArrayOfArray_CSInterface.exe -// MVID: {5BF2D3C6-FF24-C89E-A745-0383C6D3F25B} +// MVID: {5C6C932A-D91C-C978-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00860000 +// Image base: 0x03300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl index d30b72bab25..42cef1a310e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_FSInterface { - // Offset: 0x00000280 Length: 0x00000007 + // Offset: 0x00000280 Length: 0x00000008 } .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_FSInterface { @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module DoNotBoxStruct_ArrayOfArray_FSInterface.exe -// MVID: {5BF2D3C6-8A45-C8A0-A745-0383C6D3F25B} +// MVID: {5C6C932A-1537-81EE-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A10000 +// Image base: 0x00790000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-28' + .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'F@5-28'::.ctor + } // end of method 'F@5-4'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(int32 x) cil managed @@ -83,9 +83,9 @@ .line 5,5 : 71,73 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\DoNotBoxStruct\\DoNotBoxStruct_ArrayOfArray_FSInterface.fs' IL_0000: ldnull IL_0001: ret - } // end of method 'F@5-28'::Invoke + } // end of method 'F@5-4'::Invoke - } // end of class 'F@5-28' + } // end of class 'F@5-4' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[][] x) cil managed { @@ -99,7 +99,7 @@ IL_0008: ldelem !!T IL_000d: box !!T IL_0012: unbox.any class [mscorlib]System.IObservable`1 - IL_0017: newobj instance void DoNotBoxStruct_ArrayOfArray_FSInterface/'F@5-28'::.ctor() + IL_0017: newobj instance void DoNotBoxStruct_ArrayOfArray_FSInterface/'F@5-4'::.ctor() IL_001c: tail. IL_001e: call void [FSharp.Core]Microsoft.FSharp.Control.CommonExtensions::AddToObservable(class [mscorlib]System.IObservable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl index 9610bb6de4d..8fbc2963803 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth { - // Offset: 0x000002A0 Length: 0x00000007 + // Offset: 0x000002A0 Length: 0x00000008 } .mresource public FSharpOptimizationData.DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth { @@ -44,13 +44,13 @@ // Offset: 0x00000370 Length: 0x00000000 } .module DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth.exe -// MVID: {5BF2D3C6-1475-D984-A745-0383C6D3F25B} +// MVID: {5C6C932A-D930-716D-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01630000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-24' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname F@6 extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -71,7 +71,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'F@6-24'::.ctor + } // end of method F@6::.ctor .method assembly hidebysig instance void Invoke(object x, @@ -86,9 +86,9 @@ IL_0001: stloc.0 .line 6,6 : 80,82 '' IL_0002: ret - } // end of method 'F@6-24'::Invoke + } // end of method F@6::Invoke - } // end of class 'F@6-24' + } // end of class F@6 .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[][] x) cil managed { @@ -101,9 +101,9 @@ IL_0007: ldc.i4.0 IL_0008: readonly. IL_000a: ldelema !!T - IL_000f: newobj instance void DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth/'F@6-24'::.ctor() - IL_0014: ldftn instance void DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth/'F@6-24'::Invoke(object, - int32) + IL_000f: newobj instance void DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth/F@6::.ctor() + IL_0014: ldftn instance void DoNotBoxStruct_ArrayOfArray_FSInterface_NoExtMeth/F@6::Invoke(object, + int32) IL_001a: newobj instance void class [FSharp.Core]Microsoft.FSharp.Control.FSharpHandler`1::.ctor(object, native int) IL_001f: constrained. !!T diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl index af6de48929d..097c2dae04e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_CSInterface.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_CSInterface { - // Offset: 0x00000268 Length: 0x00000005 + // Offset: 0x00000268 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_CSInterface { @@ -44,13 +44,13 @@ // Offset: 0x00000318 Length: 0x00000000 } .module DoNotBoxStruct_Array_CSInterface.exe -// MVID: {5BF2D3C6-1735-654E-A745-0383C6D3F25B} +// MVID: {5C6C932A-C4D6-12C8-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01940000 +// Image base: 0x012E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl index 59fe06dbe43..32686bf91ab 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_FSInterface { - // Offset: 0x00000268 Length: 0x00000006 + // Offset: 0x00000268 Length: 0x00000007 } .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_FSInterface { @@ -44,13 +44,13 @@ // Offset: 0x00000318 Length: 0x00000000 } .module DoNotBoxStruct_Array_FSInterface.exe -// MVID: {5BF2D3C6-1737-9DA5-A745-0383C6D3F25B} +// MVID: {5C6C932A-37AF-D4BC-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02930000 +// Image base: 0x014A0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-29' + .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-5' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'F@5-29'::.ctor + } // end of method 'F@5-5'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(int32 x) cil managed @@ -83,9 +83,9 @@ .line 5,5 : 65,67 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\DoNotBoxStruct\\DoNotBoxStruct_Array_FSInterface.fs' IL_0000: ldnull IL_0001: ret - } // end of method 'F@5-29'::Invoke + } // end of method 'F@5-5'::Invoke - } // end of class 'F@5-29' + } // end of class 'F@5-5' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[] x) cil managed { @@ -97,7 +97,7 @@ IL_0002: ldelem !!T IL_0007: box !!T IL_000c: unbox.any class [mscorlib]System.IObservable`1 - IL_0011: newobj instance void DoNotBoxStruct_Array_FSInterface/'F@5-29'::.ctor() + IL_0011: newobj instance void DoNotBoxStruct_Array_FSInterface/'F@5-5'::.ctor() IL_0016: tail. IL_0018: call void [FSharp.Core]Microsoft.FSharp.Control.CommonExtensions::AddToObservable(class [mscorlib]System.IObservable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl index 2902d707b16..7ee78791c8e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_Array_FSInterface_NoExtMeth.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_Array_FSInterface_NoExtMeth { - // Offset: 0x00000288 Length: 0x00000006 + // Offset: 0x00000288 Length: 0x00000007 } .mresource public FSharpOptimizationData.DoNotBoxStruct_Array_FSInterface_NoExtMeth { @@ -44,13 +44,13 @@ // Offset: 0x00000348 Length: 0x00000000 } .module DoNotBoxStruct_Array_FSInterface_NoExtMeth.exe -// MVID: {5BF2D3C6-8127-3EE3-A745-0383C6D3F25B} +// MVID: {5C6C932A-E97A-148F-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x01300000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-25' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-1' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -71,7 +71,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'F@6-25'::.ctor + } // end of method 'F@6-1'::.ctor .method assembly hidebysig instance void Invoke(object x, @@ -86,9 +86,9 @@ IL_0001: stloc.0 .line 6,6 : 74,76 '' IL_0002: ret - } // end of method 'F@6-25'::Invoke + } // end of method 'F@6-1'::Invoke - } // end of class 'F@6-25' + } // end of class 'F@6-1' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[] x) cil managed { @@ -99,9 +99,9 @@ IL_0001: ldc.i4.0 IL_0002: readonly. IL_0004: ldelema !!T - IL_0009: newobj instance void DoNotBoxStruct_Array_FSInterface_NoExtMeth/'F@6-25'::.ctor() - IL_000e: ldftn instance void DoNotBoxStruct_Array_FSInterface_NoExtMeth/'F@6-25'::Invoke(object, - int32) + IL_0009: newobj instance void DoNotBoxStruct_Array_FSInterface_NoExtMeth/'F@6-1'::.ctor() + IL_000e: ldftn instance void DoNotBoxStruct_Array_FSInterface_NoExtMeth/'F@6-1'::Invoke(object, + int32) IL_0014: newobj instance void class [FSharp.Core]Microsoft.FSharp.Control.FSharpHandler`1::.ctor(object, native int) IL_0019: constrained. !!T diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl index 53f46440766..7252e2f7a5c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_CSInterface.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_CSInterface { - // Offset: 0x00000268 Length: 0x00000005 + // Offset: 0x00000268 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_CSInterface { @@ -44,13 +44,13 @@ // Offset: 0x00000318 Length: 0x00000000 } .module DoNotBoxStruct_MDArray_CSInterface.exe -// MVID: {5BF2D3C6-24A8-8796-A745-0383C6D3F25B} +// MVID: {5C6C932A-DC23-91F9-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C40000 +// Image base: 0x00AC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl index 61ef3b223cc..b99acf12e13 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_FSInterface { - // Offset: 0x00000270 Length: 0x00000006 + // Offset: 0x00000270 Length: 0x00000007 } .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_FSInterface { @@ -44,13 +44,13 @@ // Offset: 0x00000320 Length: 0x00000000 } .module DoNotBoxStruct_MDArray_FSInterface.exe -// MVID: {5BF2D3C6-8279-DA45-A745-0383C6D3F25B} +// MVID: {5C6C932A-6E4A-10F3-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01640000 +// Image base: 0x00FA0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-30' + .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-6' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'F@5-30'::.ctor + } // end of method 'F@5-6'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(int32 x) cil managed @@ -83,9 +83,9 @@ .line 5,5 : 68,70 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\DoNotBoxStruct\\DoNotBoxStruct_MDArray_FSInterface.fs' IL_0000: ldnull IL_0001: ret - } // end of method 'F@5-30'::Invoke + } // end of method 'F@5-6'::Invoke - } // end of class 'F@5-30' + } // end of class 'F@5-6' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[0...,0...] x) cil managed { @@ -99,7 +99,7 @@ int32) IL_0008: box !!T IL_000d: unbox.any class [mscorlib]System.IObservable`1 - IL_0012: newobj instance void DoNotBoxStruct_MDArray_FSInterface/'F@5-30'::.ctor() + IL_0012: newobj instance void DoNotBoxStruct_MDArray_FSInterface/'F@5-6'::.ctor() IL_0017: tail. IL_0019: call void [FSharp.Core]Microsoft.FSharp.Control.CommonExtensions::AddToObservable(class [mscorlib]System.IObservable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl index e87c74bf321..c5e0aec8574 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth { - // Offset: 0x00000290 Length: 0x00000006 + // Offset: 0x00000290 Length: 0x00000007 } .mresource public FSharpOptimizationData.DoNotBoxStruct_MDArray_FSInterface_NoExtMeth { @@ -44,13 +44,13 @@ // Offset: 0x00000358 Length: 0x00000000 } .module DoNotBoxStruct_MDArray_FSInterface_NoExtMeth.exe -// MVID: {5BF2D3C6-A67D-867A-A745-0383C6D3F25B} +// MVID: {5C6C932A-C675-EDD9-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x007A0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-26' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-2' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -71,7 +71,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'F@6-26'::.ctor + } // end of method 'F@6-2'::.ctor .method assembly hidebysig instance void Invoke(object x, @@ -86,9 +86,9 @@ IL_0001: stloc.0 .line 6,6 : 77,79 '' IL_0002: ret - } // end of method 'F@6-26'::Invoke + } // end of method 'F@6-2'::Invoke - } // end of class 'F@6-26' + } // end of class 'F@6-2' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T[0...,0...] x) cil managed { @@ -101,9 +101,9 @@ IL_0003: readonly. IL_0005: call instance !!T& !!T[0...,0...]::Address(int32, int32) - IL_000a: newobj instance void DoNotBoxStruct_MDArray_FSInterface_NoExtMeth/'F@6-26'::.ctor() - IL_000f: ldftn instance void DoNotBoxStruct_MDArray_FSInterface_NoExtMeth/'F@6-26'::Invoke(object, - int32) + IL_000a: newobj instance void DoNotBoxStruct_MDArray_FSInterface_NoExtMeth/'F@6-2'::.ctor() + IL_000f: ldftn instance void DoNotBoxStruct_MDArray_FSInterface_NoExtMeth/'F@6-2'::Invoke(object, + int32) IL_0015: newobj instance void class [FSharp.Core]Microsoft.FSharp.Control.FSharpHandler`1::.ctor(object, native int) IL_001a: constrained. !!T diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl index bc12a2a7b08..d8331bce79a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_CSInterface.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_CSInterface { - // Offset: 0x00000258 Length: 0x00000004 + // Offset: 0x00000258 Length: 0x00000005 } .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_CSInterface { - // Offset: 0x00000260 Length: 0x0000009C + // Offset: 0x00000268 Length: 0x0000009C } .mresource public FSharpOptimizationDataB.DoNotBoxStruct_NoArray_CSInterface { - // Offset: 0x00000300 Length: 0x00000000 + // Offset: 0x00000308 Length: 0x00000000 } .module DoNotBoxStruct_NoArray_CSInterface.exe -// MVID: {5BF2D3C6-5654-8082-A745-0383C6D3F25B} +// MVID: {5C6C932A-58FF-535C-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x00720000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl index 30e19f7dd58..23b78636aeb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_FSInterface { - // Offset: 0x00000260 Length: 0x00000005 + // Offset: 0x00000260 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_FSInterface { @@ -44,13 +44,13 @@ // Offset: 0x00000310 Length: 0x00000000 } .module DoNotBoxStruct_NoArray_FSInterface.exe -// MVID: {5BF2D3C6-3F8A-B9D0-A745-0383C6D3F25B} +// MVID: {5C6C932A-F5B0-6DAF-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A50000 +// Image base: 0x00800000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-31' + .class auto ansi serializable sealed nested assembly beforefieldinit 'F@5-7' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'F@5-31'::.ctor + } // end of method 'F@5-7'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.Unit Invoke(int32 x) cil managed @@ -83,9 +83,9 @@ .line 5,5 : 59,61 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\DoNotBoxStruct\\DoNotBoxStruct_NoArray_FSInterface.fs' IL_0000: ldnull IL_0001: ret - } // end of method 'F@5-31'::Invoke + } // end of method 'F@5-7'::Invoke - } // end of class 'F@5-31' + } // end of class 'F@5-7' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T x) cil managed { @@ -95,7 +95,7 @@ IL_0000: ldarg.0 IL_0001: box !!T IL_0006: unbox.any class [mscorlib]System.IObservable`1 - IL_000b: newobj instance void DoNotBoxStruct_NoArray_FSInterface/'F@5-31'::.ctor() + IL_000b: newobj instance void DoNotBoxStruct_NoArray_FSInterface/'F@5-7'::.ctor() IL_0010: tail. IL_0012: call void [FSharp.Core]Microsoft.FSharp.Control.CommonExtensions::AddToObservable(class [mscorlib]System.IObservable`1, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl index 2b510a563d5..88ef4ce3a7f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth { - // Offset: 0x00000280 Length: 0x00000005 + // Offset: 0x00000280 Length: 0x00000006 } .mresource public FSharpOptimizationData.DoNotBoxStruct_NoArray_FSInterface_NoExtMeth { @@ -44,13 +44,13 @@ // Offset: 0x00000348 Length: 0x00000000 } .module DoNotBoxStruct_NoArray_FSInterface_NoExtMeth.exe -// MVID: {5BF2D3C6-CD0A-F713-A745-0383C6D3F25B} +// MVID: {5C6C932A-1385-8340-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C60000 +// Image base: 0x006A0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-27' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'F@6-3' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -71,7 +71,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'F@6-27'::.ctor + } // end of method 'F@6-3'::.ctor .method assembly hidebysig instance void Invoke(object x, @@ -86,9 +86,9 @@ IL_0001: stloc.0 .line 6,6 : 68,70 '' IL_0002: ret - } // end of method 'F@6-27'::Invoke + } // end of method 'F@6-3'::Invoke - } // end of class 'F@6-27' + } // end of class 'F@6-3' .method public static void F<(class [FSharp.Core]Microsoft.FSharp.Control.IEvent`2,int32>) T>(!!T x) cil managed { @@ -99,9 +99,9 @@ IL_0000: ldarg.0 IL_0001: stloc.0 IL_0002: ldloca.s V_0 - IL_0004: newobj instance void DoNotBoxStruct_NoArray_FSInterface_NoExtMeth/'F@6-27'::.ctor() - IL_0009: ldftn instance void DoNotBoxStruct_NoArray_FSInterface_NoExtMeth/'F@6-27'::Invoke(object, - int32) + IL_0004: newobj instance void DoNotBoxStruct_NoArray_FSInterface_NoExtMeth/'F@6-3'::.ctor() + IL_0009: ldftn instance void DoNotBoxStruct_NoArray_FSInterface_NoExtMeth/'F@6-3'::Invoke(object, + int32) IL_000f: newobj instance void class [FSharp.Core]Microsoft.FSharp.Control.FSharpHandler`1::.ctor(object, native int) IL_0014: constrained. !!T diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl index d07fcee337e..7c5d2eba400 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/DoNotBoxStruct/DoNotBoxStruct_ToString.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.DoNotBoxStruct_ToString { - // Offset: 0x00000218 Length: 0x00000003 + // Offset: 0x00000218 Length: 0x00000004 } .mresource public FSharpOptimizationData.DoNotBoxStruct_ToString { @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module DoNotBoxStruct_ToString.exe -// MVID: {5BF2D3C6-8D34-C606-A745-0383C6D3F25B} +// MVID: {5C6C932A-CA5F-CEE0-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CD0000 +// Image base: 0x00690000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl index cb08b546b46..c9581895274 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000290 Length: 0x00000000 } .module GenIter01.exe -// MVID: {5BF2D394-F836-DC98-A745-038394D3F25B} +// MVID: {5C6C932A-15AD-8011-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00480000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'squaresOfOneToTen@5-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname squaresOfOneToTen@5 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -84,17 +84,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_0009: stfld int32 GenIter01/squaresOfOneToTen@5::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::current + IL_0010: stfld int32 GenIter01/squaresOfOneToTen@5::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'squaresOfOneToTen@5-3'::.ctor + } // end of method squaresOfOneToTen@5::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\GeneratedIterators\\GenIter01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_0001: ldfld int32 GenIter01/squaresOfOneToTen@5::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,29 +143,29 @@ int32, int32) IL_0034: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0039: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' + IL_0039: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' IL_003e: ldarg.0 IL_003f: ldc.i4.1 - IL_0040: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_0040: stfld int32 GenIter01/squaresOfOneToTen@5::pc .line 5,6 : 7,23 '' IL_0045: ldarg.0 - IL_0046: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' + IL_0046: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' IL_004b: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0050: brfalse.s IL_0073 IL_0052: ldarg.0 - IL_0053: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' + IL_0053: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' IL_0058: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005d: stloc.0 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_0060: stfld int32 GenIter01/squaresOfOneToTen@5::pc .line 6,6 : 18,23 '' IL_0065: ldarg.0 IL_0066: ldloc.0 IL_0067: ldloc.0 IL_0068: mul - IL_0069: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::current + IL_0069: stfld int32 GenIter01/squaresOfOneToTen@5::current IL_006e: ldc.i4.1 IL_006f: ret @@ -175,24 +175,24 @@ IL_0073: ldarg.0 IL_0074: ldc.i4.3 - IL_0075: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_0075: stfld int32 GenIter01/squaresOfOneToTen@5::pc .line 5,6 : 7,23 '' IL_007a: ldarg.0 - IL_007b: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' + IL_007b: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' IL_0080: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0085: nop IL_0086: ldarg.0 IL_0087: ldnull - IL_0088: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' + IL_0088: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' IL_008d: ldarg.0 IL_008e: ldc.i4.3 - IL_008f: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_008f: stfld int32 GenIter01/squaresOfOneToTen@5::pc IL_0094: ldarg.0 IL_0095: ldc.i4.0 - IL_0096: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::current + IL_0096: stfld int32 GenIter01/squaresOfOneToTen@5::current IL_009b: ldc.i4.0 IL_009c: ret - } // end of method 'squaresOfOneToTen@5-3'::GenerateNext + } // end of method squaresOfOneToTen@5::GenerateNext .method public strict virtual instance void Close() cil managed @@ -204,7 +204,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_0001: ldfld int32 GenIter01/squaresOfOneToTen@5::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -220,7 +220,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_001b: ldfld int32 GenIter01/squaresOfOneToTen@5::pc IL_0020: switch ( IL_0037, IL_0039, @@ -258,19 +258,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_004f: stfld int32 GenIter01/squaresOfOneToTen@5::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/'squaresOfOneToTen@5-3'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter01/squaresOfOneToTen@5::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_0063: stfld int32 GenIter01/squaresOfOneToTen@5::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 GenIter01/'squaresOfOneToTen@5-3'::current + IL_006a: stfld int32 GenIter01/squaresOfOneToTen@5::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -310,7 +310,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'squaresOfOneToTen@5-3'::Close + } // end of method squaresOfOneToTen@5::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -319,7 +319,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::pc + IL_0001: ldfld int32 GenIter01/squaresOfOneToTen@5::pc IL_0006: switch ( IL_001d, IL_001f, @@ -361,7 +361,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'squaresOfOneToTen@5-3'::get_CheckClose + } // end of method squaresOfOneToTen@5::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -371,9 +371,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter01/'squaresOfOneToTen@5-3'::current + IL_0001: ldfld int32 GenIter01/squaresOfOneToTen@5::current IL_0006: ret - } // end of method 'squaresOfOneToTen@5-3'::get_LastGenerated + } // end of method squaresOfOneToTen@5::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -385,13 +385,13 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter01/'squaresOfOneToTen@5-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter01/squaresOfOneToTen@5::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'squaresOfOneToTen@5-3'::GetFreshEnumerator + } // end of method squaresOfOneToTen@5::GetFreshEnumerator - } // end of class 'squaresOfOneToTen@5-3' + } // end of class squaresOfOneToTen@5 .method public static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 squaresOfOneToTen() cil managed @@ -402,9 +402,9 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter01/'squaresOfOneToTen@5-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter01/squaresOfOneToTen@5::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: tail. IL_000a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000f: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl index 77129079f47..a1652b2061a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000290 Length: 0x00000000 } .module GenIter02.exe -// MVID: {5BF2D394-F857-DC98-A745-038394D3F25B} +// MVID: {5C6C932A-006A-8011-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00410000 +// Image base: 0x00350000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'squaresOfOneToTenB@5-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname squaresOfOneToTenB@5 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -84,17 +84,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_0009: stfld int32 GenIter02/squaresOfOneToTenB@5::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current + IL_0010: stfld int32 GenIter02/squaresOfOneToTenB@5::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'squaresOfOneToTenB@5-3'::.ctor + } // end of method squaresOfOneToTenB@5::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\GeneratedIterators\\GenIter02.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_0001: ldfld int32 GenIter02/squaresOfOneToTenB@5::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ int32, int32) IL_0037: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_003c: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' + IL_003c: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' IL_0041: ldarg.0 IL_0042: ldc.i4.1 - IL_0043: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_0043: stfld int32 GenIter02/squaresOfOneToTenB@5::pc .line 5,7 : 7,23 '' IL_0048: ldarg.0 - IL_0049: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' + IL_0049: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' IL_004e: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0053: brfalse.s IL_0086 IL_0055: ldarg.0 - IL_0056: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' + IL_0056: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' IL_005b: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0060: stloc.0 .line 6,6 : 12,27 '' @@ -164,13 +164,13 @@ IL_0070: pop IL_0071: ldarg.0 IL_0072: ldc.i4.2 - IL_0073: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_0073: stfld int32 GenIter02/squaresOfOneToTenB@5::pc .line 7,7 : 12,23 '' IL_0078: ldarg.0 IL_0079: ldloc.0 IL_007a: ldloc.0 IL_007b: mul - IL_007c: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current + IL_007c: stfld int32 GenIter02/squaresOfOneToTenB@5::current IL_0081: ldc.i4.1 IL_0082: ret @@ -180,24 +180,24 @@ IL_0086: ldarg.0 IL_0087: ldc.i4.3 - IL_0088: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_0088: stfld int32 GenIter02/squaresOfOneToTenB@5::pc .line 5,7 : 7,23 '' IL_008d: ldarg.0 - IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' + IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' IL_0093: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0098: nop IL_0099: ldarg.0 IL_009a: ldnull - IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' + IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' IL_00a0: ldarg.0 IL_00a1: ldc.i4.3 - IL_00a2: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_00a2: stfld int32 GenIter02/squaresOfOneToTenB@5::pc IL_00a7: ldarg.0 IL_00a8: ldc.i4.0 - IL_00a9: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current + IL_00a9: stfld int32 GenIter02/squaresOfOneToTenB@5::current IL_00ae: ldc.i4.0 IL_00af: ret - } // end of method 'squaresOfOneToTenB@5-3'::GenerateNext + } // end of method squaresOfOneToTenB@5::GenerateNext .method public strict virtual instance void Close() cil managed @@ -209,7 +209,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_0001: ldfld int32 GenIter02/squaresOfOneToTenB@5::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -225,7 +225,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_001b: ldfld int32 GenIter02/squaresOfOneToTenB@5::pc IL_0020: switch ( IL_0037, IL_0039, @@ -263,19 +263,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_004f: stfld int32 GenIter02/squaresOfOneToTenB@5::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/'squaresOfOneToTenB@5-3'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter02/squaresOfOneToTenB@5::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_0063: stfld int32 GenIter02/squaresOfOneToTenB@5::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current + IL_006a: stfld int32 GenIter02/squaresOfOneToTenB@5::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -315,7 +315,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'squaresOfOneToTenB@5-3'::Close + } // end of method squaresOfOneToTenB@5::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -324,7 +324,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::pc + IL_0001: ldfld int32 GenIter02/squaresOfOneToTenB@5::pc IL_0006: switch ( IL_001d, IL_001f, @@ -366,7 +366,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'squaresOfOneToTenB@5-3'::get_CheckClose + } // end of method squaresOfOneToTenB@5::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -376,9 +376,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter02/'squaresOfOneToTenB@5-3'::current + IL_0001: ldfld int32 GenIter02/squaresOfOneToTenB@5::current IL_0006: ret - } // end of method 'squaresOfOneToTenB@5-3'::get_LastGenerated + } // end of method squaresOfOneToTenB@5::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -390,13 +390,13 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter02/'squaresOfOneToTenB@5-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter02/squaresOfOneToTenB@5::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'squaresOfOneToTenB@5-3'::GetFreshEnumerator + } // end of method squaresOfOneToTenB@5::GetFreshEnumerator - } // end of class 'squaresOfOneToTenB@5-3' + } // end of class squaresOfOneToTenB@5 .method public static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 squaresOfOneToTenB() cil managed @@ -407,9 +407,9 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter02/'squaresOfOneToTenB@5-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter02/squaresOfOneToTenB@5::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: tail. IL_000a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000f: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl index d0896ee0018..cf22ac4782f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000290 Length: 0x00000000 } .module GenIter03.exe -// MVID: {5BF2D394-F77C-DC98-A745-038394D3F25B} +// MVID: {5C6C932A-FCAB-8010-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00360000 +// Image base: 0x01990000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'squaresOfOneToTenC@4-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname squaresOfOneToTenC@4 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -84,17 +84,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0009: stfld int32 GenIter03/squaresOfOneToTenC@4::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current + IL_0010: stfld int32 GenIter03/squaresOfOneToTenC@4::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'squaresOfOneToTenC@4-3'::.ctor + } // end of method squaresOfOneToTenC@4::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\GeneratedIterators\\GenIter03.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0001: ldfld int32 GenIter03/squaresOfOneToTenC@4::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,29 +143,29 @@ int32, int32) IL_0035: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_003a: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' + IL_003a: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' IL_003f: ldarg.0 IL_0040: ldc.i4.1 - IL_0041: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0041: stfld int32 GenIter03/squaresOfOneToTenC@4::pc .line 4,4 : 30,55 '' IL_0046: ldarg.0 - IL_0047: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' + IL_0047: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' IL_004c: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0051: brfalse.s IL_0074 IL_0053: ldarg.0 - IL_0054: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' + IL_0054: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' IL_0059: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005e: stloc.0 IL_005f: ldarg.0 IL_0060: ldc.i4.2 - IL_0061: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0061: stfld int32 GenIter03/squaresOfOneToTenC@4::pc .line 4,4 : 50,55 '' IL_0066: ldarg.0 IL_0067: ldloc.0 IL_0068: ldloc.0 IL_0069: mul - IL_006a: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current + IL_006a: stfld int32 GenIter03/squaresOfOneToTenC@4::current IL_006f: ldc.i4.1 IL_0070: ret @@ -175,24 +175,24 @@ IL_0074: ldarg.0 IL_0075: ldc.i4.3 - IL_0076: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0076: stfld int32 GenIter03/squaresOfOneToTenC@4::pc .line 4,4 : 30,55 '' IL_007b: ldarg.0 - IL_007c: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' + IL_007c: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' IL_0081: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0086: nop IL_0087: ldarg.0 IL_0088: ldnull - IL_0089: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' + IL_0089: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' IL_008e: ldarg.0 IL_008f: ldc.i4.3 - IL_0090: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0090: stfld int32 GenIter03/squaresOfOneToTenC@4::pc IL_0095: ldarg.0 IL_0096: ldc.i4.0 - IL_0097: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current + IL_0097: stfld int32 GenIter03/squaresOfOneToTenC@4::current IL_009c: ldc.i4.0 IL_009d: ret - } // end of method 'squaresOfOneToTenC@4-3'::GenerateNext + } // end of method squaresOfOneToTenC@4::GenerateNext .method public strict virtual instance void Close() cil managed @@ -204,7 +204,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0001: ldfld int32 GenIter03/squaresOfOneToTenC@4::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -220,7 +220,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_001b: ldfld int32 GenIter03/squaresOfOneToTenC@4::pc IL_0020: switch ( IL_0037, IL_0039, @@ -258,19 +258,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_004f: stfld int32 GenIter03/squaresOfOneToTenC@4::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/'squaresOfOneToTenC@4-3'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter03/squaresOfOneToTenC@4::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0063: stfld int32 GenIter03/squaresOfOneToTenC@4::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current + IL_006a: stfld int32 GenIter03/squaresOfOneToTenC@4::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -310,7 +310,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'squaresOfOneToTenC@4-3'::Close + } // end of method squaresOfOneToTenC@4::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -319,7 +319,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::pc + IL_0001: ldfld int32 GenIter03/squaresOfOneToTenC@4::pc IL_0006: switch ( IL_001d, IL_001f, @@ -361,7 +361,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'squaresOfOneToTenC@4-3'::get_CheckClose + } // end of method squaresOfOneToTenC@4::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -371,9 +371,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter03/'squaresOfOneToTenC@4-3'::current + IL_0001: ldfld int32 GenIter03/squaresOfOneToTenC@4::current IL_0006: ret - } // end of method 'squaresOfOneToTenC@4-3'::get_LastGenerated + } // end of method squaresOfOneToTenC@4::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -385,13 +385,13 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter03/'squaresOfOneToTenC@4-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter03/squaresOfOneToTenC@4::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'squaresOfOneToTenC@4-3'::GetFreshEnumerator + } // end of method squaresOfOneToTenC@4::GetFreshEnumerator - } // end of class 'squaresOfOneToTenC@4-3' + } // end of class squaresOfOneToTenC@4 .method public static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 squaresOfOneToTenC() cil managed @@ -402,9 +402,9 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter03/'squaresOfOneToTenC@4-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter03/squaresOfOneToTenC@4::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: tail. IL_000a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000f: ret diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl index 3d43451a8b7..6394dc8f42a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/GeneratedIterators/GenIter04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000280 Length: 0x00000000 } .module GenIter04.exe -// MVID: {5BF2D394-F79D-DC98-A745-038394D3F25B} +// MVID: {5C6C932A-0870-8011-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010E0000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'squaresOfOneToTenD@4-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname squaresOfOneToTenD@4 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -84,17 +84,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0009: stfld int32 GenIter04/squaresOfOneToTenD@4::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current + IL_0010: stfld int32 GenIter04/squaresOfOneToTenD@4::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'squaresOfOneToTenD@4-3'::.ctor + } // end of method squaresOfOneToTenD@4::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\GeneratedIterators\\GenIter04.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0001: ldfld int32 GenIter04/squaresOfOneToTenD@4::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,29 +143,29 @@ int32, int32) IL_0035: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_003a: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' + IL_003a: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' IL_003f: ldarg.0 IL_0040: ldc.i4.1 - IL_0041: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0041: stfld int32 GenIter04/squaresOfOneToTenD@4::pc .line 4,4 : 28,53 '' IL_0046: ldarg.0 - IL_0047: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' + IL_0047: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' IL_004c: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0051: brfalse.s IL_0074 IL_0053: ldarg.0 - IL_0054: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' + IL_0054: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' IL_0059: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005e: stloc.0 IL_005f: ldarg.0 IL_0060: ldc.i4.2 - IL_0061: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0061: stfld int32 GenIter04/squaresOfOneToTenD@4::pc .line 4,4 : 48,53 '' IL_0066: ldarg.0 IL_0067: ldloc.0 IL_0068: ldloc.0 IL_0069: mul - IL_006a: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current + IL_006a: stfld int32 GenIter04/squaresOfOneToTenD@4::current IL_006f: ldc.i4.1 IL_0070: ret @@ -175,24 +175,24 @@ IL_0074: ldarg.0 IL_0075: ldc.i4.3 - IL_0076: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0076: stfld int32 GenIter04/squaresOfOneToTenD@4::pc .line 4,4 : 28,53 '' IL_007b: ldarg.0 - IL_007c: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' + IL_007c: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' IL_0081: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0086: nop IL_0087: ldarg.0 IL_0088: ldnull - IL_0089: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' + IL_0089: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' IL_008e: ldarg.0 IL_008f: ldc.i4.3 - IL_0090: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0090: stfld int32 GenIter04/squaresOfOneToTenD@4::pc IL_0095: ldarg.0 IL_0096: ldc.i4.0 - IL_0097: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current + IL_0097: stfld int32 GenIter04/squaresOfOneToTenD@4::current IL_009c: ldc.i4.0 IL_009d: ret - } // end of method 'squaresOfOneToTenD@4-3'::GenerateNext + } // end of method squaresOfOneToTenD@4::GenerateNext .method public strict virtual instance void Close() cil managed @@ -204,7 +204,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0001: ldfld int32 GenIter04/squaresOfOneToTenD@4::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -220,7 +220,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_001b: ldfld int32 GenIter04/squaresOfOneToTenD@4::pc IL_0020: switch ( IL_0037, IL_0039, @@ -258,19 +258,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_004f: stfld int32 GenIter04/squaresOfOneToTenD@4::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/'squaresOfOneToTenD@4-3'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 GenIter04/squaresOfOneToTenD@4::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0063: stfld int32 GenIter04/squaresOfOneToTenD@4::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current + IL_006a: stfld int32 GenIter04/squaresOfOneToTenD@4::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -310,7 +310,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'squaresOfOneToTenD@4-3'::Close + } // end of method squaresOfOneToTenD@4::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -319,7 +319,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::pc + IL_0001: ldfld int32 GenIter04/squaresOfOneToTenD@4::pc IL_0006: switch ( IL_001d, IL_001f, @@ -361,7 +361,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'squaresOfOneToTenD@4-3'::get_CheckClose + } // end of method squaresOfOneToTenD@4::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -371,9 +371,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 GenIter04/'squaresOfOneToTenD@4-3'::current + IL_0001: ldfld int32 GenIter04/squaresOfOneToTenD@4::current IL_0006: ret - } // end of method 'squaresOfOneToTenD@4-3'::get_LastGenerated + } // end of method squaresOfOneToTenD@4::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -385,20 +385,20 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter04/'squaresOfOneToTenD@4-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter04/squaresOfOneToTenD@4::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'squaresOfOneToTenD@4-3'::GetFreshEnumerator + } // end of method squaresOfOneToTenD@4::GetFreshEnumerator - } // end of class 'squaresOfOneToTenD@4-3' + } // end of class squaresOfOneToTenD@4 .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_squaresOfOneToTenD() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$GenIter04::'squaresOfOneToTenD@4-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$GenIter04::squaresOfOneToTenD@4 IL_0005: ret } // end of method GenIter04::get_squaresOfOneToTenD @@ -413,7 +413,7 @@ .class private abstract auto ansi sealed ''.$GenIter04 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'squaresOfOneToTenD@4-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 squaresOfOneToTenD@4 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -429,12 +429,12 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void GenIter04/'squaresOfOneToTenD@4-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void GenIter04/squaresOfOneToTenD@4::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000d: dup - IL_000e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$GenIter04::'squaresOfOneToTenD@4-6' + IL_000e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$GenIter04::squaresOfOneToTenD@4 IL_0013: stloc.0 IL_0014: ret } // end of method $GenIter04::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl index 46960c84f92..cff1acac920 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002C0 Length: 0x00000000 } .module InequalityComparison01.exe -// MVID: {5BF2D394-263A-E6D5-A745-038394D3F25B} +// MVID: {5C6C932A-4C3D-9640-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010D0000 +// Image base: 0x00380000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl index 9eaaf64912e..9aaef3fc6af 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002C0 Length: 0x00000000 } .module InequalityComparison02.exe -// MVID: {5BF2D394-263A-E72C-A745-038394D3F25B} +// MVID: {5C6C932A-2E18-F138-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x00EC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl index 4e41af1303f..c8a32a37ea5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002C0 Length: 0x00000000 } .module InequalityComparison03.exe -// MVID: {5BF2D394-263A-E70B-A745-038394D3F25B} +// MVID: {5C6C932A-5D73-9FEA-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03090000 +// Image base: 0x00690000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl index b3644992f25..11311ff8356 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002C0 Length: 0x00000000 } .module InequalityComparison04.exe -// MVID: {5BF2D394-263A-E772-A745-038394D3F25B} +// MVID: {5C6C932A-9F76-4F9E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02870000 +// Image base: 0x01020000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl index da1f8d8cd87..ed6a91f4951 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/InequalityComparison/InequalityComparison05.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.InequalityComparison05 { - // Offset: 0x00000248 Length: 0x00000009 + // Offset: 0x00000248 Length: 0x0000000A } .mresource public FSharpOptimizationData.InequalityComparison05 { @@ -44,13 +44,13 @@ // Offset: 0x000002E8 Length: 0x00000000 } .module InequalityComparison05.exe -// MVID: {5BF2D394-263A-E751-A745-038394D3F25B} +// MVID: {5C6C932A-C9D1-9458-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00350000 +// Image base: 0x00E70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl index 413acecfd9c..268c5414695 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest1.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest1.exe -// MVID: {5BF2DEA8-50CF-F6CE-A745-0383A8DEF25B} +// MVID: {5C6C932A-9EBF-875E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02E40000 +// Image base: 0x015B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl index 13fb77e4c23..9aa0434ca63 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest2.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest2.exe -// MVID: {5BF2DEA8-D3DE-B780-A745-0383A8DEF25B} +// MVID: {5C6C932A-B402-875E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x014E0000 +// Image base: 0x00D30000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl index 2ec71e9a369..ce72793ef65 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest3.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000358 Length: 0x00000000 } .module ListExpressionSteppingTest3.exe -// MVID: {5BF2DEA8-AE45-39B4-A745-0383A8DEF25B} +// MVID: {5C6C932A-96C1-875E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00EF0000 +// Image base: 0x01270000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl index 5b3d1ca57ff..d95c3a80396 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest4.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest4.exe -// MVID: {5BF2DEA8-3154-FA67-A745-0383A8DEF25B} +// MVID: {5C6C932A-AB04-875E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00B40000 +// Image base: 0x00850000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl index 92c8bdf9ff9..b3248010ee6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest5.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000340 Length: 0x00000000 } .module ListExpressionSteppingTest5.exe -// MVID: {5BF2DEA8-CBE3-BFEA-A745-0383A8DEF25B} +// MVID: {5C6C932A-AEC3-875E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01710000 +// Image base: 0x01600000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl index 62c55b750db..b33bcbc3263 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/ListExpressionStepping/ListExpressionSteppingTest6.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000378 Length: 0x00000000 } .module ListExpressionSteppingTest6.exe -// MVID: {5BF2DEA8-98A2-AB14-A745-0383A8DEF25B} +// MVID: {5C6C932A-C406-875E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02FD0000 +// Image base: 0x00980000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl index 5d1b5f4b0a4..efc72a85013 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/LiteralValue/LiteralValue.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000328 Length: 0x00000000 } .module LiteralValue.exe -// MVID: {5BF2DEA8-196E-5E7E-A745-0383A8DEF25B} +// MVID: {5C6C932A-80D4-A6FF-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x016C0000 +// Image base: 0x00370000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl index cbcd3e2e5e1..50299d0f269 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.AggressiveInlining.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003F8 Length: 0x00000000 } .module MethodImplAttribute.AggressiveInlining.dll -// MVID: {5BF2DEA8-66DC-14D3-A745-0383A8DEF25B} +// MVID: {5C6C932A-4A5F-46FA-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x00E20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl index 21724a160b1..cf747e4e231 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.ForwardRef.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003D8 Length: 0x00000000 } .module MethodImplAttribute.ForwardRef.dll -// MVID: {5BF2DEA8-C517-03FF-A745-0383A8DEF25B} +// MVID: {5C6C932A-FC69-F259-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x011B0000 +// Image base: 0x007C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl index e18cd0224bb..251e965e0e8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.InternalCall.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.InternalCall.dll -// MVID: {5BF2DEA8-FBF7-6A35-A745-0383A8DEF25B} +// MVID: {5C6C932A-6140-610F-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00310000 +// Image base: 0x01300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl index c2f7ca1de4f..1ee68051710 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoInlining.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003D8 Length: 0x00000000 } .module MethodImplAttribute.NoInlining.dll -// MVID: {5BF2DEA8-F47B-58B3-A745-0383A8DEF25B} +// MVID: {5C6C932A-D400-3767-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017D0000 +// Image base: 0x01210000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl index f7db3b0f70b..eebd1c90398 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.NoOptimization.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E8 Length: 0x00000000 } .module MethodImplAttribute.NoOptimization.dll -// MVID: {5BF2DEA8-D394-5177-A745-0383A8DEF25B} +// MVID: {5C6C932A-D467-7B77-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x00360000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl index 34b9e37a71f..1131b3a44a9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.PreserveSig.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.PreserveSig.dll -// MVID: {5BF2DEA8-0C64-31CC-A745-0383A8DEF25B} +// MVID: {5C6C932A-96C2-55CD-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01630000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl index 097e57afbb9..f4b9d1fdf6f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Synchronized.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003E0 Length: 0x00000000 } .module MethodImplAttribute.Synchronized.dll -// MVID: {5BF2DEA8-D8F1-2CC7-A745-0383A8DEF25B} +// MVID: {5C6C932A-F621-FEF0-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FA0000 +// Image base: 0x00390000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl index 68d55a33d71..3e204b034e1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/MethodImplAttribute/MethodImplAttribute.Unmanaged.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003D0 Length: 0x00000000 } .module MethodImplAttribute.Unmanaged.dll -// MVID: {5BF2DEA8-FF34-309C-A745-0383A8DEF25B} +// MVID: {5C6C932A-F5DD-260B-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CE0000 +// Image base: 0x011E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl index e1b8cb13459..3986beea053 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/AbstractClass.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003F0 Length: 0x00000003 } .module AbstractClass.exe -// MVID: {5BF2DEA8-333C-8BAF-A745-0383A8DEF25B} +// MVID: {5C6C932A-2F62-D61B-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BE0000 +// Image base: 0x01100000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl index 522ee756d6d..e246082a556 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ArgumentNamesInClosures01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000004F0 Length: 0x0000000F } .module ArgumentNamesInClosures01.dll -// MVID: {5BF2DEA8-39CA-41B5-A745-0383A8DEF25B} +// MVID: {5C6C932A-0D49-6A8E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x033A0000 +// Image base: 0x01540000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl index 793dafe34dd..1903776ee8f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CodeGenRenamings01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000518 Length: 0x00000000 } .module CodeGenRenamings01.exe -// MVID: {5BF2DEA8-8173-986B-A745-0383A8DEF25B} +// MVID: {5C6C932A-B73A-4856-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02BA0000 +// Image base: 0x00800000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl index c02a0d6c02b..4ea475afa47 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/CustomAttributeGenericParameter01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.CustomAttributeGenericParameter01 { - // Offset: 0x000002D0 Length: 0x00000005 + // Offset: 0x000002D0 Length: 0x00000006 } .mresource public FSharpOptimizationData.CustomAttributeGenericParameter01 { @@ -44,13 +44,13 @@ // Offset: 0x00000360 Length: 0x00000000 } .module CustomAttributeGenericParameter01.exe -// MVID: {5BF2DEA8-F08A-F524-A745-0383A8DEF25B} +// MVID: {5C6C932A-BACA-6C4E-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00300000 +// Image base: 0x007B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl index 1a313f7b2b6..c3927cb37c4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Decimal01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Decimal01.exe -// MVID: {5BF2DEA8-F150-FA46-A745-0383A8DEF25B} +// MVID: {5C6C932A-FEF8-4534-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03080000 +// Image base: 0x00C20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl index 93c73fa6ead..750ba7ac9cd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EntryPoint01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000308 Length: 0x00000000 } .module EntryPoint01.exe -// MVID: {5BF2DEA8-9846-72C1-A745-0383A8DEF25B} +// MVID: {5C6C932A-2BE3-0781-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02F90000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl index 1306998b9d0..69534ae8836 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/EqualsOnUnions01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.EqualsOnUnions01 { - // Offset: 0x00000648 Length: 0x00000079 + // Offset: 0x00000648 Length: 0x0000007B } .mresource public FSharpOptimizationData.EqualsOnUnions01 { @@ -44,13 +44,13 @@ // Offset: 0x00000898 Length: 0x0000002A } .module EqualsOnUnions01.exe -// MVID: {5BF2DEA8-BBFB-14A0-A745-0383A8DEF25B} +// MVID: {5C6C932A-3FB9-D1D2-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01330000 +// Image base: 0x012E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl index ca5cd5c7374..4ec67498f33 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module ForLoop01.exe -// MVID: {5BF2DEA8-1795-791C-A745-0383A8DEF25B} +// MVID: {5C6C932A-192A-DA0D-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01260000 +// Image base: 0x01290000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl index f3a501b83c5..e7501af908a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module ForLoop02.exe -// MVID: {5BF2DEA8-1736-791C-A745-0383A8DEF25B} +// MVID: {5C6C932A-04E7-DA0D-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02A30000 +// Image base: 0x01210000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl index ab6ff9e751b..43a4dccdab2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ForLoop03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000298 Length: 0x00000000 } .module ForLoop03.exe -// MVID: {5BF2DEA8-1757-791C-A745-0383A8DEF25B} +// MVID: {5C6C932A-2128-DA0D-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02F30000 +// Image base: 0x007D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl index ca61b156a50..cc949514fff 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GeneralizationOnUnions01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.GeneralizationOnUnions01 { - // Offset: 0x00000698 Length: 0x0000007D + // Offset: 0x00000698 Length: 0x0000007F } .mresource public FSharpOptimizationData.GeneralizationOnUnions01 { @@ -44,13 +44,13 @@ // Offset: 0x00000918 Length: 0x0000002A } .module GeneralizationOnUnions01.exe -// MVID: {5BF2DEA8-4CA2-8CD1-A745-0383A8DEF25B} +// MVID: {5C6C932A-CDC6-3158-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x019C0000 +// Image base: 0x00480000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl index a2a6f326bfd..aaec73bfdd5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/GenericTypeStaticField01.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.GenericTypeStaticField01 { - // Offset: 0x00000618 Length: 0x00000037 + // Offset: 0x00000618 Length: 0x0000004C } .mresource public FSharpOptimizationData.GenericTypeStaticField01 { - // Offset: 0x00000658 Length: 0x000001E7 + // Offset: 0x00000668 Length: 0x000001E7 } .mresource public FSharpOptimizationDataB.GenericTypeStaticField01 { - // Offset: 0x00000848 Length: 0x00000012 + // Offset: 0x00000858 Length: 0x00000018 } .module GenericTypeStaticField01.exe -// MVID: {5BF2DEA8-1E75-7E6B-A745-0383A8DEF25B} +// MVID: {5C6C932A-315A-51B2-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x011D0000 +// Image base: 0x00350000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl index 2f3722d1a28..1a00d01358f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/IfThenElse01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module IfThenElse01.dll -// MVID: {5BF2DEA8-2D6C-0B5D-A745-0383A8DEF25B} +// MVID: {5C6C932A-5AC2-49CA-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01820000 +// Image base: 0x01750000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl index 9fa45c755c2..105d10f0c34 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/LetIfThenElse01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.LetIfThenElse01 { - // Offset: 0x000001F0 Length: 0x00000006 + // Offset: 0x000001F0 Length: 0x00000007 } .mresource public FSharpOptimizationData.LetIfThenElse01 { @@ -44,13 +44,13 @@ // Offset: 0x00000280 Length: 0x00000000 } .module LetIfThenElse01.exe -// MVID: {5BF2DEA8-BE5A-D8FD-A745-0383A8DEF25B} +// MVID: {5C6C932A-21CD-AB75-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01830000 +// Image base: 0x01920000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl index d1925d80451..31f7ed975eb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Lock01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000200 Length: 0x00000000 } .module Lock01.exe -// MVID: {5BF2DEA8-2BCA-B308-A745-0383A8DEF25B} +// MVID: {5C6C932A-E45C-9AF4-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CB0000 +// Image base: 0x012D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl index b62c614ce36..01aab58aeab 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Marshal.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000005A0 Length: 0x00000000 } .module Marshal.exe -// MVID: {5BF2DEA8-7500-369C-A745-0383A8DEF25B} +// MVID: {5C6C932A-BFDE-1069-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013B0000 +// Image base: 0x00DE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl index ea083c4bf66..05ed35e280f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline.il.bsl @@ -40,13 +40,13 @@ // Offset: 0x00000420 Length: 0x00000009 } .module MethodImplNoInline.exe -// MVID: {5BF2DEA8-4480-09E2-A745-0383A8DEF25B} +// MVID: {5C6C932A-0639-3002-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A40000 +// Image base: 0x01800000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl index 442b098c5e0..03025764f42 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/MethodImplNoInline02.il.bsl @@ -40,13 +40,13 @@ // Offset: 0x00000428 Length: 0x00000009 } .module MethodImplNoInline02.exe -// MVID: {5BF2DEA8-084F-1A8E-A745-0383A8DEF25B} +// MVID: {5C6C932A-95A3-A4EB-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010F0000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl index 66a0b09cb37..7e97e8f943c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/ModuleWithExpression01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002D8 Length: 0x00000000 } .module ModuleWithExpression01.exe -// MVID: {5BF2DEA8-CD1E-A8B4-A745-0383A8DEF25B} +// MVID: {5C6C932A-EE8D-AD63-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02D70000 +// Image base: 0x02A90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl index 45688bab3db..d98afc1af52 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NoBoxingOnDispose01.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.NoBoxingOnDispose01 { - // Offset: 0x00000228 Length: 0x00000004 + // Offset: 0x00000228 Length: 0x00000005 } .mresource public FSharpOptimizationData.NoBoxingOnDispose01 { - // Offset: 0x00000230 Length: 0x0000007F + // Offset: 0x00000238 Length: 0x0000007F } .mresource public FSharpOptimizationDataB.NoBoxingOnDispose01 { - // Offset: 0x000002B8 Length: 0x00000000 + // Offset: 0x000002C0 Length: 0x00000000 } .module NoBoxingOnDispose01.exe -// MVID: {5BF2DEA8-4EA9-C934-A745-0383A8DEF25B} +// MVID: {5C6C932A-C029-5AC1-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C50000 +// Image base: 0x00E80000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl index 43fe172a53b..dfd1d6d45a0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/NonEscapingArguments02.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.NonEscapingArguments02 { - // Offset: 0x00000368 Length: 0x00000017 + // Offset: 0x00000368 Length: 0x0000001C } .mresource public FSharpOptimizationData.NonEscapingArguments02 { @@ -41,16 +41,16 @@ } .mresource public FSharpOptimizationDataB.NonEscapingArguments02 { - // Offset: 0x00000530 Length: 0x0000000B + // Offset: 0x00000530 Length: 0x0000000D } .module NonEscapingArguments02.dll -// MVID: {5BF2DEA8-BB56-6582-A745-0383A8DEF25B} +// MVID: {5C6C932A-3633-A298-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CF0000 +// Image base: 0x01770000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl index a1079dc9b47..321966a70e5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/PreserveSig.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000370 Length: 0x00000000 } .module PreserveSig.dll -// MVID: {5BF2DEA8-E8CC-64FE-A745-0383A8DEF25B} +// MVID: {5C6C932A-7097-7796-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x026B0000 +// Image base: 0x009A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl index 794ccadd811..e90707ba692 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Seq_for_all01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000238 Length: 0x00000000 } .module Seq_for_all01.exe -// MVID: {5BF2DEA8-D30D-BA80-A745-0383A8DEF25B} +// MVID: {5C6C932A-1CE8-5D72-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00640000 +// Image base: 0x00A90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl index 2a437387e71..5f2e997939a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.Structs01 { - // Offset: 0x00000748 Length: 0x00000091 + // Offset: 0x00000748 Length: 0x00000093 } .mresource public FSharpOptimizationData.Structs01 { @@ -44,13 +44,13 @@ // Offset: 0x00000A18 Length: 0x00000035 } .module Structs01.exe -// MVID: {5BF2DEA8-701F-5E27-A745-0383A8DEF25B} +// MVID: {5C6C932A-A153-39D7-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x014A0000 +// Image base: 0x012F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl index e8a4ad12dce..c3b2003669e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/Structs02.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Structs02 { - // Offset: 0x00000780 Length: 0x00000094 + // Offset: 0x00000780 Length: 0x00000096 } .mresource public FSharpOptimizationData.Structs02 { - // Offset: 0x00000818 Length: 0x00000237 + // Offset: 0x00000820 Length: 0x00000237 } .mresource public FSharpOptimizationDataB.Structs02 { - // Offset: 0x00000A58 Length: 0x00000035 + // Offset: 0x00000A60 Length: 0x00000035 } .module Structs02.exe -// MVID: {5BF2DEA8-7040-5E27-A745-0383A8DEF25B} +// MVID: {5C6C932A-BE14-39D7-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03050000 +// Image base: 0x00D30000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl index b6a7d10503f..27c6a3dd1f5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/StructsAsArrayElements01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.StructsAsArrayElements01 { - // Offset: 0x00000760 Length: 0x00000099 + // Offset: 0x00000760 Length: 0x0000009B } .mresource public FSharpOptimizationData.StructsAsArrayElements01 { @@ -44,13 +44,13 @@ // Offset: 0x00000A30 Length: 0x00000038 } .module StructsAsArrayElements01.dll -// MVID: {5BF2DEA8-29F3-6E68-A745-0383A8DEF25B} +// MVID: {5C6C932A-0C0D-4AEA-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CE0000 +// Image base: 0x01240000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl index b3298f901ad..e4d356babb9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/TryWith_NoFilterBlocks01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001E0 Length: 0x00000000 } .module TryWith_NoFilterBlocks01.exe -// MVID: {5BF2DEA8-3DEF-9A40-A745-0383A8DEF25B} +// MVID: {5C6C932A-6F86-BEF5-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CF0000 +// Image base: 0x00DE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl index 357e0e5535e..e1a504535aa 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Misc/cas.il.bsl @@ -51,13 +51,13 @@ // Offset: 0x00000758 Length: 0x00000008 } .module cas.exe -// MVID: {5BF2DEA8-35EA-18E3-A745-0383A8DEF25B} +// MVID: {5C6C932A-AB6F-5076-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00890000 +// Image base: 0x00F20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl index fa99d2c6633..034d32e8c21 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation01.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Mutation01 { - // Offset: 0x00000700 Length: 0x00000094 + // Offset: 0x00000700 Length: 0x00000098 } .mresource public FSharpOptimizationData.Mutation01 { - // Offset: 0x00000798 Length: 0x00000220 + // Offset: 0x000007A0 Length: 0x00000220 } .mresource public FSharpOptimizationDataB.Mutation01 { - // Offset: 0x000009C0 Length: 0x00000038 + // Offset: 0x000009C8 Length: 0x00000039 } .module Mutation01.exe -// MVID: {5BF2DEA8-8C6A-2EAE-A745-0383A8DEF25B} +// MVID: {5C6C932A-B7C4-3CC1-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F80000 +// Image base: 0x01800000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl index ec7e13275cf..cb0bf75c2cc 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000220 Length: 0x00000000 } .module Mutation02.exe -// MVID: {5BF2DEA8-8C6A-2F0D-A745-0383A8DEF25B} +// MVID: {5C6C932A-F355-8B25-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01730000 +// Image base: 0x00490000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl index a669940a9d8..16c36210623 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000220 Length: 0x00000000 } .module Mutation03.exe -// MVID: {5BF2DEA8-8C6A-2EEC-A745-0383A8DEF25B} +// MVID: {5C6C932A-C3FA-DC73-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A70000 +// Image base: 0x01200000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl index 32946d7cd3e..1ab0ab25dd2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000238 Length: 0x00000000 } .module Mutation04.exe -// MVID: {5BF2DEA8-8C6A-2E43-A745-0383A8DEF25B} +// MVID: {5C6C932A-648B-8363-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01670000 +// Image base: 0x012F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl index 7b09e47610a..bfc61b7f359 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Mutation/Mutation05.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000648 Length: 0x00000016 } .module Mutation05.exe -// MVID: {5BF2DEA8-8C6A-2E22-A745-0383A8DEF25B} +// MVID: {5C6C932A-3A30-3EA9-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FC0000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl index bc75ff246a3..1f3c46bb0f0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Operators/comparison_decimal01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001F0 Length: 0x00000000 } .module comparison_decimal01.exe -// MVID: {5BF2DEA8-76D8-7EE3-A745-0383A8DEF25B} +// MVID: {5C6C932A-0B02-E065-A745-03832A936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02C80000 +// Image base: 0x01610000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl index 320bc8526ac..ba70a0cd54a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Aggregates01.il.bsl @@ -53,13 +53,13 @@ // Offset: 0x00000860 Length: 0x00000000 } .module Linq101Aggregates01.exe -// MVID: {5BF2D3C6-D281-4783-A745-0383C6D3F25B} +// MVID: {5C6C932B-CA9F-F767-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01140000 +// Image base: 0x00490000 // =============== CLASS MEMBERS DECLARATION =================== @@ -68,7 +68,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'uniqueFactors@12-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname uniqueFactors@12 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -93,17 +93,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_0009: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current + IL_0010: stfld int32 Linq101Aggregates01/uniqueFactors@12::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'uniqueFactors@12-6'::.ctor + } // end of method uniqueFactors@12::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -115,7 +115,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Aggregates01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/uniqueFactors@12::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -148,18 +148,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_factorsOf300() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_003d: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc .line 12,12 : 9,33 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 12,12 : 9,33 '' @@ -167,11 +167,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_005f: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc .line 13,13 : 9,17 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current + IL_0066: stfld int32 Linq101Aggregates01/uniqueFactors@12::current IL_006b: ldc.i4.1 IL_006c: ret @@ -181,24 +181,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_0072: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc .line 12,12 : 9,33 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_008c: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current + IL_0093: stfld int32 Linq101Aggregates01/uniqueFactors@12::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'uniqueFactors@12-6'::GenerateNext + } // end of method uniqueFactors@12::GenerateNext .method public strict virtual instance void Close() cil managed @@ -210,7 +210,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/uniqueFactors@12::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -226,7 +226,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/uniqueFactors@12::pc IL_0020: switch ( IL_0037, IL_0039, @@ -264,19 +264,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'uniqueFactors@12-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/uniqueFactors@12::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/uniqueFactors@12::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current + IL_006a: stfld int32 Linq101Aggregates01/uniqueFactors@12::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -316,7 +316,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'uniqueFactors@12-6'::Close + } // end of method uniqueFactors@12::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -325,7 +325,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/uniqueFactors@12::pc IL_0006: switch ( IL_001d, IL_001f, @@ -367,7 +367,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'uniqueFactors@12-6'::get_CheckClose + } // end of method uniqueFactors@12::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -377,9 +377,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'uniqueFactors@12-6'::current + IL_0001: ldfld int32 Linq101Aggregates01/uniqueFactors@12::current IL_0006: ret - } // end of method 'uniqueFactors@12-6'::get_LastGenerated + } // end of method uniqueFactors@12::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -391,15 +391,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Aggregates01/'uniqueFactors@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Aggregates01/uniqueFactors@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'uniqueFactors@12-6'::GetFreshEnumerator + } // end of method uniqueFactors@12::GetFreshEnumerator - } // end of class 'uniqueFactors@12-6' + } // end of class uniqueFactors@12 - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'numSum@21-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname numSum@21 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -424,17 +424,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_0009: stfld int32 Linq101Aggregates01/numSum@21::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'numSum@21-6'::current + IL_0010: stfld int32 Linq101Aggregates01/numSum@21::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'numSum@21-6'::.ctor + } // end of method numSum@21::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -445,7 +445,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/numSum@21::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -478,18 +478,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_003d: stfld int32 Linq101Aggregates01/numSum@21::pc .line 21,21 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 21,21 : 9,28 '' @@ -497,11 +497,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_005f: stfld int32 Linq101Aggregates01/numSum@21::pc .line 22,22 : 9,16 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Aggregates01/'numSum@21-6'::current + IL_0066: stfld int32 Linq101Aggregates01/numSum@21::current IL_006b: ldc.i4.1 IL_006c: ret @@ -511,24 +511,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_0072: stfld int32 Linq101Aggregates01/numSum@21::pc .line 21,21 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_008c: stfld int32 Linq101Aggregates01/numSum@21::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Aggregates01/'numSum@21-6'::current + IL_0093: stfld int32 Linq101Aggregates01/numSum@21::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'numSum@21-6'::GenerateNext + } // end of method numSum@21::GenerateNext .method public strict virtual instance void Close() cil managed @@ -540,7 +540,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/numSum@21::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -556,7 +556,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/numSum@21::pc IL_0020: switch ( IL_0037, IL_0039, @@ -594,19 +594,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/numSum@21::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'numSum@21-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/numSum@21::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/numSum@21::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Aggregates01/'numSum@21-6'::current + IL_006a: stfld int32 Linq101Aggregates01/numSum@21::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -646,7 +646,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'numSum@21-6'::Close + } // end of method numSum@21::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -655,7 +655,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'numSum@21-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/numSum@21::pc IL_0006: switch ( IL_001d, IL_001f, @@ -697,7 +697,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'numSum@21-6'::get_CheckClose + } // end of method numSum@21::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -707,9 +707,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'numSum@21-6'::current + IL_0001: ldfld int32 Linq101Aggregates01/numSum@21::current IL_0006: ret - } // end of method 'numSum@21-6'::get_LastGenerated + } // end of method numSum@21::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -721,15 +721,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Aggregates01/'numSum@21-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Aggregates01/numSum@21::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'numSum@21-6'::GetFreshEnumerator + } // end of method numSum@21::GetFreshEnumerator - } // end of class 'numSum@21-6' + } // end of class numSum@21 - .class auto ansi serializable sealed nested assembly beforefieldinit 'numSum@22-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numSum@22-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -742,7 +742,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'numSum@22-7'::.ctor + } // end of method 'numSum@22-1'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -752,11 +752,11 @@ .line 22,22 : 15,16 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'numSum@22-7'::Invoke + } // end of method 'numSum@22-1'::Invoke - } // end of class 'numSum@22-7' + } // end of class 'numSum@22-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'totalChars@30-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname totalChars@30 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -781,17 +781,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_0009: stfld int32 Linq101Aggregates01/totalChars@30::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Aggregates01/'totalChars@30-6'::current + IL_0010: stfld string Linq101Aggregates01/totalChars@30::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'totalChars@30-6'::.ctor + } // end of method totalChars@30::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -802,7 +802,7 @@ [1] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/totalChars@30::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -835,18 +835,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_003d: stfld int32 Linq101Aggregates01/totalChars@30::pc .line 30,30 : 9,26 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 30,30 : 9,26 '' @@ -854,11 +854,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_005f: stfld int32 Linq101Aggregates01/totalChars@30::pc .line 31,31 : 9,25 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Aggregates01/'totalChars@30-6'::current + IL_0066: stfld string Linq101Aggregates01/totalChars@30::current IL_006b: ldc.i4.1 IL_006c: ret @@ -868,24 +868,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_0072: stfld int32 Linq101Aggregates01/totalChars@30::pc .line 30,30 : 9,26 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_008c: stfld int32 Linq101Aggregates01/totalChars@30::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Aggregates01/'totalChars@30-6'::current + IL_0093: stfld string Linq101Aggregates01/totalChars@30::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'totalChars@30-6'::GenerateNext + } // end of method totalChars@30::GenerateNext .method public strict virtual instance void Close() cil managed @@ -897,7 +897,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/totalChars@30::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -913,7 +913,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/totalChars@30::pc IL_0020: switch ( IL_0037, IL_0039, @@ -951,19 +951,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/totalChars@30::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'totalChars@30-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/totalChars@30::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/totalChars@30::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Aggregates01/'totalChars@30-6'::current + IL_006a: stfld string Linq101Aggregates01/totalChars@30::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1003,7 +1003,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'totalChars@30-6'::Close + } // end of method totalChars@30::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1012,7 +1012,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'totalChars@30-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/totalChars@30::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1054,7 +1054,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'totalChars@30-6'::get_CheckClose + } // end of method totalChars@30::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -1064,9 +1064,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Aggregates01/'totalChars@30-6'::current + IL_0001: ldfld string Linq101Aggregates01/totalChars@30::current IL_0006: ret - } // end of method 'totalChars@30-6'::get_LastGenerated + } // end of method totalChars@30::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1078,15 +1078,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Aggregates01/'totalChars@30-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Aggregates01/totalChars@30::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'totalChars@30-6'::GetFreshEnumerator + } // end of method totalChars@30::GetFreshEnumerator - } // end of class 'totalChars@30-6' + } // end of class totalChars@30 - .class auto ansi serializable sealed nested assembly beforefieldinit 'totalChars@31-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'totalChars@31-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1099,7 +1099,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'totalChars@31-7'::.ctor + } // end of method 'totalChars@31-1'::.ctor .method public strict virtual instance int32 Invoke(string w) cil managed @@ -1110,11 +1110,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'totalChars@31-7'::Invoke + } // end of method 'totalChars@31-1'::Invoke - } // end of class 'totalChars@31-7' + } // end of class 'totalChars@31-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@39-15' + .class auto ansi serializable sealed nested assembly beforefieldinit categories@39 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1132,9 +1132,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@39-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories@39::builder@ IL_000d: ret - } // end of method 'categories@39-15'::.ctor + } // end of method categories@39::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -1147,16 +1147,16 @@ IL_0001: stloc.0 .line 40,40 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@39-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories@39::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'categories@39-15'::Invoke + } // end of method categories@39::Invoke - } // end of class 'categories@39-15' + } // end of class categories@39 - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1169,7 +1169,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories@40-16'::.ctor + } // end of method 'categories@40-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -1179,11 +1179,11 @@ .line 40,40 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories@40-16'::Invoke + } // end of method 'categories@40-1'::Invoke - } // end of class 'categories@40-16' + } // end of class 'categories@40-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1196,7 +1196,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories@40-17'::.ctor + } // end of method 'categories@40-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -1208,11 +1208,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories@40-17'::Invoke + } // end of method 'categories@40-2'::Invoke - } // end of class 'categories@40-17' + } // end of class 'categories@40-2' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sum@42-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname sum@42 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1239,20 +1239,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'sum@42-6'::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/sum@42::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_0010: stfld int32 Linq101Aggregates01/sum@42::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'sum@42-6'::.ctor + } // end of method sum@42::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1263,7 +1263,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/sum@42::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1295,20 +1295,20 @@ .line 42,42 : 13,26 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'sum@42-6'::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/sum@42::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_003e: stfld int32 Linq101Aggregates01/sum@42::pc .line 42,42 : 13,26 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 42,42 : 13,26 '' @@ -1316,11 +1316,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_0060: stfld int32 Linq101Aggregates01/sum@42::pc .line 43,43 : 13,33 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current IL_006c: ldc.i4.1 IL_006d: ret @@ -1330,24 +1330,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_0073: stfld int32 Linq101Aggregates01/sum@42::pc .line 42,42 : 13,26 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_008d: stfld int32 Linq101Aggregates01/sum@42::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method 'sum@42-6'::GenerateNext + } // end of method sum@42::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1359,7 +1359,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/sum@42::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1375,7 +1375,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/sum@42::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1413,19 +1413,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/sum@42::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'sum@42-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/sum@42::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/sum@42::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1465,7 +1465,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'sum@42-6'::Close + } // end of method sum@42::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1474,7 +1474,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'sum@42-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/sum@42::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1516,7 +1516,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'sum@42-6'::get_CheckClose + } // end of method sum@42::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -1526,9 +1526,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'sum@42-6'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/sum@42::current IL_0006: ret - } // end of method 'sum@42-6'::get_LastGenerated + } // end of method sum@42::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1538,20 +1538,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'sum@42-6'::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/sum@42::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/'sum@42-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/sum@42::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method 'sum@42-6'::GetFreshEnumerator + } // end of method sum@42::GetFreshEnumerator - } // end of class 'sum@42-6' + } // end of class sum@42 - .class auto ansi serializable sealed nested assembly beforefieldinit 'sum@43-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sum@43-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1564,7 +1564,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sum@43-7'::.ctor + } // end of method 'sum@43-1'::.ctor .method public strict virtual instance int32 Invoke(class [Utils]Utils/Product x) cil managed @@ -1576,11 +1576,11 @@ IL_0001: tail. IL_0003: callvirt instance int32 [Utils]Utils/Product::get_UnitsInStock() IL_0008: ret - } // end of method 'sum@43-7'::Invoke + } // end of method 'sum@43-1'::Invoke - } // end of class 'sum@43-7' + } // end of class 'sum@43-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@40-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,int32>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1598,9 +1598,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,int32>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@40-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@40-3'::builder@ IL_000d: ret - } // end of method 'categories@40-18'::.ctor + } // end of method 'categories@40-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,int32>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -1629,13 +1629,13 @@ IL_000b: ldnull IL_000c: ldc.i4.0 IL_000d: ldnull - IL_000e: newobj instance void Linq101Aggregates01/'sum@42-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000e: newobj instance void Linq101Aggregates01/sum@42::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0013: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0018: stloc.s V_4 - IL_001a: newobj instance void Linq101Aggregates01/'sum@43-7'::.ctor() + IL_001a: newobj instance void Linq101Aggregates01/'sum@43-1'::.ctor() IL_001f: stloc.s V_5 IL_0021: ldloc.s V_4 IL_0023: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -1696,7 +1696,7 @@ IL_007b: stloc.1 .line 45,45 : 9,28 '' IL_007c: ldarg.0 - IL_007d: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@40-18'::builder@ + IL_007d: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories@40-3'::builder@ IL_0082: ldloc.0 IL_0083: ldloc.1 IL_0084: newobj instance void class [mscorlib]System.Tuple`2,int32>::.ctor(!0, @@ -1704,11 +1704,11 @@ IL_0089: tail. IL_008b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,int32>,object>(!!0) IL_0090: ret - } // end of method 'categories@40-18'::Invoke + } // end of method 'categories@40-3'::Invoke - } // end of class 'categories@40-18' + } // end of class 'categories@40-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@45-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories@45-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -1721,7 +1721,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,int32>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'categories@45-19'::.ctor + } // end of method 'categories@45-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2,int32> tupledArg) cil managed @@ -1744,11 +1744,11 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'categories@45-19'::Invoke + } // end of method 'categories@45-4'::Invoke - } // end of class 'categories@45-19' + } // end of class 'categories@45-4' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'minNum@49-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname minNum@49 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1773,17 +1773,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_0009: stfld int32 Linq101Aggregates01/minNum@49::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'minNum@49-6'::current + IL_0010: stfld int32 Linq101Aggregates01/minNum@49::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'minNum@49-6'::.ctor + } // end of method minNum@49::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1794,7 +1794,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/minNum@49::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1827,18 +1827,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_003d: stfld int32 Linq101Aggregates01/minNum@49::pc .line 49,49 : 22,41 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 49,49 : 22,41 '' @@ -1846,11 +1846,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_005f: stfld int32 Linq101Aggregates01/minNum@49::pc .line 49,49 : 42,49 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Aggregates01/'minNum@49-6'::current + IL_0066: stfld int32 Linq101Aggregates01/minNum@49::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1860,24 +1860,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_0072: stfld int32 Linq101Aggregates01/minNum@49::pc .line 49,49 : 22,41 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_008c: stfld int32 Linq101Aggregates01/minNum@49::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Aggregates01/'minNum@49-6'::current + IL_0093: stfld int32 Linq101Aggregates01/minNum@49::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'minNum@49-6'::GenerateNext + } // end of method minNum@49::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1889,7 +1889,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/minNum@49::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1905,7 +1905,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/minNum@49::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1943,19 +1943,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/minNum@49::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'minNum@49-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/minNum@49::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/minNum@49::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Aggregates01/'minNum@49-6'::current + IL_006a: stfld int32 Linq101Aggregates01/minNum@49::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1995,7 +1995,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'minNum@49-6'::Close + } // end of method minNum@49::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -2004,7 +2004,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'minNum@49-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/minNum@49::pc IL_0006: switch ( IL_001d, IL_001f, @@ -2046,7 +2046,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'minNum@49-6'::get_CheckClose + } // end of method minNum@49::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -2056,9 +2056,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'minNum@49-6'::current + IL_0001: ldfld int32 Linq101Aggregates01/minNum@49::current IL_0006: ret - } // end of method 'minNum@49-6'::get_LastGenerated + } // end of method minNum@49::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -2070,15 +2070,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Aggregates01/'minNum@49-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Aggregates01/minNum@49::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'minNum@49-6'::GetFreshEnumerator + } // end of method minNum@49::GetFreshEnumerator - } // end of class 'minNum@49-6' + } // end of class minNum@49 - .class auto ansi serializable sealed nested assembly beforefieldinit 'minNum@49-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'minNum@49-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2091,7 +2091,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'minNum@49-7'::.ctor + } // end of method 'minNum@49-1'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -2101,11 +2101,11 @@ .line 49,49 : 48,49 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'minNum@49-7'::Invoke + } // end of method 'minNum@49-1'::Invoke - } // end of class 'minNum@49-7' + } // end of class 'minNum@49-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'shortestWord@52-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname shortestWord@52 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -2130,17 +2130,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_0009: stfld int32 Linq101Aggregates01/shortestWord@52::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Aggregates01/'shortestWord@52-6'::current + IL_0010: stfld string Linq101Aggregates01/shortestWord@52::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'shortestWord@52-6'::.ctor + } // end of method shortestWord@52::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -2151,7 +2151,7 @@ [1] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/shortestWord@52::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -2184,18 +2184,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_003d: stfld int32 Linq101Aggregates01/shortestWord@52::pc .line 52,52 : 28,45 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 52,52 : 28,45 '' @@ -2203,11 +2203,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_005f: stfld int32 Linq101Aggregates01/shortestWord@52::pc .line 52,52 : 46,60 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Aggregates01/'shortestWord@52-6'::current + IL_0066: stfld string Linq101Aggregates01/shortestWord@52::current IL_006b: ldc.i4.1 IL_006c: ret @@ -2217,24 +2217,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_0072: stfld int32 Linq101Aggregates01/shortestWord@52::pc .line 52,52 : 28,45 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_008c: stfld int32 Linq101Aggregates01/shortestWord@52::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Aggregates01/'shortestWord@52-6'::current + IL_0093: stfld string Linq101Aggregates01/shortestWord@52::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'shortestWord@52-6'::GenerateNext + } // end of method shortestWord@52::GenerateNext .method public strict virtual instance void Close() cil managed @@ -2246,7 +2246,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/shortestWord@52::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -2262,7 +2262,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/shortestWord@52::pc IL_0020: switch ( IL_0037, IL_0039, @@ -2300,19 +2300,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/shortestWord@52::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'shortestWord@52-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/shortestWord@52::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/shortestWord@52::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Aggregates01/'shortestWord@52-6'::current + IL_006a: stfld string Linq101Aggregates01/shortestWord@52::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -2352,7 +2352,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'shortestWord@52-6'::Close + } // end of method shortestWord@52::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -2361,7 +2361,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'shortestWord@52-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/shortestWord@52::pc IL_0006: switch ( IL_001d, IL_001f, @@ -2403,7 +2403,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'shortestWord@52-6'::get_CheckClose + } // end of method shortestWord@52::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -2413,9 +2413,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Aggregates01/'shortestWord@52-6'::current + IL_0001: ldfld string Linq101Aggregates01/shortestWord@52::current IL_0006: ret - } // end of method 'shortestWord@52-6'::get_LastGenerated + } // end of method shortestWord@52::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -2427,15 +2427,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Aggregates01/'shortestWord@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Aggregates01/shortestWord@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'shortestWord@52-6'::GetFreshEnumerator + } // end of method shortestWord@52::GetFreshEnumerator - } // end of class 'shortestWord@52-6' + } // end of class shortestWord@52 - .class auto ansi serializable sealed nested assembly beforefieldinit 'shortestWord@52-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'shortestWord@52-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2448,7 +2448,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'shortestWord@52-7'::.ctor + } // end of method 'shortestWord@52-1'::.ctor .method public strict virtual instance int32 Invoke(string w) cil managed @@ -2459,11 +2459,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'shortestWord@52-7'::Invoke + } // end of method 'shortestWord@52-1'::Invoke - } // end of class 'shortestWord@52-7' + } // end of class 'shortestWord@52-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@57-15' + .class auto ansi serializable sealed nested assembly beforefieldinit categories2@57 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2481,9 +2481,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@57-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories2@57::builder@ IL_000d: ret - } // end of method 'categories2@57-15'::.ctor + } // end of method categories2@57::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -2496,16 +2496,16 @@ IL_0001: stloc.0 .line 58,58 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@57-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories2@57::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'categories2@57-15'::Invoke + } // end of method categories2@57::Invoke - } // end of class 'categories2@57-15' + } // end of class categories2@57 - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2518,7 +2518,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories2@58-16'::.ctor + } // end of method 'categories2@58-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -2528,11 +2528,11 @@ .line 58,58 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories2@58-16'::Invoke + } // end of method 'categories2@58-1'::Invoke - } // end of class 'categories2@58-16' + } // end of class 'categories2@58-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2545,7 +2545,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories2@58-17'::.ctor + } // end of method 'categories2@58-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -2557,11 +2557,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories2@58-17'::Invoke + } // end of method 'categories2@58-2'::Invoke - } // end of class 'categories2@58-17' + } // end of class 'categories2@58-2' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'min@59-9' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname min@59 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -2588,20 +2588,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'min@59-9'::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/min@59::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_0010: stfld int32 Linq101Aggregates01/min@59::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'min@59-9'::.ctor + } // end of method min@59::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -2612,7 +2612,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_0001: ldfld int32 Linq101Aggregates01/min@59::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -2644,20 +2644,20 @@ .line 59,59 : 27,40 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'min@59-9'::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/min@59::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_003e: stfld int32 Linq101Aggregates01/min@59::pc .line 59,59 : 27,40 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 59,59 : 27,40 '' @@ -2665,11 +2665,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_0060: stfld int32 Linq101Aggregates01/min@59::pc .line 59,59 : 41,58 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current IL_006c: ldc.i4.1 IL_006d: ret @@ -2679,24 +2679,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_0073: stfld int32 Linq101Aggregates01/min@59::pc .line 59,59 : 27,40 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_008d: stfld int32 Linq101Aggregates01/min@59::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method 'min@59-9'::GenerateNext + } // end of method min@59::GenerateNext .method public strict virtual instance void Close() cil managed @@ -2708,7 +2708,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_0001: ldfld int32 Linq101Aggregates01/min@59::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -2724,7 +2724,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_001b: ldfld int32 Linq101Aggregates01/min@59::pc IL_0020: switch ( IL_0037, IL_0039, @@ -2762,19 +2762,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_004f: stfld int32 Linq101Aggregates01/min@59::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'min@59-9'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/min@59::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_0063: stfld int32 Linq101Aggregates01/min@59::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -2814,7 +2814,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'min@59-9'::Close + } // end of method min@59::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -2823,7 +2823,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'min@59-9'::pc + IL_0001: ldfld int32 Linq101Aggregates01/min@59::pc IL_0006: switch ( IL_001d, IL_001f, @@ -2865,7 +2865,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'min@59-9'::get_CheckClose + } // end of method min@59::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -2875,9 +2875,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'min@59-9'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/min@59::current IL_0006: ret - } // end of method 'min@59-9'::get_LastGenerated + } // end of method min@59::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -2887,20 +2887,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'min@59-9'::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/min@59::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/'min@59-9'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/min@59::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method 'min@59-9'::GetFreshEnumerator + } // end of method min@59::GetFreshEnumerator - } // end of class 'min@59-9' + } // end of class min@59 - .class auto ansi serializable sealed nested assembly beforefieldinit 'min@59-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'min@59-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2913,7 +2913,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'min@59-10'::.ctor + } // end of method 'min@59-1'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product x) cil managed @@ -2925,11 +2925,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'min@59-10'::Invoke + } // end of method 'min@59-1'::Invoke - } // end of class 'min@59-10' + } // end of class 'min@59-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@58-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2947,9 +2947,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@58-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@58-3'::builder@ IL_000d: ret - } // end of method 'categories2@58-18'::.ctor + } // end of method 'categories2@58-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -2966,18 +2966,18 @@ IL_0008: ldnull IL_0009: ldc.i4.0 IL_000a: ldnull - IL_000b: newobj instance void Linq101Aggregates01/'min@59-9'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000b: newobj instance void Linq101Aggregates01/min@59::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0010: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0015: newobj instance void Linq101Aggregates01/'min@59-10'::.ctor() + IL_0015: newobj instance void Linq101Aggregates01/'min@59-1'::.ctor() IL_001a: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MinBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_001f: stloc.1 .line 60,60 : 9,28 '' IL_0020: ldarg.0 - IL_0021: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@58-18'::builder@ + IL_0021: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories2@58-3'::builder@ IL_0026: ldloc.0 IL_0027: ldloc.1 IL_0028: newobj instance void class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>::.ctor(!0, @@ -2985,11 +2985,11 @@ IL_002d: tail. IL_002f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal>,object>(!!0) IL_0034: ret - } // end of method 'categories2@58-18'::Invoke + } // end of method 'categories2@58-3'::Invoke - } // end of class 'categories2@58-18' + } // end of class 'categories2@58-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@60-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories2@60-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -3002,7 +3002,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'categories2@60-19'::.ctor + } // end of method 'categories2@60-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal> tupledArg) cil managed @@ -3025,11 +3025,11 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'categories2@60-19'::Invoke + } // end of method 'categories2@60-4'::Invoke - } // end of class 'categories2@60-19' + } // end of class 'categories2@60-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@66-15' + .class auto ansi serializable sealed nested assembly beforefieldinit categories3@66 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3047,9 +3047,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@66-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories3@66::builder@ IL_000d: ret - } // end of method 'categories3@66-15'::.ctor + } // end of method categories3@66::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -3062,16 +3062,16 @@ IL_0001: stloc.0 .line 67,67 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@66-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories3@66::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'categories3@66-15'::Invoke + } // end of method categories3@66::Invoke - } // end of class 'categories3@66-15' + } // end of class categories3@66 - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -3084,7 +3084,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories3@67-16'::.ctor + } // end of method 'categories3@67-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -3094,11 +3094,11 @@ .line 67,67 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories3@67-16'::Invoke + } // end of method 'categories3@67-1'::Invoke - } // end of class 'categories3@67-16' + } // end of class 'categories3@67-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -3111,7 +3111,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories3@67-17'::.ctor + } // end of method 'categories3@67-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -3123,11 +3123,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories3@67-17'::Invoke + } // end of method 'categories3@67-2'::Invoke - } // end of class 'categories3@67-17' + } // end of class 'categories3@67-2' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'min@68-11' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'min@68-2' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -3139,7 +3139,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'min@68-11'::.ctor + } // end of method 'min@68-2'::.ctor .method assembly hidebysig instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product p) cil managed @@ -3151,11 +3151,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'min@68-11'::Invoke + } // end of method 'min@68-2'::Invoke - } // end of class 'min@68-11' + } // end of class 'min@68-2' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'cheapestProducts@69-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname cheapestProducts@69 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -3182,20 +3182,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'cheapestProducts@69-6'::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/cheapestProducts@69::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_0010: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'cheapestProducts@69-6'::.ctor + } // end of method cheapestProducts@69::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -3206,7 +3206,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/cheapestProducts@69::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -3238,20 +3238,20 @@ .line 69,69 : 40,53 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'cheapestProducts@69-6'::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/cheapestProducts@69::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_003e: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc .line 69,69 : 40,53 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 69,69 : 40,53 '' @@ -3259,11 +3259,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_0060: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc .line 69,69 : 54,79 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current IL_006c: ldc.i4.1 IL_006d: ret @@ -3273,24 +3273,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_0073: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc .line 69,69 : 40,53 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_008d: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method 'cheapestProducts@69-6'::GenerateNext + } // end of method cheapestProducts@69::GenerateNext .method public strict virtual instance void Close() cil managed @@ -3302,7 +3302,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/cheapestProducts@69::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -3318,7 +3318,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/cheapestProducts@69::pc IL_0020: switch ( IL_0037, IL_0039, @@ -3356,19 +3356,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'cheapestProducts@69-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/cheapestProducts@69::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/cheapestProducts@69::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -3408,7 +3408,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'cheapestProducts@69-6'::Close + } // end of method cheapestProducts@69::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -3417,7 +3417,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'cheapestProducts@69-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/cheapestProducts@69::pc IL_0006: switch ( IL_001d, IL_001f, @@ -3459,7 +3459,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'cheapestProducts@69-6'::get_CheckClose + } // end of method cheapestProducts@69::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -3469,9 +3469,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'cheapestProducts@69-6'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/cheapestProducts@69::current IL_0006: ret - } // end of method 'cheapestProducts@69-6'::get_LastGenerated + } // end of method cheapestProducts@69::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -3481,20 +3481,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'cheapestProducts@69-6'::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/cheapestProducts@69::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/'cheapestProducts@69-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/cheapestProducts@69::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method 'cheapestProducts@69-6'::GetFreshEnumerator + } // end of method cheapestProducts@69::GetFreshEnumerator - } // end of class 'cheapestProducts@69-6' + } // end of class cheapestProducts@69 - .class auto ansi serializable sealed nested assembly beforefieldinit 'cheapestProducts@69-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'cheapestProducts@69-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public valuetype [mscorlib]System.Decimal min @@ -3509,9 +3509,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'cheapestProducts@69-7'::min + IL_0008: stfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'cheapestProducts@69-1'::min IL_000d: ret - } // end of method 'cheapestProducts@69-7'::.ctor + } // end of method 'cheapestProducts@69-1'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product x) cil managed @@ -3522,15 +3522,15 @@ IL_0000: ldarg.1 IL_0001: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0006: ldarg.0 - IL_0007: ldfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'cheapestProducts@69-7'::min + IL_0007: ldfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'cheapestProducts@69-1'::min IL_000c: call bool [mscorlib]System.Decimal::op_Equality(valuetype [mscorlib]System.Decimal, valuetype [mscorlib]System.Decimal) IL_0011: ret - } // end of method 'cheapestProducts@69-7'::Invoke + } // end of method 'cheapestProducts@69-1'::Invoke - } // end of class 'cheapestProducts@69-7' + } // end of class 'cheapestProducts@69-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@67-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3548,9 +3548,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@67-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@67-3'::builder@ IL_000d: ret - } // end of method 'categories3@67-18'::.ctor + } // end of method 'categories3@67-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -3566,8 +3566,8 @@ IL_0001: stloc.0 .line 68,68 : 9,58 '' IL_0002: ldloc.0 - IL_0003: newobj instance void Linq101Aggregates01/'min@68-11'::.ctor() - IL_0008: ldftn instance valuetype [mscorlib]System.Decimal Linq101Aggregates01/'min@68-11'::Invoke(class [Utils]Utils/Product) + IL_0003: newobj instance void Linq101Aggregates01/'min@68-2'::.ctor() + IL_0008: ldftn instance valuetype [mscorlib]System.Decimal Linq101Aggregates01/'min@68-2'::Invoke(class [Utils]Utils/Product) IL_000e: newobj instance void class [mscorlib]System.Func`2::.ctor(object, native int) IL_0013: call valuetype [mscorlib]System.Decimal [System.Core]System.Linq.Enumerable::Min(class [mscorlib]System.Collections.Generic.IEnumerable`1, @@ -3581,20 +3581,20 @@ IL_0021: ldnull IL_0022: ldc.i4.0 IL_0023: ldnull - IL_0024: newobj instance void Linq101Aggregates01/'cheapestProducts@69-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0024: newobj instance void Linq101Aggregates01/cheapestProducts@69::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0029: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_002e: ldloc.1 - IL_002f: newobj instance void Linq101Aggregates01/'cheapestProducts@69-7'::.ctor(valuetype [mscorlib]System.Decimal) + IL_002f: newobj instance void Linq101Aggregates01/'cheapestProducts@69-1'::.ctor(valuetype [mscorlib]System.Decimal) IL_0034: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0039: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_003e: stloc.2 .line 70,70 : 9,41 '' IL_003f: ldarg.0 - IL_0040: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@67-18'::builder@ + IL_0040: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories3@67-3'::builder@ IL_0045: ldloc.0 IL_0046: ldloc.1 IL_0047: ldloc.2 @@ -3604,11 +3604,11 @@ IL_004d: tail. IL_004f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>(!!0) IL_0054: ret - } // end of method 'categories3@67-18'::Invoke + } // end of method 'categories3@67-3'::Invoke - } // end of class 'categories3@67-18' + } // end of class 'categories3@67-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@70-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories3@70-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -3621,7 +3621,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'categories3@70-19'::.ctor + } // end of method 'categories3@70-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [mscorlib]System.Tuple`3,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1> tupledArg) cil managed @@ -3648,11 +3648,11 @@ IL_001c: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0021: ret - } // end of method 'categories3@70-19'::Invoke + } // end of method 'categories3@70-4'::Invoke - } // end of class 'categories3@70-19' + } // end of class 'categories3@70-4' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'maxNum@74-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname maxNum@74 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -3677,17 +3677,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_0009: stfld int32 Linq101Aggregates01/maxNum@74::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'maxNum@74-6'::current + IL_0010: stfld int32 Linq101Aggregates01/maxNum@74::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'maxNum@74-6'::.ctor + } // end of method maxNum@74::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -3698,7 +3698,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/maxNum@74::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -3731,18 +3731,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_003d: stfld int32 Linq101Aggregates01/maxNum@74::pc .line 74,74 : 22,41 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 74,74 : 22,41 '' @@ -3750,11 +3750,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_005f: stfld int32 Linq101Aggregates01/maxNum@74::pc .line 74,74 : 42,49 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Aggregates01/'maxNum@74-6'::current + IL_0066: stfld int32 Linq101Aggregates01/maxNum@74::current IL_006b: ldc.i4.1 IL_006c: ret @@ -3764,24 +3764,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_0072: stfld int32 Linq101Aggregates01/maxNum@74::pc .line 74,74 : 22,41 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_008c: stfld int32 Linq101Aggregates01/maxNum@74::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Aggregates01/'maxNum@74-6'::current + IL_0093: stfld int32 Linq101Aggregates01/maxNum@74::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'maxNum@74-6'::GenerateNext + } // end of method maxNum@74::GenerateNext .method public strict virtual instance void Close() cil managed @@ -3793,7 +3793,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/maxNum@74::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -3809,7 +3809,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/maxNum@74::pc IL_0020: switch ( IL_0037, IL_0039, @@ -3847,19 +3847,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/maxNum@74::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxNum@74-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxNum@74::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/maxNum@74::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Aggregates01/'maxNum@74-6'::current + IL_006a: stfld int32 Linq101Aggregates01/maxNum@74::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -3899,7 +3899,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'maxNum@74-6'::Close + } // end of method maxNum@74::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -3908,7 +3908,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/maxNum@74::pc IL_0006: switch ( IL_001d, IL_001f, @@ -3950,7 +3950,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'maxNum@74-6'::get_CheckClose + } // end of method maxNum@74::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -3960,9 +3960,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'maxNum@74-6'::current + IL_0001: ldfld int32 Linq101Aggregates01/maxNum@74::current IL_0006: ret - } // end of method 'maxNum@74-6'::get_LastGenerated + } // end of method maxNum@74::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -3974,15 +3974,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Aggregates01/'maxNum@74-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Aggregates01/maxNum@74::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'maxNum@74-6'::GetFreshEnumerator + } // end of method maxNum@74::GetFreshEnumerator - } // end of class 'maxNum@74-6' + } // end of class maxNum@74 - .class auto ansi serializable sealed nested assembly beforefieldinit 'maxNum@74-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'maxNum@74-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -3995,7 +3995,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'maxNum@74-7'::.ctor + } // end of method 'maxNum@74-1'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -4005,11 +4005,11 @@ .line 74,74 : 48,49 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'maxNum@74-7'::Invoke + } // end of method 'maxNum@74-1'::Invoke - } // end of class 'maxNum@74-7' + } // end of class 'maxNum@74-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'longestLength@77-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname longestLength@77 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -4034,17 +4034,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_0009: stfld int32 Linq101Aggregates01/longestLength@77::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Aggregates01/'longestLength@77-6'::current + IL_0010: stfld string Linq101Aggregates01/longestLength@77::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'longestLength@77-6'::.ctor + } // end of method longestLength@77::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -4055,7 +4055,7 @@ [1] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/longestLength@77::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -4088,18 +4088,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_003d: stfld int32 Linq101Aggregates01/longestLength@77::pc .line 77,77 : 29,46 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 77,77 : 29,46 '' @@ -4107,11 +4107,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_005f: stfld int32 Linq101Aggregates01/longestLength@77::pc .line 77,77 : 47,61 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Aggregates01/'longestLength@77-6'::current + IL_0066: stfld string Linq101Aggregates01/longestLength@77::current IL_006b: ldc.i4.1 IL_006c: ret @@ -4121,24 +4121,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_0072: stfld int32 Linq101Aggregates01/longestLength@77::pc .line 77,77 : 29,46 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_008c: stfld int32 Linq101Aggregates01/longestLength@77::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Aggregates01/'longestLength@77-6'::current + IL_0093: stfld string Linq101Aggregates01/longestLength@77::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'longestLength@77-6'::GenerateNext + } // end of method longestLength@77::GenerateNext .method public strict virtual instance void Close() cil managed @@ -4150,7 +4150,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/longestLength@77::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -4166,7 +4166,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/longestLength@77::pc IL_0020: switch ( IL_0037, IL_0039, @@ -4204,19 +4204,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/longestLength@77::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'longestLength@77-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/longestLength@77::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/longestLength@77::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Aggregates01/'longestLength@77-6'::current + IL_006a: stfld string Linq101Aggregates01/longestLength@77::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -4256,7 +4256,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'longestLength@77-6'::Close + } // end of method longestLength@77::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -4265,7 +4265,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'longestLength@77-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/longestLength@77::pc IL_0006: switch ( IL_001d, IL_001f, @@ -4307,7 +4307,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'longestLength@77-6'::get_CheckClose + } // end of method longestLength@77::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -4317,9 +4317,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Aggregates01/'longestLength@77-6'::current + IL_0001: ldfld string Linq101Aggregates01/longestLength@77::current IL_0006: ret - } // end of method 'longestLength@77-6'::get_LastGenerated + } // end of method longestLength@77::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -4331,15 +4331,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Aggregates01/'longestLength@77-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Aggregates01/longestLength@77::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'longestLength@77-6'::GetFreshEnumerator + } // end of method longestLength@77::GetFreshEnumerator - } // end of class 'longestLength@77-6' + } // end of class longestLength@77 - .class auto ansi serializable sealed nested assembly beforefieldinit 'longestLength@77-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'longestLength@77-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4352,7 +4352,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'longestLength@77-7'::.ctor + } // end of method 'longestLength@77-1'::.ctor .method public strict virtual instance int32 Invoke(string w) cil managed @@ -4363,11 +4363,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'longestLength@77-7'::Invoke + } // end of method 'longestLength@77-1'::Invoke - } // end of class 'longestLength@77-7' + } // end of class 'longestLength@77-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@82-15' + .class auto ansi serializable sealed nested assembly beforefieldinit categories4@82 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -4385,9 +4385,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@82-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories4@82::builder@ IL_000d: ret - } // end of method 'categories4@82-15'::.ctor + } // end of method categories4@82::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -4400,16 +4400,16 @@ IL_0001: stloc.0 .line 83,83 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@82-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories4@82::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'categories4@82-15'::Invoke + } // end of method categories4@82::Invoke - } // end of class 'categories4@82-15' + } // end of class categories4@82 - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4422,7 +4422,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories4@83-16'::.ctor + } // end of method 'categories4@83-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -4432,11 +4432,11 @@ .line 83,83 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories4@83-16'::Invoke + } // end of method 'categories4@83-1'::Invoke - } // end of class 'categories4@83-16' + } // end of class 'categories4@83-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4449,7 +4449,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories4@83-17'::.ctor + } // end of method 'categories4@83-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -4461,11 +4461,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories4@83-17'::Invoke + } // end of method 'categories4@83-2'::Invoke - } // end of class 'categories4@83-17' + } // end of class 'categories4@83-2' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'mostExpensivePrice@84-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname mostExpensivePrice@84 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -4492,20 +4492,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensivePrice@84-6'::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensivePrice@84::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_0010: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'mostExpensivePrice@84-6'::.ctor + } // end of method mostExpensivePrice@84::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -4516,7 +4516,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -4548,20 +4548,20 @@ .line 84,84 : 42,55 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensivePrice@84-6'::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensivePrice@84::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_003e: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc .line 84,84 : 42,55 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 84,84 : 42,55 '' @@ -4569,11 +4569,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_0060: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc .line 84,84 : 56,73 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current IL_006c: ldc.i4.1 IL_006d: ret @@ -4583,24 +4583,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_0073: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc .line 84,84 : 42,55 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_008d: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method 'mostExpensivePrice@84-6'::GenerateNext + } // end of method mostExpensivePrice@84::GenerateNext .method public strict virtual instance void Close() cil managed @@ -4612,7 +4612,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -4628,7 +4628,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc IL_0020: switch ( IL_0037, IL_0039, @@ -4666,19 +4666,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensivePrice@84-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensivePrice@84::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -4718,7 +4718,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'mostExpensivePrice@84-6'::Close + } // end of method mostExpensivePrice@84::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -4727,7 +4727,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensivePrice@84-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/mostExpensivePrice@84::pc IL_0006: switch ( IL_001d, IL_001f, @@ -4769,7 +4769,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'mostExpensivePrice@84-6'::get_CheckClose + } // end of method mostExpensivePrice@84::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -4779,9 +4779,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensivePrice@84-6'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensivePrice@84::current IL_0006: ret - } // end of method 'mostExpensivePrice@84-6'::get_LastGenerated + } // end of method mostExpensivePrice@84::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -4791,20 +4791,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensivePrice@84-6'::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensivePrice@84::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/'mostExpensivePrice@84-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/mostExpensivePrice@84::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method 'mostExpensivePrice@84-6'::GetFreshEnumerator + } // end of method mostExpensivePrice@84::GetFreshEnumerator - } // end of class 'mostExpensivePrice@84-6' + } // end of class mostExpensivePrice@84 - .class auto ansi serializable sealed nested assembly beforefieldinit 'mostExpensivePrice@84-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'mostExpensivePrice@84-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4817,7 +4817,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'mostExpensivePrice@84-7'::.ctor + } // end of method 'mostExpensivePrice@84-1'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product x) cil managed @@ -4829,11 +4829,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'mostExpensivePrice@84-7'::Invoke + } // end of method 'mostExpensivePrice@84-1'::Invoke - } // end of class 'mostExpensivePrice@84-7' + } // end of class 'mostExpensivePrice@84-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@83-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -4851,9 +4851,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@83-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@83-3'::builder@ IL_000d: ret - } // end of method 'categories4@83-18'::.ctor + } // end of method 'categories4@83-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -4870,18 +4870,18 @@ IL_0008: ldnull IL_0009: ldc.i4.0 IL_000a: ldnull - IL_000b: newobj instance void Linq101Aggregates01/'mostExpensivePrice@84-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000b: newobj instance void Linq101Aggregates01/mostExpensivePrice@84::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0010: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0015: newobj instance void Linq101Aggregates01/'mostExpensivePrice@84-7'::.ctor() + IL_0015: newobj instance void Linq101Aggregates01/'mostExpensivePrice@84-1'::.ctor() IL_001a: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MaxBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_001f: stloc.1 .line 85,85 : 9,43 '' IL_0020: ldarg.0 - IL_0021: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@83-18'::builder@ + IL_0021: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories4@83-3'::builder@ IL_0026: ldloc.0 IL_0027: ldloc.1 IL_0028: newobj instance void class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>::.ctor(!0, @@ -4889,11 +4889,11 @@ IL_002d: tail. IL_002f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal>,object>(!!0) IL_0034: ret - } // end of method 'categories4@83-18'::Invoke + } // end of method 'categories4@83-3'::Invoke - } // end of class 'categories4@83-18' + } // end of class 'categories4@83-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@85-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories4@85-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -4906,7 +4906,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'categories4@85-19'::.ctor + } // end of method 'categories4@85-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal> tupledArg) cil managed @@ -4929,11 +4929,11 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'categories4@85-19'::Invoke + } // end of method 'categories4@85-4'::Invoke - } // end of class 'categories4@85-19' + } // end of class 'categories4@85-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@91-15' + .class auto ansi serializable sealed nested assembly beforefieldinit categories5@91 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -4951,9 +4951,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@91-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories5@91::builder@ IL_000d: ret - } // end of method 'categories5@91-15'::.ctor + } // end of method categories5@91::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -4966,16 +4966,16 @@ IL_0001: stloc.0 .line 92,92 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@91-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories5@91::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'categories5@91-15'::Invoke + } // end of method categories5@91::Invoke - } // end of class 'categories5@91-15' + } // end of class categories5@91 - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -4988,7 +4988,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories5@92-16'::.ctor + } // end of method 'categories5@92-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -4998,11 +4998,11 @@ .line 92,92 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories5@92-16'::Invoke + } // end of method 'categories5@92-1'::Invoke - } // end of class 'categories5@92-16' + } // end of class 'categories5@92-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -5015,7 +5015,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories5@92-17'::.ctor + } // end of method 'categories5@92-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -5027,11 +5027,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories5@92-17'::Invoke + } // end of method 'categories5@92-2'::Invoke - } // end of class 'categories5@92-17' + } // end of class 'categories5@92-2' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'maxPrice@93-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname maxPrice@93 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -5058,20 +5058,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'maxPrice@93-6'::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/maxPrice@93::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_0010: stfld int32 Linq101Aggregates01/maxPrice@93::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'maxPrice@93-6'::.ctor + } // end of method maxPrice@93::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -5082,7 +5082,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/maxPrice@93::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -5114,20 +5114,20 @@ .line 93,93 : 32,45 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'maxPrice@93-6'::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/maxPrice@93::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_003e: stfld int32 Linq101Aggregates01/maxPrice@93::pc .line 93,93 : 32,45 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 93,93 : 32,45 '' @@ -5135,11 +5135,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_0060: stfld int32 Linq101Aggregates01/maxPrice@93::pc .line 93,93 : 46,63 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current IL_006c: ldc.i4.1 IL_006d: ret @@ -5149,24 +5149,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_0073: stfld int32 Linq101Aggregates01/maxPrice@93::pc .line 93,93 : 32,45 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_008d: stfld int32 Linq101Aggregates01/maxPrice@93::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method 'maxPrice@93-6'::GenerateNext + } // end of method maxPrice@93::GenerateNext .method public strict virtual instance void Close() cil managed @@ -5178,7 +5178,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/maxPrice@93::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -5194,7 +5194,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/maxPrice@93::pc IL_0020: switch ( IL_0037, IL_0039, @@ -5232,19 +5232,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/maxPrice@93::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'maxPrice@93-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/maxPrice@93::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/maxPrice@93::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -5284,7 +5284,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'maxPrice@93-6'::Close + } // end of method maxPrice@93::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -5293,7 +5293,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'maxPrice@93-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/maxPrice@93::pc IL_0006: switch ( IL_001d, IL_001f, @@ -5335,7 +5335,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'maxPrice@93-6'::get_CheckClose + } // end of method maxPrice@93::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -5345,9 +5345,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'maxPrice@93-6'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/maxPrice@93::current IL_0006: ret - } // end of method 'maxPrice@93-6'::get_LastGenerated + } // end of method maxPrice@93::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -5357,20 +5357,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'maxPrice@93-6'::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/maxPrice@93::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/'maxPrice@93-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/maxPrice@93::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method 'maxPrice@93-6'::GetFreshEnumerator + } // end of method maxPrice@93::GetFreshEnumerator - } // end of class 'maxPrice@93-6' + } // end of class maxPrice@93 - .class auto ansi serializable sealed nested assembly beforefieldinit 'maxPrice@93-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'maxPrice@93-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -5383,7 +5383,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'maxPrice@93-7'::.ctor + } // end of method 'maxPrice@93-1'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product x) cil managed @@ -5395,11 +5395,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'maxPrice@93-7'::Invoke + } // end of method 'maxPrice@93-1'::Invoke - } // end of class 'maxPrice@93-7' + } // end of class 'maxPrice@93-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'mostExpensiveProducts@94-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname mostExpensiveProducts@94 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -5426,20 +5426,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensiveProducts@94-6'::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensiveProducts@94::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_0010: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'mostExpensiveProducts@94-6'::.ctor + } // end of method mostExpensiveProducts@94::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -5450,7 +5450,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -5482,20 +5482,20 @@ .line 94,94 : 45,58 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensiveProducts@94-6'::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensiveProducts@94::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_003e: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc .line 94,94 : 45,58 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 94,94 : 45,58 '' @@ -5503,11 +5503,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_0060: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc .line 94,94 : 59,89 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current IL_006c: ldc.i4.1 IL_006d: ret @@ -5517,24 +5517,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_0073: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc .line 94,94 : 45,58 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_008d: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method 'mostExpensiveProducts@94-6'::GenerateNext + } // end of method mostExpensiveProducts@94::GenerateNext .method public strict virtual instance void Close() cil managed @@ -5546,7 +5546,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -5562,7 +5562,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc IL_0020: switch ( IL_0037, IL_0039, @@ -5600,19 +5600,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'mostExpensiveProducts@94-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/mostExpensiveProducts@94::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -5652,7 +5652,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'mostExpensiveProducts@94-6'::Close + } // end of method mostExpensiveProducts@94::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -5661,7 +5661,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'mostExpensiveProducts@94-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/mostExpensiveProducts@94::pc IL_0006: switch ( IL_001d, IL_001f, @@ -5703,7 +5703,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'mostExpensiveProducts@94-6'::get_CheckClose + } // end of method mostExpensiveProducts@94::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -5713,9 +5713,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'mostExpensiveProducts@94-6'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/mostExpensiveProducts@94::current IL_0006: ret - } // end of method 'mostExpensiveProducts@94-6'::get_LastGenerated + } // end of method mostExpensiveProducts@94::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -5725,20 +5725,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'mostExpensiveProducts@94-6'::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/mostExpensiveProducts@94::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/'mostExpensiveProducts@94-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/mostExpensiveProducts@94::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method 'mostExpensiveProducts@94-6'::GetFreshEnumerator + } // end of method mostExpensiveProducts@94::GetFreshEnumerator - } // end of class 'mostExpensiveProducts@94-6' + } // end of class mostExpensiveProducts@94 - .class auto ansi serializable sealed nested assembly beforefieldinit 'mostExpensiveProducts@94-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'mostExpensiveProducts@94-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .field public valuetype [mscorlib]System.Decimal maxPrice @@ -5753,9 +5753,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'mostExpensiveProducts@94-7'::maxPrice + IL_0008: stfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'mostExpensiveProducts@94-1'::maxPrice IL_000d: ret - } // end of method 'mostExpensiveProducts@94-7'::.ctor + } // end of method 'mostExpensiveProducts@94-1'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product x) cil managed @@ -5766,15 +5766,15 @@ IL_0000: ldarg.1 IL_0001: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0006: ldarg.0 - IL_0007: ldfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'mostExpensiveProducts@94-7'::maxPrice + IL_0007: ldfld valuetype [mscorlib]System.Decimal Linq101Aggregates01/'mostExpensiveProducts@94-1'::maxPrice IL_000c: call bool [mscorlib]System.Decimal::op_Equality(valuetype [mscorlib]System.Decimal, valuetype [mscorlib]System.Decimal) IL_0011: ret - } // end of method 'mostExpensiveProducts@94-7'::Invoke + } // end of method 'mostExpensiveProducts@94-1'::Invoke - } // end of class 'mostExpensiveProducts@94-7' + } // end of class 'mostExpensiveProducts@94-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@92-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -5792,9 +5792,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@92-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@92-3'::builder@ IL_000d: ret - } // end of method 'categories5@92-18'::.ctor + } // end of method 'categories5@92-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -5813,12 +5813,12 @@ IL_0008: ldnull IL_0009: ldc.i4.0 IL_000a: ldnull - IL_000b: newobj instance void Linq101Aggregates01/'maxPrice@93-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000b: newobj instance void Linq101Aggregates01/maxPrice@93::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0010: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0015: newobj instance void Linq101Aggregates01/'maxPrice@93-7'::.ctor() + IL_0015: newobj instance void Linq101Aggregates01/'maxPrice@93-1'::.ctor() IL_001a: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MaxBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_001f: stloc.1 @@ -5830,20 +5830,20 @@ IL_0028: ldnull IL_0029: ldc.i4.0 IL_002a: ldnull - IL_002b: newobj instance void Linq101Aggregates01/'mostExpensiveProducts@94-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_002b: newobj instance void Linq101Aggregates01/mostExpensiveProducts@94::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0030: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0035: ldloc.1 - IL_0036: newobj instance void Linq101Aggregates01/'mostExpensiveProducts@94-7'::.ctor(valuetype [mscorlib]System.Decimal) + IL_0036: newobj instance void Linq101Aggregates01/'mostExpensiveProducts@94-1'::.ctor(valuetype [mscorlib]System.Decimal) IL_003b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0040: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0045: stloc.2 .line 95,95 : 9,46 '' IL_0046: ldarg.0 - IL_0047: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@92-18'::builder@ + IL_0047: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories5@92-3'::builder@ IL_004c: ldloc.0 IL_004d: ldloc.1 IL_004e: ldloc.2 @@ -5853,11 +5853,11 @@ IL_0054: tail. IL_0056: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>(!!0) IL_005b: ret - } // end of method 'categories5@92-18'::Invoke + } // end of method 'categories5@92-3'::Invoke - } // end of class 'categories5@92-18' + } // end of class 'categories5@92-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@95-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories5@95-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -5870,7 +5870,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'categories5@95-19'::.ctor + } // end of method 'categories5@95-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [mscorlib]System.Tuple`3,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1> tupledArg) cil managed @@ -5897,11 +5897,11 @@ IL_001c: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0021: ret - } // end of method 'categories5@95-19'::Invoke + } // end of method 'categories5@95-4'::Invoke - } // end of class 'categories5@95-19' + } // end of class 'categories5@95-4' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'averageNum@100-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname averageNum@100 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -5926,17 +5926,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_0009: stfld int32 Linq101Aggregates01/averageNum@100::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld float64 Linq101Aggregates01/'averageNum@100-6'::current + IL_0010: stfld float64 Linq101Aggregates01/averageNum@100::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'averageNum@100-6'::.ctor + } // end of method averageNum@100::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -5947,7 +5947,7 @@ [1] float64 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/averageNum@100::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -5980,18 +5980,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_numbers2() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_003d: stfld int32 Linq101Aggregates01/averageNum@100::pc .line 100,100 : 26,46 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 100,100 : 26,46 '' @@ -5999,11 +5999,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_005f: stfld int32 Linq101Aggregates01/averageNum@100::pc .line 100,100 : 47,58 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld float64 Linq101Aggregates01/'averageNum@100-6'::current + IL_0066: stfld float64 Linq101Aggregates01/averageNum@100::current IL_006b: ldc.i4.1 IL_006c: ret @@ -6013,24 +6013,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_0072: stfld int32 Linq101Aggregates01/averageNum@100::pc .line 100,100 : 26,46 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_008c: stfld int32 Linq101Aggregates01/averageNum@100::pc IL_0091: ldarg.0 IL_0092: ldc.r8 0.0 - IL_009b: stfld float64 Linq101Aggregates01/'averageNum@100-6'::current + IL_009b: stfld float64 Linq101Aggregates01/averageNum@100::current IL_00a0: ldc.i4.0 IL_00a1: ret - } // end of method 'averageNum@100-6'::GenerateNext + } // end of method averageNum@100::GenerateNext .method public strict virtual instance void Close() cil managed @@ -6042,7 +6042,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/averageNum@100::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -6058,7 +6058,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/averageNum@100::pc IL_0020: switch ( IL_0037, IL_0039, @@ -6096,19 +6096,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/averageNum@100::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averageNum@100-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averageNum@100::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/averageNum@100::pc IL_0068: ldarg.0 IL_0069: ldc.r8 0.0 - IL_0072: stfld float64 Linq101Aggregates01/'averageNum@100-6'::current + IL_0072: stfld float64 Linq101Aggregates01/averageNum@100::current IL_0077: ldnull IL_0078: stloc.1 IL_0079: leave.s IL_0087 @@ -6148,7 +6148,7 @@ .line 100001,100001 : 0,0 '' IL_009b: ret - } // end of method 'averageNum@100-6'::Close + } // end of method averageNum@100::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -6157,7 +6157,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'averageNum@100-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/averageNum@100::pc IL_0006: switch ( IL_001d, IL_001f, @@ -6199,7 +6199,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'averageNum@100-6'::get_CheckClose + } // end of method averageNum@100::get_CheckClose .method public strict virtual instance float64 get_LastGenerated() cil managed @@ -6209,9 +6209,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld float64 Linq101Aggregates01/'averageNum@100-6'::current + IL_0001: ldfld float64 Linq101Aggregates01/averageNum@100::current IL_0006: ret - } // end of method 'averageNum@100-6'::get_LastGenerated + } // end of method averageNum@100::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -6223,15 +6223,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.r8 0.0 - IL_000b: newobj instance void Linq101Aggregates01/'averageNum@100-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - float64) + IL_000b: newobj instance void Linq101Aggregates01/averageNum@100::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + float64) IL_0010: ret - } // end of method 'averageNum@100-6'::GetFreshEnumerator + } // end of method averageNum@100::GetFreshEnumerator - } // end of class 'averageNum@100-6' + } // end of class averageNum@100 - .class auto ansi serializable sealed nested assembly beforefieldinit 'averageNum@100-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'averageNum@100-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -6244,7 +6244,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'averageNum@100-7'::.ctor + } // end of method 'averageNum@100-1'::.ctor .method public strict virtual instance float64 Invoke(float64 n) cil managed @@ -6254,11 +6254,11 @@ .line 100,100 : 57,58 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'averageNum@100-7'::Invoke + } // end of method 'averageNum@100-1'::Invoke - } // end of class 'averageNum@100-7' + } // end of class 'averageNum@100-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'averageLength@105-6' + .class auto ansi serializable sealed nested assembly beforefieldinit averageLength@105 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -6276,9 +6276,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'averageLength@105-6'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/averageLength@105::builder@ IL_000d: ret - } // end of method 'averageLength@105-6'::.ctor + } // end of method averageLength@105::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(string _arg1) cil managed @@ -6297,7 +6297,7 @@ IL_0009: stloc.1 .line 107,107 : 9,21 '' IL_000a: ldarg.0 - IL_000b: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'averageLength@105-6'::builder@ + IL_000b: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/averageLength@105::builder@ IL_0010: ldloc.0 IL_0011: ldloc.1 IL_0012: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, @@ -6305,11 +6305,11 @@ IL_0017: tail. IL_0019: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001e: ret - } // end of method 'averageLength@105-6'::Invoke + } // end of method averageLength@105::Invoke - } // end of class 'averageLength@105-6' + } // end of class averageLength@105 - .class auto ansi serializable sealed nested assembly beforefieldinit 'averageLength@107-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'averageLength@107-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,float64> { .method assembly specialname rtspecialname @@ -6322,7 +6322,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,float64>::.ctor() IL_0006: ret - } // end of method 'averageLength@107-7'::.ctor + } // end of method 'averageLength@107-1'::.ctor .method public strict virtual instance float64 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -6341,11 +6341,11 @@ .line 107,107 : 19,21 '' IL_000e: ldloc.1 IL_000f: ret - } // end of method 'averageLength@107-7'::Invoke + } // end of method 'averageLength@107-1'::Invoke - } // end of class 'averageLength@107-7' + } // end of class 'averageLength@107-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@113-15' + .class auto ansi serializable sealed nested assembly beforefieldinit categories6@113 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -6363,9 +6363,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@113-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories6@113::builder@ IL_000d: ret - } // end of method 'categories6@113-15'::.ctor + } // end of method categories6@113::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -6378,16 +6378,16 @@ IL_0001: stloc.0 .line 114,114 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@113-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/categories6@113::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'categories6@113-15'::Invoke + } // end of method categories6@113::Invoke - } // end of class 'categories6@113-15' + } // end of class categories6@113 - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -6400,7 +6400,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories6@114-16'::.ctor + } // end of method 'categories6@114-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -6410,11 +6410,11 @@ .line 114,114 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'categories6@114-16'::Invoke + } // end of method 'categories6@114-1'::Invoke - } // end of class 'categories6@114-16' + } // end of class 'categories6@114-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -6427,7 +6427,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'categories6@114-17'::.ctor + } // end of method 'categories6@114-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -6439,11 +6439,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'categories6@114-17'::Invoke + } // end of method 'categories6@114-2'::Invoke - } // end of class 'categories6@114-17' + } // end of class 'categories6@114-2' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'averagePrice@115-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname averagePrice@115 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -6470,20 +6470,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'averagePrice@115-6'::g + IL_0002: stfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/averagePrice@115::g IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_0010: stfld int32 Linq101Aggregates01/averagePrice@115::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current + IL_0018: stfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'averagePrice@115-6'::.ctor + } // end of method averagePrice@115::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -6494,7 +6494,7 @@ [1] class [Utils]Utils/Product x) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/averagePrice@115::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -6526,20 +6526,20 @@ .line 115,115 : 36,49 '' IL_002b: ldarg.0 IL_002c: ldarg.0 - IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'averagePrice@115-6'::g + IL_002d: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/averagePrice@115::g IL_0032: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' + IL_0037: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' IL_003c: ldarg.0 IL_003d: ldc.i4.1 - IL_003e: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_003e: stfld int32 Linq101Aggregates01/averagePrice@115::pc .line 115,115 : 36,49 '' IL_0043: ldarg.0 - IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' + IL_0044: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' IL_0049: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004e: brfalse.s IL_0071 IL_0050: ldarg.0 - IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' + IL_0051: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' IL_0056: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005b: stloc.0 .line 115,115 : 36,49 '' @@ -6547,11 +6547,11 @@ IL_005d: stloc.1 IL_005e: ldarg.0 IL_005f: ldc.i4.2 - IL_0060: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_0060: stfld int32 Linq101Aggregates01/averagePrice@115::pc .line 115,115 : 50,71 '' IL_0065: ldarg.0 IL_0066: ldloc.1 - IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current + IL_0067: stfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current IL_006c: ldc.i4.1 IL_006d: ret @@ -6561,24 +6561,24 @@ IL_0071: ldarg.0 IL_0072: ldc.i4.3 - IL_0073: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_0073: stfld int32 Linq101Aggregates01/averagePrice@115::pc .line 115,115 : 36,49 '' IL_0078: ldarg.0 - IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' + IL_0079: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' IL_007e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0083: nop IL_0084: ldarg.0 IL_0085: ldnull - IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' + IL_0086: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_008d: stfld int32 Linq101Aggregates01/averagePrice@115::pc IL_0092: ldarg.0 IL_0093: ldnull - IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current + IL_0094: stfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current IL_0099: ldc.i4.0 IL_009a: ret - } // end of method 'averagePrice@115-6'::GenerateNext + } // end of method averagePrice@115::GenerateNext .method public strict virtual instance void Close() cil managed @@ -6590,7 +6590,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/averagePrice@115::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -6606,7 +6606,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_001b: ldfld int32 Linq101Aggregates01/averagePrice@115::pc IL_0020: switch ( IL_0037, IL_0039, @@ -6644,19 +6644,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_004f: stfld int32 Linq101Aggregates01/averagePrice@115::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/'averagePrice@115-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Aggregates01/averagePrice@115::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_0063: stfld int32 Linq101Aggregates01/averagePrice@115::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current + IL_006a: stfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -6696,7 +6696,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'averagePrice@115-6'::Close + } // end of method averagePrice@115::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -6705,7 +6705,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Aggregates01/'averagePrice@115-6'::pc + IL_0001: ldfld int32 Linq101Aggregates01/averagePrice@115::pc IL_0006: switch ( IL_001d, IL_001f, @@ -6747,7 +6747,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'averagePrice@115-6'::get_CheckClose + } // end of method averagePrice@115::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -6757,9 +6757,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/'averagePrice@115-6'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Aggregates01/averagePrice@115::current IL_0006: ret - } // end of method 'averagePrice@115-6'::get_LastGenerated + } // end of method averagePrice@115::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -6769,20 +6769,20 @@ // Code size 15 (0xf) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/'averagePrice@115-6'::g + IL_0001: ldfld class [System.Core]System.Linq.IGrouping`2 Linq101Aggregates01/averagePrice@115::g IL_0006: ldnull IL_0007: ldc.i4.0 IL_0008: ldnull - IL_0009: newobj instance void Linq101Aggregates01/'averagePrice@115-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0009: newobj instance void Linq101Aggregates01/averagePrice@115::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_000e: ret - } // end of method 'averagePrice@115-6'::GetFreshEnumerator + } // end of method averagePrice@115::GetFreshEnumerator - } // end of class 'averagePrice@115-6' + } // end of class averagePrice@115 - .class auto ansi serializable sealed nested assembly beforefieldinit 'averagePrice@115-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'averagePrice@115-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -6795,7 +6795,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'averagePrice@115-7'::.ctor + } // end of method 'averagePrice@115-1'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product x) cil managed @@ -6807,11 +6807,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'averagePrice@115-7'::Invoke + } // end of method 'averagePrice@115-1'::Invoke - } // end of class 'averagePrice@115-7' + } // end of class 'averagePrice@115-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@114-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -6829,9 +6829,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@114-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@114-3'::builder@ IL_000d: ret - } // end of method 'categories6@114-18'::.ctor + } // end of method 'categories6@114-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,valuetype [mscorlib]System.Decimal>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -6863,13 +6863,13 @@ IL_000b: ldnull IL_000c: ldc.i4.0 IL_000d: ldnull - IL_000e: newobj instance void Linq101Aggregates01/'averagePrice@115-6'::.ctor(class [System.Core]System.Linq.IGrouping`2, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_000e: newobj instance void Linq101Aggregates01/averagePrice@115::.ctor(class [System.Core]System.Linq.IGrouping`2, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0013: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0018: stloc.s V_4 - IL_001a: newobj instance void Linq101Aggregates01/'averagePrice@115-7'::.ctor() + IL_001a: newobj instance void Linq101Aggregates01/'averagePrice@115-1'::.ctor() IL_001f: stloc.s V_5 IL_0021: ldloc.s V_4 IL_0023: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -6981,7 +6981,7 @@ IL_00d0: stloc.1 .line 116,116 : 9,37 '' IL_00d1: ldarg.0 - IL_00d2: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@114-18'::builder@ + IL_00d2: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Aggregates01/'categories6@114-3'::builder@ IL_00d7: ldloc.0 IL_00d8: ldloc.1 IL_00d9: newobj instance void class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>::.ctor(!0, @@ -6989,11 +6989,11 @@ IL_00de: tail. IL_00e0: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,valuetype [mscorlib]System.Decimal>,object>(!!0) IL_00e5: ret - } // end of method 'categories6@114-18'::Invoke + } // end of method 'categories6@114-3'::Invoke - } // end of class 'categories6@114-18' + } // end of class 'categories6@114-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@116-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categories6@116-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -7006,7 +7006,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'categories6@116-19'::.ctor + } // end of method 'categories6@116-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal> tupledArg) cil managed @@ -7029,16 +7029,16 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'categories6@116-19'::Invoke + } // end of method 'categories6@116-4'::Invoke - } // end of class 'categories6@116-19' + } // end of class 'categories6@116-4' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_factorsOf300() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'factorsOf300@8-12' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::factorsOf300@8 IL_0005: ret } // end of method Linq101Aggregates01::get_factorsOf300 @@ -7047,7 +7047,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'uniqueFactors@10-12' + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::uniqueFactors@10 IL_0005: ret } // end of method Linq101Aggregates01::get_uniqueFactors @@ -7056,7 +7056,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'numbers@17-39' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::numbers@17 IL_0005: ret } // end of method Linq101Aggregates01::get_numbers @@ -7065,7 +7065,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'numSum@19-6' + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::numSum@19 IL_0005: ret } // end of method Linq101Aggregates01::get_numSum @@ -7074,7 +7074,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'words@26-30' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::words@26 IL_0005: ret } // end of method Linq101Aggregates01::get_words @@ -7083,7 +7083,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'totalChars@28-6' + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::totalChars@28 IL_0005: ret } // end of method Linq101Aggregates01::get_totalChars @@ -7092,7 +7092,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'products@35-54' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::products@35 IL_0005: ret } // end of method Linq101Aggregates01::get_products @@ -7101,7 +7101,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories@37-12' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories@37 IL_0005: ret } // end of method Linq101Aggregates01::get_categories @@ -7110,7 +7110,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'minNum@49-6' + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::minNum@49 IL_0005: ret } // end of method Linq101Aggregates01::get_minNum @@ -7119,7 +7119,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'shortestWord@52-6' + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::shortestWord@52 IL_0005: ret } // end of method Linq101Aggregates01::get_shortestWord @@ -7128,7 +7128,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories2@55-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories2@55 IL_0005: ret } // end of method Linq101Aggregates01::get_categories2 @@ -7137,7 +7137,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::'categories3@64-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::categories3@64 IL_0005: ret } // end of method Linq101Aggregates01::get_categories3 @@ -7146,7 +7146,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'maxNum@74-6' + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::maxNum@74 IL_0005: ret } // end of method Linq101Aggregates01::get_maxNum @@ -7155,7 +7155,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101Aggregates01::'longestLength@77-6' + IL_0000: ldsfld int32 ''.$Linq101Aggregates01::longestLength@77 IL_0005: ret } // end of method Linq101Aggregates01::get_longestLength @@ -7164,7 +7164,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories4@80-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories4@80 IL_0005: ret } // end of method Linq101Aggregates01::get_categories4 @@ -7173,7 +7173,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::'categories5@89-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::categories5@89 IL_0005: ret } // end of method Linq101Aggregates01::get_categories5 @@ -7182,7 +7182,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'numbers2@99-12' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::numbers2@99 IL_0005: ret } // end of method Linq101Aggregates01::get_numbers2 @@ -7191,7 +7191,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld float64 ''.$Linq101Aggregates01::'averageNum@100-6' + IL_0000: ldsfld float64 ''.$Linq101Aggregates01::averageNum@100 IL_0005: ret } // end of method Linq101Aggregates01::get_averageNum @@ -7200,7 +7200,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld float64 ''.$Linq101Aggregates01::'averageLength@103-6' + IL_0000: ldsfld float64 ''.$Linq101Aggregates01::averageLength@103 IL_0005: ret } // end of method Linq101Aggregates01::get_averageLength @@ -7209,7 +7209,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories6@111-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories6@111 IL_0005: ret } // end of method Linq101Aggregates01::get_categories6 @@ -7329,45 +7329,45 @@ .class private abstract auto ansi sealed ''.$Linq101Aggregates01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'factorsOf300@8-12' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 factorsOf300@8 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'uniqueFactors@10-12' + .field static assembly int32 uniqueFactors@10 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@17-39' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numbers@17 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'numSum@19-6' + .field static assembly int32 numSum@19 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@26-30' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 words@26 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'totalChars@28-6' + .field static assembly int32 totalChars@28 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@35-54' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 products@35 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'categories@37-12' + .field static assembly class [mscorlib]System.Tuple`2[] categories@37 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'minNum@49-6' + .field static assembly int32 minNum@49 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'shortestWord@52-6' + .field static assembly int32 shortestWord@52 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'categories2@55-6' + .field static assembly class [mscorlib]System.Tuple`2[] categories2@55 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] 'categories3@64-6' + .field static assembly class [mscorlib]System.Tuple`2>[] categories3@64 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'maxNum@74-6' + .field static assembly int32 maxNum@74 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'longestLength@77-6' + .field static assembly int32 longestLength@77 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'categories4@80-6' + .field static assembly class [mscorlib]System.Tuple`2[] categories4@80 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] 'categories5@89-6' + .field static assembly class [mscorlib]System.Tuple`2>[] categories5@89 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers2@99-12' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numbers2@99 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly float64 'averageNum@100-6' + .field static assembly float64 averageNum@100 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly float64 'averageLength@103-6' + .field static assembly float64 averageLength@103 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'categories6@111-6' + .field static assembly class [mscorlib]System.Tuple`2[] categories6@111 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -7465,7 +7465,7 @@ IL_001e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0023: dup - IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'factorsOf300@8-12' + IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::factorsOf300@8 IL_0029: stloc.0 .line 10,14 : 1,20 '' IL_002a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7474,15 +7474,15 @@ IL_0033: ldnull IL_0034: ldc.i4.0 IL_0035: ldc.i4.0 - IL_0036: newobj instance void Linq101Aggregates01/'uniqueFactors@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0036: newobj instance void Linq101Aggregates01/uniqueFactors@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_003b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0040: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Distinct(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_0045: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_004a: call int32 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Length(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_004f: dup - IL_0050: stsfld int32 ''.$Linq101Aggregates01::'uniqueFactors@10-12' + IL_0050: stsfld int32 ''.$Linq101Aggregates01::uniqueFactors@10 IL_0055: stloc.1 .line 17,17 : 1,47 '' IL_0056: ldc.i4.5 @@ -7517,7 +7517,7 @@ IL_0093: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0098: dup - IL_0099: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'numbers@17-39' + IL_0099: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::numbers@17 IL_009e: stloc.2 IL_009f: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00a4: stloc.s V_21 @@ -7526,12 +7526,12 @@ IL_00aa: ldnull IL_00ab: ldc.i4.0 IL_00ac: ldc.i4.0 - IL_00ad: newobj instance void Linq101Aggregates01/'numSum@21-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_00ad: newobj instance void Linq101Aggregates01/numSum@21::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_00b2: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00b7: stloc.s V_23 - IL_00b9: newobj instance void Linq101Aggregates01/'numSum@22-7'::.ctor() + IL_00b9: newobj instance void Linq101Aggregates01/'numSum@22-1'::.ctor() IL_00be: stloc.s V_24 IL_00c0: ldloc.s V_23 IL_00c2: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -7590,7 +7590,7 @@ } // end handler IL_0118: ldloc.s V_27 IL_011a: dup - IL_011b: stsfld int32 ''.$Linq101Aggregates01::'numSum@19-6' + IL_011b: stsfld int32 ''.$Linq101Aggregates01::numSum@19 IL_0120: stloc.3 .line 26,26 : 1,45 '' IL_0121: ldstr "cherry" @@ -7604,7 +7604,7 @@ IL_013f: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0144: dup - IL_0145: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'words@26-30' + IL_0145: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::words@26 IL_014a: stloc.s words IL_014c: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0151: stloc.s V_30 @@ -7613,12 +7613,12 @@ IL_0157: ldnull IL_0158: ldc.i4.0 IL_0159: ldnull - IL_015a: newobj instance void Linq101Aggregates01/'totalChars@30-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_015a: newobj instance void Linq101Aggregates01/totalChars@30::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_015f: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0164: stloc.s V_32 - IL_0166: newobj instance void Linq101Aggregates01/'totalChars@31-7'::.ctor() + IL_0166: newobj instance void Linq101Aggregates01/'totalChars@31-1'::.ctor() IL_016b: stloc.s V_33 IL_016d: ldloc.s V_32 IL_016f: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -7677,12 +7677,12 @@ } // end handler IL_01c5: ldloc.s V_36 IL_01c7: dup - IL_01c8: stsfld int32 ''.$Linq101Aggregates01::'totalChars@28-6' + IL_01c8: stsfld int32 ''.$Linq101Aggregates01::totalChars@28 IL_01cd: stloc.s totalChars .line 35,35 : 1,32 '' IL_01cf: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_01d4: dup - IL_01d5: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'products@35-54' + IL_01d5: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::products@35 IL_01da: stloc.s products .line 37,46 : 1,21 '' IL_01dc: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7695,53 +7695,53 @@ IL_01ed: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_01f2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01f7: ldloc.s V_39 - IL_01f9: newobj instance void Linq101Aggregates01/'categories@39-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01f9: newobj instance void Linq101Aggregates01/categories@39::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01fe: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0203: newobj instance void Linq101Aggregates01/'categories@40-16'::.ctor() - IL_0208: newobj instance void Linq101Aggregates01/'categories@40-17'::.ctor() + IL_0203: newobj instance void Linq101Aggregates01/'categories@40-1'::.ctor() + IL_0208: newobj instance void Linq101Aggregates01/'categories@40-2'::.ctor() IL_020d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0212: ldloc.s V_39 - IL_0214: newobj instance void Linq101Aggregates01/'categories@40-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0214: newobj instance void Linq101Aggregates01/'categories@40-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0219: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,int32>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_021e: newobj instance void Linq101Aggregates01/'categories@45-19'::.ctor() + IL_021e: newobj instance void Linq101Aggregates01/'categories@45-4'::.ctor() IL_0223: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,int32>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0228: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_022d: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0232: dup - IL_0233: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories@37-12' + IL_0233: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories@37 IL_0238: stloc.s categories IL_023a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_023f: ldnull IL_0240: ldc.i4.0 IL_0241: ldc.i4.0 - IL_0242: newobj instance void Linq101Aggregates01/'minNum@49-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0242: newobj instance void Linq101Aggregates01/minNum@49::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0247: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_024c: newobj instance void Linq101Aggregates01/'minNum@49-7'::.ctor() + IL_024c: newobj instance void Linq101Aggregates01/'minNum@49-1'::.ctor() IL_0251: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MinBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0256: dup - IL_0257: stsfld int32 ''.$Linq101Aggregates01::'minNum@49-6' + IL_0257: stsfld int32 ''.$Linq101Aggregates01::minNum@49 IL_025c: stloc.s minNum IL_025e: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0263: ldnull IL_0264: ldc.i4.0 IL_0265: ldnull - IL_0266: newobj instance void Linq101Aggregates01/'shortestWord@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0266: newobj instance void Linq101Aggregates01/shortestWord@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_026b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0270: newobj instance void Linq101Aggregates01/'shortestWord@52-7'::.ctor() + IL_0270: newobj instance void Linq101Aggregates01/'shortestWord@52-1'::.ctor() IL_0275: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MinBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_027a: dup - IL_027b: stsfld int32 ''.$Linq101Aggregates01::'shortestWord@52-6' + IL_027b: stsfld int32 ''.$Linq101Aggregates01::shortestWord@52 IL_0280: stloc.s shortestWord .line 55,61 : 1,21 '' IL_0282: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7754,25 +7754,25 @@ IL_0293: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_0298: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_029d: ldloc.s V_40 - IL_029f: newobj instance void Linq101Aggregates01/'categories2@57-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_029f: newobj instance void Linq101Aggregates01/categories2@57::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_02a4: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_02a9: newobj instance void Linq101Aggregates01/'categories2@58-16'::.ctor() - IL_02ae: newobj instance void Linq101Aggregates01/'categories2@58-17'::.ctor() + IL_02a9: newobj instance void Linq101Aggregates01/'categories2@58-1'::.ctor() + IL_02ae: newobj instance void Linq101Aggregates01/'categories2@58-2'::.ctor() IL_02b3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_02b8: ldloc.s V_40 - IL_02ba: newobj instance void Linq101Aggregates01/'categories2@58-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_02ba: newobj instance void Linq101Aggregates01/'categories2@58-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_02bf: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_02c4: newobj instance void Linq101Aggregates01/'categories2@60-19'::.ctor() + IL_02c4: newobj instance void Linq101Aggregates01/'categories2@60-4'::.ctor() IL_02c9: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_02ce: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_02d3: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_02d8: dup - IL_02d9: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories2@55-6' + IL_02d9: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories2@55 IL_02de: stloc.s categories2 .line 64,71 : 1,21 '' IL_02e0: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7785,53 +7785,53 @@ IL_02f1: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_02f6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_02fb: ldloc.s V_41 - IL_02fd: newobj instance void Linq101Aggregates01/'categories3@66-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_02fd: newobj instance void Linq101Aggregates01/categories3@66::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0302: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0307: newobj instance void Linq101Aggregates01/'categories3@67-16'::.ctor() - IL_030c: newobj instance void Linq101Aggregates01/'categories3@67-17'::.ctor() + IL_0307: newobj instance void Linq101Aggregates01/'categories3@67-1'::.ctor() + IL_030c: newobj instance void Linq101Aggregates01/'categories3@67-2'::.ctor() IL_0311: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0316: ldloc.s V_41 - IL_0318: newobj instance void Linq101Aggregates01/'categories3@67-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0318: newobj instance void Linq101Aggregates01/'categories3@67-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_031d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0322: newobj instance void Linq101Aggregates01/'categories3@70-19'::.ctor() + IL_0322: newobj instance void Linq101Aggregates01/'categories3@70-4'::.ctor() IL_0327: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_032c: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0331: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0336: dup - IL_0337: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::'categories3@64-6' + IL_0337: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::categories3@64 IL_033c: stloc.s categories3 IL_033e: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0343: ldnull IL_0344: ldc.i4.0 IL_0345: ldc.i4.0 - IL_0346: newobj instance void Linq101Aggregates01/'maxNum@74-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0346: newobj instance void Linq101Aggregates01/maxNum@74::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_034b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0350: newobj instance void Linq101Aggregates01/'maxNum@74-7'::.ctor() + IL_0350: newobj instance void Linq101Aggregates01/'maxNum@74-1'::.ctor() IL_0355: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MaxBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_035a: dup - IL_035b: stsfld int32 ''.$Linq101Aggregates01::'maxNum@74-6' + IL_035b: stsfld int32 ''.$Linq101Aggregates01::maxNum@74 IL_0360: stloc.s maxNum IL_0362: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0367: ldnull IL_0368: ldc.i4.0 IL_0369: ldnull - IL_036a: newobj instance void Linq101Aggregates01/'longestLength@77-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_036a: newobj instance void Linq101Aggregates01/longestLength@77::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_036f: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0374: newobj instance void Linq101Aggregates01/'longestLength@77-7'::.ctor() + IL_0374: newobj instance void Linq101Aggregates01/'longestLength@77-1'::.ctor() IL_0379: callvirt instance !!2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::MaxBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_037e: dup - IL_037f: stsfld int32 ''.$Linq101Aggregates01::'longestLength@77-6' + IL_037f: stsfld int32 ''.$Linq101Aggregates01::longestLength@77 IL_0384: stloc.s longestLength .line 80,86 : 1,21 '' IL_0386: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7844,25 +7844,25 @@ IL_0397: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_039c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03a1: ldloc.s V_42 - IL_03a3: newobj instance void Linq101Aggregates01/'categories4@82-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_03a3: newobj instance void Linq101Aggregates01/categories4@82::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_03a8: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_03ad: newobj instance void Linq101Aggregates01/'categories4@83-16'::.ctor() - IL_03b2: newobj instance void Linq101Aggregates01/'categories4@83-17'::.ctor() + IL_03ad: newobj instance void Linq101Aggregates01/'categories4@83-1'::.ctor() + IL_03b2: newobj instance void Linq101Aggregates01/'categories4@83-2'::.ctor() IL_03b7: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_03bc: ldloc.s V_42 - IL_03be: newobj instance void Linq101Aggregates01/'categories4@83-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_03be: newobj instance void Linq101Aggregates01/'categories4@83-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_03c3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_03c8: newobj instance void Linq101Aggregates01/'categories4@85-19'::.ctor() + IL_03c8: newobj instance void Linq101Aggregates01/'categories4@85-4'::.ctor() IL_03cd: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_03d2: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_03d7: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03dc: dup - IL_03dd: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories4@80-6' + IL_03dd: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories4@80 IL_03e2: stloc.s categories4 .line 89,96 : 1,21 '' IL_03e4: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -7875,25 +7875,25 @@ IL_03f5: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_03fa: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03ff: ldloc.s V_43 - IL_0401: newobj instance void Linq101Aggregates01/'categories5@91-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0401: newobj instance void Linq101Aggregates01/categories5@91::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0406: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_040b: newobj instance void Linq101Aggregates01/'categories5@92-16'::.ctor() - IL_0410: newobj instance void Linq101Aggregates01/'categories5@92-17'::.ctor() + IL_040b: newobj instance void Linq101Aggregates01/'categories5@92-1'::.ctor() + IL_0410: newobj instance void Linq101Aggregates01/'categories5@92-2'::.ctor() IL_0415: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_041a: ldloc.s V_43 - IL_041c: newobj instance void Linq101Aggregates01/'categories5@92-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_041c: newobj instance void Linq101Aggregates01/'categories5@92-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0421: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0426: newobj instance void Linq101Aggregates01/'categories5@95-19'::.ctor() + IL_0426: newobj instance void Linq101Aggregates01/'categories5@95-4'::.ctor() IL_042b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal,class [mscorlib]System.Collections.Generic.IEnumerable`1>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0430: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0435: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_043a: dup - IL_043b: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::'categories5@89-6' + IL_043b: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Aggregates01::categories5@89 IL_0440: stloc.s categories5 .line 99,99 : 1,66 '' IL_0442: ldc.r8 5. @@ -7928,7 +7928,7 @@ IL_04ce: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_04d3: dup - IL_04d4: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::'numbers2@99-12' + IL_04d4: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Aggregates01::numbers2@99 IL_04d9: stloc.s numbers2 IL_04db: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_04e0: stloc.s V_44 @@ -7937,12 +7937,12 @@ IL_04e6: ldnull IL_04e7: ldc.i4.0 IL_04e8: ldc.r8 0.0 - IL_04f1: newobj instance void Linq101Aggregates01/'averageNum@100-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - float64) + IL_04f1: newobj instance void Linq101Aggregates01/averageNum@100::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + float64) IL_04f6: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_04fb: stloc.s V_46 - IL_04fd: newobj instance void Linq101Aggregates01/'averageNum@100-7'::.ctor() + IL_04fd: newobj instance void Linq101Aggregates01/'averageNum@100-1'::.ctor() IL_0502: stloc.s V_47 IL_0504: ldloc.s V_46 IL_0506: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() @@ -8041,7 +8041,7 @@ } // end handler IL_05a4: ldloc.s V_50 IL_05a6: dup - IL_05a7: stsfld float64 ''.$Linq101Aggregates01::'averageNum@100-6' + IL_05a7: stsfld float64 ''.$Linq101Aggregates01::averageNum@100 IL_05ac: stloc.s averageNum IL_05ae: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_05b3: stloc.s V_56 @@ -8052,11 +8052,11 @@ IL_05bd: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_words() IL_05c2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_05c7: ldloc.s V_56 - IL_05c9: newobj instance void Linq101Aggregates01/'averageLength@105-6'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_05c9: newobj instance void Linq101Aggregates01/averageLength@105::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_05ce: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_05d3: stloc.s V_58 - IL_05d5: newobj instance void Linq101Aggregates01/'averageLength@107-7'::.ctor() + IL_05d5: newobj instance void Linq101Aggregates01/'averageLength@107-1'::.ctor() IL_05da: stloc.s V_59 IL_05dc: ldloc.s V_58 IL_05de: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() @@ -8155,7 +8155,7 @@ } // end handler IL_067c: ldloc.s V_62 IL_067e: dup - IL_067f: stsfld float64 ''.$Linq101Aggregates01::'averageLength@103-6' + IL_067f: stsfld float64 ''.$Linq101Aggregates01::averageLength@103 IL_0684: stloc.s averageLength .line 111,117 : 1,21 '' IL_0686: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -8168,25 +8168,25 @@ IL_0697: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Aggregates01::get_products() IL_069c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_06a1: ldloc.s V_68 - IL_06a3: newobj instance void Linq101Aggregates01/'categories6@113-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_06a3: newobj instance void Linq101Aggregates01/categories6@113::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_06a8: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_06ad: newobj instance void Linq101Aggregates01/'categories6@114-16'::.ctor() - IL_06b2: newobj instance void Linq101Aggregates01/'categories6@114-17'::.ctor() + IL_06ad: newobj instance void Linq101Aggregates01/'categories6@114-1'::.ctor() + IL_06b2: newobj instance void Linq101Aggregates01/'categories6@114-2'::.ctor() IL_06b7: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_06bc: ldloc.s V_68 - IL_06be: newobj instance void Linq101Aggregates01/'categories6@114-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_06be: newobj instance void Linq101Aggregates01/'categories6@114-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_06c3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,valuetype [mscorlib]System.Decimal>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_06c8: newobj instance void Linq101Aggregates01/'categories6@116-19'::.ctor() + IL_06c8: newobj instance void Linq101Aggregates01/'categories6@116-4'::.ctor() IL_06cd: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,valuetype [mscorlib]System.Decimal>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_06d2: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_06d7: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_06dc: dup - IL_06dd: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::'categories6@111-6' + IL_06dd: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Aggregates01::categories6@111 IL_06e2: stloc.s categories6 IL_06e4: ret } // end of method $Linq101Aggregates01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl index 55a365acbdf..d9fa52b0834 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101ElementOperators01.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000004D0 Length: 0x00000000 } .module Linq101ElementOperators01.exe -// MVID: {5BF2D3C6-19D7-C20D-A745-0383C6D3F25B} +// MVID: {5C6C932B-ED84-7458-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01760000 +// Image base: 0x01300000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'products12@12-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname products12@12 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -88,17 +88,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_0009: stfld int32 Linq101ElementOperators01/products12@12::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current + IL_0010: stfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'products12@12-6'::.ctor + } // end of method products12@12::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -110,7 +110,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101ElementOperators01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/products12@12::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_products() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_003d: stfld int32 Linq101ElementOperators01/products12@12::pc .line 12,12 : 9,29 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 12,12 : 9,29 '' @@ -162,11 +162,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_005f: stfld int32 Linq101ElementOperators01/products12@12::pc .line 13,13 : 9,33 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current + IL_0066: stfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current IL_006b: ldc.i4.1 IL_006c: ret @@ -176,24 +176,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_0072: stfld int32 Linq101ElementOperators01/products12@12::pc .line 12,12 : 9,29 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_008c: stfld int32 Linq101ElementOperators01/products12@12::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current + IL_0093: stfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'products12@12-6'::GenerateNext + } // end of method products12@12::GenerateNext .method public strict virtual instance void Close() cil managed @@ -205,7 +205,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/products12@12::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -221,7 +221,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_001b: ldfld int32 Linq101ElementOperators01/products12@12::pc IL_0020: switch ( IL_0037, IL_0039, @@ -259,19 +259,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_004f: stfld int32 Linq101ElementOperators01/products12@12::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'products12@12-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/products12@12::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_0063: stfld int32 Linq101ElementOperators01/products12@12::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current + IL_006a: stfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -311,7 +311,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'products12@12-6'::Close + } // end of method products12@12::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -320,7 +320,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'products12@12-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/products12@12::pc IL_0006: switch ( IL_001d, IL_001f, @@ -362,7 +362,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'products12@12-6'::get_CheckClose + } // end of method products12@12::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -372,9 +372,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101ElementOperators01/'products12@12-6'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101ElementOperators01/products12@12::current IL_0006: ret - } // end of method 'products12@12-6'::get_LastGenerated + } // end of method products12@12::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -386,15 +386,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101ElementOperators01/'products12@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0003: newobj instance void Linq101ElementOperators01/products12@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0008: ret - } // end of method 'products12@12-6'::GetFreshEnumerator + } // end of method products12@12::GetFreshEnumerator - } // end of class 'products12@12-6' + } // end of class products12@12 - .class auto ansi serializable sealed nested assembly beforefieldinit 'products12@13-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'products12@13-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -407,7 +407,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'products12@13-7'::.ctor + } // end of method 'products12@13-1'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product p) cil managed @@ -420,11 +420,11 @@ IL_0006: ldc.i4.s 12 IL_0008: ceq IL_000a: ret - } // end of method 'products12@13-7'::Invoke + } // end of method 'products12@13-1'::Invoke - } // end of class 'products12@13-7' + } // end of class 'products12@13-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'startsWithO@22-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname startsWithO@22 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -449,17 +449,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_0009: stfld int32 Linq101ElementOperators01/startsWithO@22::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101ElementOperators01/'startsWithO@22-6'::current + IL_0010: stfld string Linq101ElementOperators01/startsWithO@22::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'startsWithO@22-6'::.ctor + } // end of method startsWithO@22::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -470,7 +470,7 @@ [1] string s) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/startsWithO@22::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -503,18 +503,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_strings() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_003d: stfld int32 Linq101ElementOperators01/startsWithO@22::pc .line 22,22 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 22,22 : 9,28 '' @@ -522,11 +522,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_005f: stfld int32 Linq101ElementOperators01/startsWithO@22::pc .line 23,23 : 9,28 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101ElementOperators01/'startsWithO@22-6'::current + IL_0066: stfld string Linq101ElementOperators01/startsWithO@22::current IL_006b: ldc.i4.1 IL_006c: ret @@ -536,24 +536,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_0072: stfld int32 Linq101ElementOperators01/startsWithO@22::pc .line 22,22 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_008c: stfld int32 Linq101ElementOperators01/startsWithO@22::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101ElementOperators01/'startsWithO@22-6'::current + IL_0093: stfld string Linq101ElementOperators01/startsWithO@22::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'startsWithO@22-6'::GenerateNext + } // end of method startsWithO@22::GenerateNext .method public strict virtual instance void Close() cil managed @@ -565,7 +565,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/startsWithO@22::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -581,7 +581,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_001b: ldfld int32 Linq101ElementOperators01/startsWithO@22::pc IL_0020: switch ( IL_0037, IL_0039, @@ -619,19 +619,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_004f: stfld int32 Linq101ElementOperators01/startsWithO@22::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'startsWithO@22-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/startsWithO@22::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_0063: stfld int32 Linq101ElementOperators01/startsWithO@22::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101ElementOperators01/'startsWithO@22-6'::current + IL_006a: stfld string Linq101ElementOperators01/startsWithO@22::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -671,7 +671,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'startsWithO@22-6'::Close + } // end of method startsWithO@22::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -680,7 +680,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'startsWithO@22-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/startsWithO@22::pc IL_0006: switch ( IL_001d, IL_001f, @@ -722,7 +722,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'startsWithO@22-6'::get_CheckClose + } // end of method startsWithO@22::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -732,9 +732,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101ElementOperators01/'startsWithO@22-6'::current + IL_0001: ldfld string Linq101ElementOperators01/startsWithO@22::current IL_0006: ret - } // end of method 'startsWithO@22-6'::get_LastGenerated + } // end of method startsWithO@22::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -746,15 +746,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101ElementOperators01/'startsWithO@22-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101ElementOperators01/startsWithO@22::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'startsWithO@22-6'::GetFreshEnumerator + } // end of method startsWithO@22::GetFreshEnumerator - } // end of class 'startsWithO@22-6' + } // end of class startsWithO@22 - .class auto ansi serializable sealed nested assembly beforefieldinit 'startsWithO@23-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'startsWithO@23-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -767,7 +767,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'startsWithO@23-7'::.ctor + } // end of method 'startsWithO@23-1'::.ctor .method public strict virtual instance bool Invoke(string s) cil managed @@ -781,11 +781,11 @@ IL_0007: ldc.i4.s 111 IL_0009: ceq IL_000b: ret - } // end of method 'startsWithO@23-7'::Invoke + } // end of method 'startsWithO@23-1'::Invoke - } // end of class 'startsWithO@23-7' + } // end of class 'startsWithO@23-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'firstNumOrDefault@31-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname firstNumOrDefault@31 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -810,17 +810,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_0009: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current + IL_0010: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'firstNumOrDefault@31-3'::.ctor + } // end of method firstNumOrDefault@31::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -831,7 +831,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -864,18 +864,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_003d: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc .line 31,31 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 31,31 : 9,28 '' @@ -883,11 +883,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_005f: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc .line 32,32 : 9,22 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current + IL_0066: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current IL_006b: ldc.i4.1 IL_006c: ret @@ -897,24 +897,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_0072: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc .line 31,31 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_008c: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current + IL_0093: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'firstNumOrDefault@31-3'::GenerateNext + } // end of method firstNumOrDefault@31::GenerateNext .method public strict virtual instance void Close() cil managed @@ -926,7 +926,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -942,7 +942,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_001b: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc IL_0020: switch ( IL_0037, IL_0039, @@ -980,19 +980,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_004f: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'firstNumOrDefault@31-3'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/firstNumOrDefault@31::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_0063: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current + IL_006a: stfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1032,7 +1032,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'firstNumOrDefault@31-3'::Close + } // end of method firstNumOrDefault@31::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1041,7 +1041,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1083,7 +1083,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'firstNumOrDefault@31-3'::get_CheckClose + } // end of method firstNumOrDefault@31::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -1093,9 +1093,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'firstNumOrDefault@31-3'::current + IL_0001: ldfld int32 Linq101ElementOperators01/firstNumOrDefault@31::current IL_0006: ret - } // end of method 'firstNumOrDefault@31-3'::get_LastGenerated + } // end of method firstNumOrDefault@31::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1107,15 +1107,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101ElementOperators01/'firstNumOrDefault@31-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101ElementOperators01/firstNumOrDefault@31::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'firstNumOrDefault@31-3'::GetFreshEnumerator + } // end of method firstNumOrDefault@31::GetFreshEnumerator - } // end of class 'firstNumOrDefault@31-3' + } // end of class firstNumOrDefault@31 - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'fourthLowNum@52-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname fourthLowNum@52 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1140,17 +1140,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_0009: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current + IL_0010: stfld int32 Linq101ElementOperators01/fourthLowNum@52::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'fourthLowNum@52-6'::.ctor + } // end of method fourthLowNum@52::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1161,7 +1161,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1194,18 +1194,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_numbers2() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_003d: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc .line 52,52 : 9,29 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 52,52 : 9,29 '' @@ -1213,11 +1213,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_005f: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc .line 53,53 : 9,22 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current + IL_0066: stfld int32 Linq101ElementOperators01/fourthLowNum@52::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1227,24 +1227,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_0072: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc .line 52,52 : 9,29 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_008c: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current + IL_0093: stfld int32 Linq101ElementOperators01/fourthLowNum@52::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'fourthLowNum@52-6'::GenerateNext + } // end of method fourthLowNum@52::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1256,7 +1256,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1272,7 +1272,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_001b: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1310,19 +1310,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_004f: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/'fourthLowNum@52-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101ElementOperators01/fourthLowNum@52::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_0063: stfld int32 Linq101ElementOperators01/fourthLowNum@52::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current + IL_006a: stfld int32 Linq101ElementOperators01/fourthLowNum@52::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1362,7 +1362,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'fourthLowNum@52-6'::Close + } // end of method fourthLowNum@52::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1371,7 +1371,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::pc + IL_0001: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1413,7 +1413,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'fourthLowNum@52-6'::get_CheckClose + } // end of method fourthLowNum@52::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -1423,9 +1423,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101ElementOperators01/'fourthLowNum@52-6'::current + IL_0001: ldfld int32 Linq101ElementOperators01/fourthLowNum@52::current IL_0006: ret - } // end of method 'fourthLowNum@52-6'::get_LastGenerated + } // end of method fourthLowNum@52::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1437,15 +1437,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101ElementOperators01/'fourthLowNum@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101ElementOperators01/fourthLowNum@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'fourthLowNum@52-6'::GetFreshEnumerator + } // end of method fourthLowNum@52::GetFreshEnumerator - } // end of class 'fourthLowNum@52-6' + } // end of class fourthLowNum@52 - .class auto ansi serializable sealed nested assembly beforefieldinit 'fourthLowNum@53-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'fourthLowNum@53-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1458,7 +1458,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'fourthLowNum@53-7'::.ctor + } // end of method 'fourthLowNum@53-1'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -1470,16 +1470,16 @@ IL_0001: ldc.i4.5 IL_0002: cgt IL_0004: ret - } // end of method 'fourthLowNum@53-7'::Invoke + } // end of method 'fourthLowNum@53-1'::Invoke - } // end of class 'fourthLowNum@53-7' + } // end of class 'fourthLowNum@53-1' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_products() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'products@8-56' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'products@8-2' IL_0005: ret } // end of method Linq101ElementOperators01::get_products @@ -1488,7 +1488,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Product ''.$Linq101ElementOperators01::'products12@10-6' + IL_0000: ldsfld class [Utils]Utils/Product ''.$Linq101ElementOperators01::products12@10 IL_0005: ret } // end of method Linq101ElementOperators01::get_products12 @@ -1497,7 +1497,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'strings@18-12' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::strings@18 IL_0005: ret } // end of method Linq101ElementOperators01::get_strings @@ -1506,7 +1506,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld string ''.$Linq101ElementOperators01::'startsWithO@20-6' + IL_0000: ldsfld string ''.$Linq101ElementOperators01::startsWithO@20 IL_0005: ret } // end of method Linq101ElementOperators01::get_startsWithO @@ -1526,7 +1526,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101ElementOperators01::'firstNumOrDefault@29-6' + IL_0000: ldsfld int32 ''.$Linq101ElementOperators01::firstNumOrDefault@29 IL_0005: ret } // end of method Linq101ElementOperators01::get_firstNumOrDefault @@ -1535,7 +1535,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'numbers2@48-14' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'numbers2@48-2' IL_0005: ret } // end of method Linq101ElementOperators01::get_numbers2 @@ -1544,7 +1544,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$Linq101ElementOperators01::'fourthLowNum@50-6' + IL_0000: ldsfld int32 ''.$Linq101ElementOperators01::fourthLowNum@50 IL_0005: ret } // end of method Linq101ElementOperators01::get_fourthLowNum @@ -1596,19 +1596,19 @@ .class private abstract auto ansi sealed ''.$Linq101ElementOperators01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@8-56' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@8-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Product 'products12@10-6' + .field static assembly class [Utils]Utils/Product products12@10 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'strings@18-12' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 strings@18 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly string 'startsWithO@20-6' + .field static assembly string startsWithO@20 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'firstNumOrDefault@29-6' + .field static assembly int32 firstNumOrDefault@29 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers2@48-14' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers2@48-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly int32 'fourthLowNum@50-6' + .field static assembly int32 fourthLowNum@50 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1633,7 +1633,7 @@ .line 8,8 : 1,32 '' IL_0000: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0005: dup - IL_0006: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'products@8-56' + IL_0006: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'products@8-2' IL_000b: stloc.0 IL_000c: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0011: stloc.s V_8 @@ -1642,16 +1642,16 @@ IL_0017: ldnull IL_0018: ldc.i4.0 IL_0019: ldnull - IL_001a: newobj instance void Linq101ElementOperators01/'products12@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_001a: newobj instance void Linq101ElementOperators01/products12@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_001f: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0024: newobj instance void Linq101ElementOperators01/'products12@13-7'::.ctor() + IL_0024: newobj instance void Linq101ElementOperators01/'products12@13-1'::.ctor() IL_0029: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_002e: callvirt instance !!0 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Head(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_0033: dup - IL_0034: stsfld class [Utils]Utils/Product ''.$Linq101ElementOperators01::'products12@10-6' + IL_0034: stsfld class [Utils]Utils/Product ''.$Linq101ElementOperators01::products12@10 IL_0039: stloc.1 .line 18,18 : 1,97 '' IL_003a: ldstr "zero" @@ -1686,7 +1686,7 @@ IL_009e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_00a3: dup - IL_00a4: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'strings@18-12' + IL_00a4: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::strings@18 IL_00a9: stloc.2 IL_00aa: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00af: stloc.s V_9 @@ -1695,16 +1695,16 @@ IL_00b5: ldnull IL_00b6: ldc.i4.0 IL_00b7: ldnull - IL_00b8: newobj instance void Linq101ElementOperators01/'startsWithO@22-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_00b8: newobj instance void Linq101ElementOperators01/startsWithO@22::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_00bd: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_00c2: newobj instance void Linq101ElementOperators01/'startsWithO@23-7'::.ctor() + IL_00c2: newobj instance void Linq101ElementOperators01/'startsWithO@23-1'::.ctor() IL_00c7: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00cc: callvirt instance !!0 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Head(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_00d1: dup - IL_00d2: stsfld string ''.$Linq101ElementOperators01::'startsWithO@20-6' + IL_00d2: stsfld string ''.$Linq101ElementOperators01::startsWithO@20 IL_00d7: stloc.3 .line 28,28 : 1,28 '' IL_00d8: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101ElementOperators01::get_numbers() @@ -1713,13 +1713,13 @@ IL_00e4: ldnull IL_00e5: ldc.i4.0 IL_00e6: ldc.i4.0 - IL_00e7: newobj instance void Linq101ElementOperators01/'firstNumOrDefault@31-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_00e7: newobj instance void Linq101ElementOperators01/firstNumOrDefault@31::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_00ec: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00f1: callvirt instance !!0 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::HeadOrDefault(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_00f6: dup - IL_00f7: stsfld int32 ''.$Linq101ElementOperators01::'firstNumOrDefault@29-6' + IL_00f7: stsfld int32 ''.$Linq101ElementOperators01::firstNumOrDefault@29 IL_00fc: stloc.s firstNumOrDefault .line 48,48 : 1,48 '' IL_00fe: ldc.i4.5 @@ -1754,7 +1754,7 @@ IL_013b: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0140: dup - IL_0141: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'numbers2@48-14' + IL_0141: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101ElementOperators01::'numbers2@48-2' IL_0146: stloc.s numbers2 IL_0148: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_014d: stloc.s V_10 @@ -1763,18 +1763,18 @@ IL_0153: ldnull IL_0154: ldc.i4.0 IL_0155: ldc.i4.0 - IL_0156: newobj instance void Linq101ElementOperators01/'fourthLowNum@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0156: newobj instance void Linq101ElementOperators01/fourthLowNum@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_015b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0160: newobj instance void Linq101ElementOperators01/'fourthLowNum@53-7'::.ctor() + IL_0160: newobj instance void Linq101ElementOperators01/'fourthLowNum@53-1'::.ctor() IL_0165: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_016a: ldc.i4.1 IL_016b: callvirt instance !!0 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Nth(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, int32) IL_0170: dup - IL_0171: stsfld int32 ''.$Linq101ElementOperators01::'fourthLowNum@50-6' + IL_0171: stsfld int32 ''.$Linq101ElementOperators01::fourthLowNum@50 IL_0176: stloc.s fourthLowNum IL_0178: ret } // end of method $Linq101ElementOperators01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl index 6967bf7a455..1e709ee5c7e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Grouping01.il.bsl @@ -53,13 +53,13 @@ // Offset: 0x00000570 Length: 0x00000000 } .module Linq101Grouping01.exe -// MVID: {5BF2D3C6-FB79-E5BF-A745-0383C6D3F25B} +// MVID: {5C6C932B-10D0-8035-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00570000 +// Image base: 0x02C50000 // =============== CLASS MEMBERS DECLARATION =================== @@ -68,7 +68,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@14-15' + .class auto ansi serializable sealed nested assembly beforefieldinit numberGroups@14 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -86,9 +86,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@14-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/numberGroups@14::builder@ IL_000d: ret - } // end of method 'numberGroups@14-15'::.ctor + } // end of method numberGroups@14::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(int32 _arg1) cil managed @@ -102,16 +102,16 @@ IL_0001: stloc.0 .line 15,15 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@14-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/numberGroups@14::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'numberGroups@14-15'::Invoke + } // end of method numberGroups@14::Invoke - } // end of class 'numberGroups@14-15' + } // end of class numberGroups@14 - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -124,7 +124,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'numberGroups@15-16'::.ctor + } // end of method 'numberGroups@15-1'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -134,11 +134,11 @@ .line 15,15 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'numberGroups@15-16'::Invoke + } // end of method 'numberGroups@15-1'::Invoke - } // end of class 'numberGroups@15-16' + } // end of class 'numberGroups@15-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -151,7 +151,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'numberGroups@15-17'::.ctor + } // end of method 'numberGroups@15-2'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -163,11 +163,11 @@ IL_0001: ldc.i4.5 IL_0002: rem IL_0003: ret - } // end of method 'numberGroups@15-17'::Invoke + } // end of method 'numberGroups@15-2'::Invoke - } // end of class 'numberGroups@15-17' + } // end of class 'numberGroups@15-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@15-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -185,9 +185,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@15-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@15-3'::builder@ IL_000d: ret - } // end of method 'numberGroups@15-18'::.ctor + } // end of method 'numberGroups@15-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -199,16 +199,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@15-18'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'numberGroups@15-3'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'numberGroups@15-18'::Invoke + } // end of method 'numberGroups@15-3'::Invoke - } // end of class 'numberGroups@15-18' + } // end of class 'numberGroups@15-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@16-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numberGroups@16-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -221,7 +221,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'numberGroups@16-19'::.ctor + } // end of method 'numberGroups@16-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -236,11 +236,11 @@ IL_000c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0011: ret - } // end of method 'numberGroups@16-19'::Invoke + } // end of method 'numberGroups@16-4'::Invoke - } // end of class 'numberGroups@16-19' + } // end of class 'numberGroups@16-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@24-15' + .class auto ansi serializable sealed nested assembly beforefieldinit wordGroups@24 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -258,9 +258,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@24-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/wordGroups@24::builder@ IL_000d: ret - } // end of method 'wordGroups@24-15'::.ctor + } // end of method wordGroups@24::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(string _arg1) cil managed @@ -273,16 +273,16 @@ IL_0001: stloc.0 .line 25,25 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@24-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/wordGroups@24::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'wordGroups@24-15'::Invoke + } // end of method wordGroups@24::Invoke - } // end of class 'wordGroups@24-15' + } // end of class wordGroups@24 - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -295,7 +295,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'wordGroups@25-16'::.ctor + } // end of method 'wordGroups@25-1'::.ctor .method public strict virtual instance string Invoke(string w) cil managed @@ -305,11 +305,11 @@ .line 25,25 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'wordGroups@25-16'::Invoke + } // end of method 'wordGroups@25-1'::Invoke - } // end of class 'wordGroups@25-16' + } // end of class 'wordGroups@25-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -322,7 +322,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'wordGroups@25-17'::.ctor + } // end of method 'wordGroups@25-2'::.ctor .method public strict virtual instance char Invoke(string w) cil managed @@ -334,11 +334,11 @@ IL_0001: ldc.i4.0 IL_0002: callvirt instance char [mscorlib]System.String::get_Chars(int32) IL_0007: ret - } // end of method 'wordGroups@25-17'::Invoke + } // end of method 'wordGroups@25-2'::Invoke - } // end of class 'wordGroups@25-17' + } // end of class 'wordGroups@25-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@25-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -356,9 +356,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@25-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@25-3'::builder@ IL_000d: ret - } // end of method 'wordGroups@25-18'::.ctor + } // end of method 'wordGroups@25-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -370,16 +370,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@25-18'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'wordGroups@25-3'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'wordGroups@25-18'::Invoke + } // end of method 'wordGroups@25-3'::Invoke - } // end of class 'wordGroups@25-18' + } // end of class 'wordGroups@25-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@26-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'wordGroups@26-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -392,7 +392,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'wordGroups@26-19'::.ctor + } // end of method 'wordGroups@26-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -407,11 +407,11 @@ IL_000c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0011: ret - } // end of method 'wordGroups@26-19'::Invoke + } // end of method 'wordGroups@26-4'::Invoke - } // end of class 'wordGroups@26-19' + } // end of class 'wordGroups@26-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@34-15' + .class auto ansi serializable sealed nested assembly beforefieldinit orderGroups@34 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -429,9 +429,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@34-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/orderGroups@34::builder@ IL_000d: ret - } // end of method 'orderGroups@34-15'::.ctor + } // end of method orderGroups@34::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -444,16 +444,16 @@ IL_0001: stloc.0 .line 35,35 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@34-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/orderGroups@34::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'orderGroups@34-15'::Invoke + } // end of method orderGroups@34::Invoke - } // end of class 'orderGroups@34-15' + } // end of class orderGroups@34 - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -466,7 +466,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'orderGroups@35-16'::.ctor + } // end of method 'orderGroups@35-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -476,11 +476,11 @@ .line 35,35 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'orderGroups@35-16'::Invoke + } // end of method 'orderGroups@35-1'::Invoke - } // end of class 'orderGroups@35-16' + } // end of class 'orderGroups@35-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -493,7 +493,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'orderGroups@35-17'::.ctor + } // end of method 'orderGroups@35-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -505,11 +505,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'orderGroups@35-17'::Invoke + } // end of method 'orderGroups@35-2'::Invoke - } // end of class 'orderGroups@35-17' + } // end of class 'orderGroups@35-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@35-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -527,9 +527,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@35-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@35-3'::builder@ IL_000d: ret - } // end of method 'orderGroups@35-18'::.ctor + } // end of method 'orderGroups@35-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -541,16 +541,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@35-18'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'orderGroups@35-3'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'orderGroups@35-18'::Invoke + } // end of method 'orderGroups@35-3'::Invoke - } // end of class 'orderGroups@35-18' + } // end of class 'orderGroups@35-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@36-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orderGroups@36-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -563,7 +563,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'orderGroups@36-19'::.ctor + } // end of method 'orderGroups@36-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -578,11 +578,11 @@ IL_000c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0011: ret - } // end of method 'orderGroups@36-19'::Invoke + } // end of method 'orderGroups@36-4'::Invoke - } // end of class 'orderGroups@36-19' + } // end of class 'orderGroups@36-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@47-15' + .class auto ansi serializable sealed nested assembly beforefieldinit yearGroups@47 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -600,9 +600,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@47-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/yearGroups@47::builder@ IL_000d: ret - } // end of method 'yearGroups@47-15'::.ctor + } // end of method yearGroups@47::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -615,16 +615,16 @@ IL_0001: stloc.0 .line 48,48 : 17,48 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@47-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/yearGroups@47::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'yearGroups@47-15'::Invoke + } // end of method yearGroups@47::Invoke - } // end of class 'yearGroups@47-15' + } // end of class yearGroups@47 - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -637,7 +637,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'yearGroups@48-16'::.ctor + } // end of method 'yearGroups@48-1'::.ctor .method public strict virtual instance class [Utils]Utils/Order Invoke(class [Utils]Utils/Order o) cil managed @@ -647,11 +647,11 @@ .line 48,48 : 28,29 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'yearGroups@48-16'::Invoke + } // end of method 'yearGroups@48-1'::Invoke - } // end of class 'yearGroups@48-16' + } // end of class 'yearGroups@48-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -664,7 +664,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'yearGroups@48-17'::.ctor + } // end of method 'yearGroups@48-2'::.ctor .method public strict virtual instance int32 Invoke(class [Utils]Utils/Order o) cil managed @@ -679,11 +679,11 @@ IL_0007: ldloca.s V_0 IL_0009: call instance int32 [mscorlib]System.DateTime::get_Year() IL_000e: ret - } // end of method 'yearGroups@48-17'::Invoke + } // end of method 'yearGroups@48-2'::Invoke - } // end of class 'yearGroups@48-17' + } // end of class 'yearGroups@48-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@51-15' + .class auto ansi serializable sealed nested assembly beforefieldinit monthGroups@51 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -701,9 +701,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@51-15'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/monthGroups@51::builder@ IL_000d: ret - } // end of method 'monthGroups@51-15'::.ctor + } // end of method monthGroups@51::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Order _arg4) cil managed @@ -716,16 +716,16 @@ IL_0001: stloc.0 .line 52,52 : 25,57 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@51-15'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/monthGroups@51::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'monthGroups@51-15'::Invoke + } // end of method monthGroups@51::Invoke - } // end of class 'monthGroups@51-15' + } // end of class monthGroups@51 - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -738,7 +738,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'monthGroups@52-16'::.ctor + } // end of method 'monthGroups@52-1'::.ctor .method public strict virtual instance class [Utils]Utils/Order Invoke(class [Utils]Utils/Order o) cil managed @@ -748,11 +748,11 @@ .line 52,52 : 36,37 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'monthGroups@52-16'::Invoke + } // end of method 'monthGroups@52-1'::Invoke - } // end of class 'monthGroups@52-16' + } // end of class 'monthGroups@52-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -765,7 +765,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'monthGroups@52-17'::.ctor + } // end of method 'monthGroups@52-2'::.ctor .method public strict virtual instance int32 Invoke(class [Utils]Utils/Order o) cil managed @@ -780,11 +780,11 @@ IL_0007: ldloca.s V_0 IL_0009: call instance int32 [mscorlib]System.DateTime::get_Month() IL_000e: ret - } // end of method 'monthGroups@52-17'::Invoke + } // end of method 'monthGroups@52-2'::Invoke - } // end of class 'monthGroups@52-17' + } // end of class 'monthGroups@52-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@52-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -802,9 +802,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@52-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@52-3'::builder@ IL_000d: ret - } // end of method 'monthGroups@52-18'::.ctor + } // end of method 'monthGroups@52-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg5) cil managed @@ -816,16 +816,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@52-18'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'monthGroups@52-3'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'monthGroups@52-18'::Invoke + } // end of method 'monthGroups@52-3'::Invoke - } // end of class 'monthGroups@52-18' + } // end of class 'monthGroups@52-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@53-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'monthGroups@53-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -838,7 +838,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'monthGroups@53-19'::.ctor + } // end of method 'monthGroups@53-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [System.Core]System.Linq.IGrouping`2 mg) cil managed @@ -853,11 +853,11 @@ IL_000c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0011: ret - } // end of method 'monthGroups@53-19'::Invoke + } // end of method 'monthGroups@53-4'::Invoke - } // end of class 'monthGroups@53-19' + } // end of class 'monthGroups@53-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@48-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -875,9 +875,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@48-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@48-3'::builder@ IL_000d: ret - } // end of method 'yearGroups@48-18'::.ctor + } // end of method 'yearGroups@48-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg3) cil managed @@ -900,26 +900,26 @@ IL_000d: ldloc.0 IL_000e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0013: ldloc.2 - IL_0014: newobj instance void Linq101Grouping01/'monthGroups@51-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0014: newobj instance void Linq101Grouping01/monthGroups@51::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0019: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_001e: newobj instance void Linq101Grouping01/'monthGroups@52-16'::.ctor() - IL_0023: newobj instance void Linq101Grouping01/'monthGroups@52-17'::.ctor() + IL_001e: newobj instance void Linq101Grouping01/'monthGroups@52-1'::.ctor() + IL_0023: newobj instance void Linq101Grouping01/'monthGroups@52-2'::.ctor() IL_0028: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_002d: ldloc.2 - IL_002e: newobj instance void Linq101Grouping01/'monthGroups@52-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_002e: newobj instance void Linq101Grouping01/'monthGroups@52-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0033: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0038: newobj instance void Linq101Grouping01/'monthGroups@53-19'::.ctor() + IL_0038: newobj instance void Linq101Grouping01/'monthGroups@53-4'::.ctor() IL_003d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0042: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0047: stloc.1 .line 55,55 : 17,55 '' IL_0048: ldarg.0 - IL_0049: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@48-18'::builder@ + IL_0049: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'yearGroups@48-3'::builder@ IL_004e: ldloc.0 IL_004f: ldloc.1 IL_0050: newobj instance void class [mscorlib]System.Tuple`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>::.ctor(!0, @@ -927,11 +927,11 @@ IL_0055: tail. IL_0057: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object>(!!0) IL_005c: ret - } // end of method 'yearGroups@48-18'::Invoke + } // end of method 'yearGroups@48-3'::Invoke - } // end of class 'yearGroups@48-18' + } // end of class 'yearGroups@48-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@55-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'yearGroups@55-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,class [mscorlib]System.Tuple`2[]>> { .method assembly specialname rtspecialname @@ -944,7 +944,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,class [mscorlib]System.Tuple`2[]>>::.ctor() IL_0006: ret - } // end of method 'yearGroups@55-19'::.ctor + } // end of method 'yearGroups@55-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2[]> Invoke(class [mscorlib]System.Tuple`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>> tupledArg) cil managed @@ -968,11 +968,11 @@ IL_001a: newobj instance void class [mscorlib]System.Tuple`2[]>::.ctor(!0, !1) IL_001f: ret - } // end of method 'yearGroups@55-19'::Invoke + } // end of method 'yearGroups@55-4'::Invoke - } // end of class 'yearGroups@55-19' + } // end of class 'yearGroups@55-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'customerOrderGroups@44-6' + .class auto ansi serializable sealed nested assembly beforefieldinit customerOrderGroups@44 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2[]>>>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -990,9 +990,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2[]>>>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'customerOrderGroups@44-6'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/customerOrderGroups@44::builder@ IL_000d: ret - } // end of method 'customerOrderGroups@44-6'::.ctor + } // end of method customerOrderGroups@44::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2[]>>>,object> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -1017,26 +1017,26 @@ IL_000e: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0013: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0018: ldloc.2 - IL_0019: newobj instance void Linq101Grouping01/'yearGroups@47-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0019: newobj instance void Linq101Grouping01/yearGroups@47::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_001e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0023: newobj instance void Linq101Grouping01/'yearGroups@48-16'::.ctor() - IL_0028: newobj instance void Linq101Grouping01/'yearGroups@48-17'::.ctor() + IL_0023: newobj instance void Linq101Grouping01/'yearGroups@48-1'::.ctor() + IL_0028: newobj instance void Linq101Grouping01/'yearGroups@48-2'::.ctor() IL_002d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0032: ldloc.2 - IL_0033: newobj instance void Linq101Grouping01/'yearGroups@48-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0033: newobj instance void Linq101Grouping01/'yearGroups@48-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0038: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_003d: newobj instance void Linq101Grouping01/'yearGroups@55-19'::.ctor() + IL_003d: newobj instance void Linq101Grouping01/'yearGroups@55-4'::.ctor() IL_0042: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.Generic.IEnumerable`1>>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2[]>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0047: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2[]>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_004c: stloc.1 .line 57,57 : 9,53 '' IL_004d: ldarg.0 - IL_004e: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/'customerOrderGroups@44-6'::builder@ + IL_004e: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Grouping01/customerOrderGroups@44::builder@ IL_0053: ldloc.0 IL_0054: ldloc.1 IL_0055: newobj instance void class [mscorlib]System.Tuple`2[]>>>::.ctor(!0, @@ -1044,11 +1044,11 @@ IL_005a: tail. IL_005c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield[]>>>,object>(!!0) IL_0061: ret - } // end of method 'customerOrderGroups@44-6'::Invoke + } // end of method customerOrderGroups@44::Invoke - } // end of class 'customerOrderGroups@44-6' + } // end of class customerOrderGroups@44 - .class auto ansi serializable sealed nested assembly beforefieldinit 'customerOrderGroups@57-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'customerOrderGroups@57-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2[]>>>,class [mscorlib]System.Tuple`2[]>[]>> { .method assembly specialname rtspecialname @@ -1061,7 +1061,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2[]>>>,class [mscorlib]System.Tuple`2[]>[]>>::.ctor() IL_0006: ret - } // end of method 'customerOrderGroups@57-7'::.ctor + } // end of method 'customerOrderGroups@57-1'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2[]>[]> Invoke(class [mscorlib]System.Tuple`2[]>>> tupledArg) cil managed @@ -1085,16 +1085,16 @@ IL_001a: newobj instance void class [mscorlib]System.Tuple`2[]>[]>::.ctor(!0, !1) IL_001f: ret - } // end of method 'customerOrderGroups@57-7'::Invoke + } // end of method 'customerOrderGroups@57-1'::Invoke - } // end of class 'customerOrderGroups@57-7' + } // end of class 'customerOrderGroups@57-1' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_digits() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'digits@7-24' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::digits@7 IL_0005: ret } // end of method Linq101Grouping01::get_digits @@ -1103,7 +1103,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'numbers@10-42' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'numbers@10-3' IL_0005: ret } // end of method Linq101Grouping01::get_numbers @@ -1112,7 +1112,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'numberGroups@12-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::numberGroups@12 IL_0005: ret } // end of method Linq101Grouping01::get_numberGroups @@ -1121,7 +1121,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'words@20-32' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'words@20-2' IL_0005: ret } // end of method Linq101Grouping01::get_words @@ -1130,7 +1130,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'wordGroups@22-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::wordGroups@22 IL_0005: ret } // end of method Linq101Grouping01::get_wordGroups @@ -1139,7 +1139,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'products@30-58' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'products@30-4' IL_0005: ret } // end of method Linq101Grouping01::get_products @@ -1148,7 +1148,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'orderGroups@32-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::orderGroups@32 IL_0005: ret } // end of method Linq101Grouping01::get_orderGroups @@ -1157,7 +1157,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'customers@40-30' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::customers@40 IL_0005: ret } // end of method Linq101Grouping01::get_customers @@ -1166,7 +1166,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[]>[]>[] ''.$Linq101Grouping01::'customerOrderGroups@42-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[]>[]>[] ''.$Linq101Grouping01::customerOrderGroups@42 IL_0005: ret } // end of method Linq101Grouping01::get_customerOrderGroups @@ -1229,23 +1229,23 @@ .class private abstract auto ansi sealed ''.$Linq101Grouping01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@7-24' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 digits@7 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@10-42' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@10-3' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'numberGroups@12-6' + .field static assembly class [mscorlib]System.Tuple`2[] numberGroups@12 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@20-32' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@20-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'wordGroups@22-6' + .field static assembly class [mscorlib]System.Tuple`2[] wordGroups@22 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@30-58' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@30-4' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'orderGroups@32-6' + .field static assembly class [mscorlib]System.Tuple`2[] orderGroups@32 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@40-30' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 customers@40 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[]>[]>[] 'customerOrderGroups@42-6' + .field static assembly class [mscorlib]System.Tuple`2[]>[]>[] customerOrderGroups@42 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1302,7 +1302,7 @@ IL_0064: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0069: dup - IL_006a: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'digits@7-24' + IL_006a: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::digits@7 IL_006f: stloc.0 .line 10,10 : 1,47 '' IL_0070: ldc.i4.5 @@ -1337,7 +1337,7 @@ IL_00ad: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_00b2: dup - IL_00b3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'numbers@10-42' + IL_00b3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'numbers@10-3' IL_00b8: stloc.1 .line 12,17 : 1,21 '' IL_00b9: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1350,25 +1350,25 @@ IL_00ca: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Grouping01::get_numbers() IL_00cf: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00d4: ldloc.s V_9 - IL_00d6: newobj instance void Linq101Grouping01/'numberGroups@14-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00d6: newobj instance void Linq101Grouping01/numberGroups@14::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00db: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00e0: newobj instance void Linq101Grouping01/'numberGroups@15-16'::.ctor() - IL_00e5: newobj instance void Linq101Grouping01/'numberGroups@15-17'::.ctor() + IL_00e0: newobj instance void Linq101Grouping01/'numberGroups@15-1'::.ctor() + IL_00e5: newobj instance void Linq101Grouping01/'numberGroups@15-2'::.ctor() IL_00ea: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00ef: ldloc.s V_9 - IL_00f1: newobj instance void Linq101Grouping01/'numberGroups@15-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00f1: newobj instance void Linq101Grouping01/'numberGroups@15-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00f6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00fb: newobj instance void Linq101Grouping01/'numberGroups@16-19'::.ctor() + IL_00fb: newobj instance void Linq101Grouping01/'numberGroups@16-4'::.ctor() IL_0100: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0105: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_010a: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_010f: dup - IL_0110: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'numberGroups@12-6' + IL_0110: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::numberGroups@12 IL_0115: stloc.2 .line 20,20 : 1,80 '' IL_0116: ldstr "blueberry" @@ -1391,7 +1391,7 @@ IL_0152: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0157: dup - IL_0158: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'words@20-32' + IL_0158: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'words@20-2' IL_015d: stloc.3 .line 22,27 : 1,21 '' IL_015e: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1404,30 +1404,30 @@ IL_016f: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Grouping01::get_words() IL_0174: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0179: ldloc.s V_10 - IL_017b: newobj instance void Linq101Grouping01/'wordGroups@24-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_017b: newobj instance void Linq101Grouping01/wordGroups@24::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0180: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0185: newobj instance void Linq101Grouping01/'wordGroups@25-16'::.ctor() - IL_018a: newobj instance void Linq101Grouping01/'wordGroups@25-17'::.ctor() + IL_0185: newobj instance void Linq101Grouping01/'wordGroups@25-1'::.ctor() + IL_018a: newobj instance void Linq101Grouping01/'wordGroups@25-2'::.ctor() IL_018f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0194: ldloc.s V_10 - IL_0196: newobj instance void Linq101Grouping01/'wordGroups@25-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0196: newobj instance void Linq101Grouping01/'wordGroups@25-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_019b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01a0: newobj instance void Linq101Grouping01/'wordGroups@26-19'::.ctor() + IL_01a0: newobj instance void Linq101Grouping01/'wordGroups@26-4'::.ctor() IL_01a5: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01aa: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_01af: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01b4: dup - IL_01b5: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'wordGroups@22-6' + IL_01b5: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::wordGroups@22 IL_01ba: stloc.s wordGroups .line 30,30 : 1,32 '' IL_01bc: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_01c1: dup - IL_01c2: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'products@30-58' + IL_01c2: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'products@30-4' IL_01c7: stloc.s products .line 32,37 : 1,21 '' IL_01c9: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1440,30 +1440,30 @@ IL_01da: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Grouping01::get_products() IL_01df: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01e4: ldloc.s V_11 - IL_01e6: newobj instance void Linq101Grouping01/'orderGroups@34-15'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01e6: newobj instance void Linq101Grouping01/orderGroups@34::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01eb: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01f0: newobj instance void Linq101Grouping01/'orderGroups@35-16'::.ctor() - IL_01f5: newobj instance void Linq101Grouping01/'orderGroups@35-17'::.ctor() + IL_01f0: newobj instance void Linq101Grouping01/'orderGroups@35-1'::.ctor() + IL_01f5: newobj instance void Linq101Grouping01/'orderGroups@35-2'::.ctor() IL_01fa: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01ff: ldloc.s V_11 - IL_0201: newobj instance void Linq101Grouping01/'orderGroups@35-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0201: newobj instance void Linq101Grouping01/'orderGroups@35-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0206: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_020b: newobj instance void Linq101Grouping01/'orderGroups@36-19'::.ctor() + IL_020b: newobj instance void Linq101Grouping01/'orderGroups@36-4'::.ctor() IL_0210: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0215: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_021a: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_021f: dup - IL_0220: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::'orderGroups@32-6' + IL_0220: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Grouping01::orderGroups@32 IL_0225: stloc.s orderGroups .line 40,40 : 1,34 '' IL_0227: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_022c: dup - IL_022d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::'customers@40-30' + IL_022d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Grouping01::customers@40 IL_0232: stloc.s customers .line 42,58 : 1,21 '' IL_0234: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1474,16 +1474,16 @@ IL_0241: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Grouping01::get_customers() IL_0246: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_024b: ldloc.s V_12 - IL_024d: newobj instance void Linq101Grouping01/'customerOrderGroups@44-6'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_024d: newobj instance void Linq101Grouping01/customerOrderGroups@44::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0252: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For[]>>>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0257: newobj instance void Linq101Grouping01/'customerOrderGroups@57-7'::.ctor() + IL_0257: newobj instance void Linq101Grouping01/'customerOrderGroups@57-1'::.ctor() IL_025c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select[]>>>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2[]>[]>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0261: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2[]>[]>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0266: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray[]>[]>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_026b: dup - IL_026c: stsfld class [mscorlib]System.Tuple`2[]>[]>[] ''.$Linq101Grouping01::'customerOrderGroups@42-6' + IL_026c: stsfld class [mscorlib]System.Tuple`2[]>[]>[] ''.$Linq101Grouping01::customerOrderGroups@42 IL_0271: stloc.s customerOrderGroups IL_0273: ret } // end of method $Linq101Grouping01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl index 3ded8452a38..54cf82b63a8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Joins01.il.bsl @@ -53,13 +53,13 @@ // Offset: 0x00000400 Length: 0x00000000 } .module Linq101Joins01.exe -// MVID: {5BF2D3C6-151B-685E-A745-0383C6D3F25B} +// MVID: {5C6C932B-25BC-8F2D-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00730000 +// Image base: 0x00D00000 // =============== CLASS MEMBERS DECLARATION =================== @@ -68,7 +68,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-15' + .class auto ansi serializable sealed nested assembly beforefieldinit q@14 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -81,7 +81,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q@14-15'::.ctor + } // end of method q@14::.ctor .method public strict virtual instance string Invoke(string c) cil managed @@ -92,11 +92,11 @@ .line 14,14 : 32,33 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Joins01.fs' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'q@14-15'::Invoke + } // end of method q@14::Invoke - } // end of class 'q@14-15' + } // end of class q@14 - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -109,7 +109,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q@14-16'::.ctor + } // end of method 'q@14-1'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -121,11 +121,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'q@14-16'::Invoke + } // end of method 'q@14-1'::Invoke - } // end of class 'q@14-16' + } // end of class 'q@14-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-2' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3> { .method assembly specialname rtspecialname @@ -138,7 +138,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3>::.ctor() IL_0006: ret - } // end of method 'q@14-17'::.ctor + } // end of method 'q@14-2'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(string c, @@ -152,11 +152,11 @@ IL_0002: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0007: ret - } // end of method 'q@14-17'::Invoke + } // end of method 'q@14-2'::Invoke - } // end of class 'q@14-17' + } // end of class 'q@14-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@14-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -174,9 +174,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q@14-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q@14-3'::builder@ IL_000d: ret - } // end of method 'q@14-18'::.ctor + } // end of method 'q@14-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [mscorlib]System.Tuple`2 _arg1) cil managed @@ -196,7 +196,7 @@ IL_000a: call instance !0 class [mscorlib]System.Tuple`2::get_Item1() IL_000f: stloc.2 IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q@14-18'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q@14-3'::builder@ IL_0016: ldloc.2 IL_0017: ldloc.1 IL_0018: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, @@ -204,11 +204,11 @@ IL_001d: tail. IL_001f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0024: ret - } // end of method 'q@14-18'::Invoke + } // end of method 'q@14-3'::Invoke - } // end of class 'q@14-18' + } // end of class 'q@14-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q@15-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q@15-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -221,7 +221,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'q@15-19'::.ctor + } // end of method 'q@15-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -244,11 +244,11 @@ IL_0015: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001a: ret - } // end of method 'q@15-19'::Invoke + } // end of method 'q@15-4'::Invoke - } // end of class 'q@15-19' + } // end of class 'q@15-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-15' + .class auto ansi serializable sealed nested assembly beforefieldinit q2@22 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -261,7 +261,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q2@22-15'::.ctor + } // end of method q2@22::.ctor .method public strict virtual instance string Invoke(string c) cil managed @@ -271,11 +271,11 @@ .line 22,22 : 37,38 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'q2@22-15'::Invoke + } // end of method q2@22::Invoke - } // end of class 'q2@22-15' + } // end of class q2@22 - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-16' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -288,7 +288,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q2@22-16'::.ctor + } // end of method 'q2@22-1'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -300,11 +300,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'q2@22-16'::Invoke + } // end of method 'q2@22-1'::Invoke - } // end of class 'q2@22-16' + } // end of class 'q2@22-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-17' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-2' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -317,7 +317,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'q2@22-17'::.ctor + } // end of method 'q2@22-2'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(string c, @@ -331,11 +331,11 @@ IL_0002: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0007: ret - } // end of method 'q2@22-17'::Invoke + } // end of method 'q2@22-2'::Invoke - } // end of class 'q2@22-17' + } // end of class 'q2@22-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-18' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@22-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -353,9 +353,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q2@22-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q2@22-3'::builder@ IL_000d: ret - } // end of method 'q2@22-18'::.ctor + } // end of method 'q2@22-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,object> Invoke(class [mscorlib]System.Tuple`2> _arg1) cil managed @@ -375,7 +375,7 @@ IL_000a: call instance !0 class [mscorlib]System.Tuple`2>::get_Item1() IL_000f: stloc.2 IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q2@22-18'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q2@22-3'::builder@ IL_0016: ldloc.2 IL_0017: ldloc.1 IL_0018: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, @@ -383,11 +383,11 @@ IL_001d: tail. IL_001f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield>,object>(!!0) IL_0024: ret - } // end of method 'q2@22-18'::Invoke + } // end of method 'q2@22-3'::Invoke - } // end of class 'q2@22-18' + } // end of class 'q2@22-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@23-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q2@23-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -400,7 +400,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'q2@23-19'::.ctor + } // end of method 'q2@23-4'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [mscorlib]System.Tuple`2> tupledArg) cil managed @@ -422,11 +422,11 @@ IL_0010: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0015: ret - } // end of method 'q2@23-19'::Invoke + } // end of method 'q2@23-4'::Invoke - } // end of class 'q2@23-19' + } // end of class 'q2@23-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-18' + .class auto ansi serializable sealed nested assembly beforefieldinit q3@30 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -439,7 +439,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q3@30-18'::.ctor + } // end of method q3@30::.ctor .method public strict virtual instance string Invoke(string c) cil managed @@ -449,11 +449,11 @@ .line 30,30 : 37,38 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'q3@30-18'::Invoke + } // end of method q3@30::Invoke - } // end of class 'q3@30-18' + } // end of class q3@30 - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -466,7 +466,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q3@30-19'::.ctor + } // end of method 'q3@30-1'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -478,11 +478,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'q3@30-19'::Invoke + } // end of method 'q3@30-1'::Invoke - } // end of class 'q3@30-19' + } // end of class 'q3@30-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-20' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-2' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -495,7 +495,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'q3@30-20'::.ctor + } // end of method 'q3@30-2'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(string c, @@ -509,11 +509,11 @@ IL_0002: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0007: ret - } // end of method 'q3@30-20'::Invoke + } // end of method 'q3@30-2'::Invoke - } // end of class 'q3@30-20' + } // end of class 'q3@30-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@31-22' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@31-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -535,15 +535,15 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@31-22'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@31-4'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q3@31-22'::ps + IL_000f: stfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q3@31-4'::ps IL_0014: ldarg.0 IL_0015: ldarg.3 - IL_0016: stfld string Linq101Joins01/'q3@31-22'::c + IL_0016: stfld string Linq101Joins01/'q3@31-4'::c IL_001b: ret - } // end of method 'q3@31-22'::.ctor + } // end of method 'q3@31-4'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product>,object> Invoke(class [Utils]Utils/Product _arg2) cil managed @@ -556,11 +556,11 @@ IL_0001: stloc.0 .line 32,32 : 9,34 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@31-22'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@31-4'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld string Linq101Joins01/'q3@31-22'::c + IL_0009: ldfld string Linq101Joins01/'q3@31-4'::c IL_000e: ldarg.0 - IL_000f: ldfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q3@31-22'::ps + IL_000f: ldfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q3@31-4'::ps IL_0014: ldloc.0 IL_0015: newobj instance void class [mscorlib]System.Tuple`3,class [Utils]Utils/Product>::.ctor(!0, !1, @@ -568,11 +568,11 @@ IL_001a: tail. IL_001c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,class [Utils]Utils/Product>,object>(!!0) IL_0021: ret - } // end of method 'q3@31-22'::Invoke + } // end of method 'q3@31-4'::Invoke - } // end of class 'q3@31-22' + } // end of class 'q3@31-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-21' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@30-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -590,9 +590,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-21'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-3'::builder@ IL_000d: ret - } // end of method 'q3@30-21'::.ctor + } // end of method 'q3@30-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable> Invoke(class [mscorlib]System.Tuple`2> _arg1) cil managed @@ -612,27 +612,27 @@ IL_000a: call instance !0 class [mscorlib]System.Tuple`2>::get_Item1() IL_000f: stloc.2 IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-21'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-3'::builder@ IL_0016: ldarg.0 - IL_0017: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-21'::builder@ + IL_0017: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-3'::builder@ IL_001c: ldloc.1 IL_001d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0022: ldarg.0 - IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-21'::builder@ + IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q3@30-3'::builder@ IL_0028: ldloc.1 IL_0029: ldloc.2 - IL_002a: newobj instance void Linq101Joins01/'q3@31-22'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [mscorlib]System.Collections.Generic.IEnumerable`1, - string) + IL_002a: newobj instance void Linq101Joins01/'q3@31-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [mscorlib]System.Collections.Generic.IEnumerable`1, + string) IL_002f: tail. IL_0031: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [Utils]Utils/Product>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0036: ret - } // end of method 'q3@30-21'::Invoke + } // end of method 'q3@30-3'::Invoke - } // end of class 'q3@30-21' + } // end of class 'q3@30-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@32-23' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q3@32-5' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -645,7 +645,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'q3@32-23'::.ctor + } // end of method 'q3@32-5'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`3,class [Utils]Utils/Product> tupledArg) cil managed @@ -672,11 +672,11 @@ IL_001c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0021: ret - } // end of method 'q3@32-23'::Invoke + } // end of method 'q3@32-5'::Invoke - } // end of class 'q3@32-23' + } // end of class 'q3@32-5' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-18' + .class auto ansi serializable sealed nested assembly beforefieldinit q4@39 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -689,7 +689,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q4@39-18'::.ctor + } // end of method q4@39::.ctor .method public strict virtual instance string Invoke(string c) cil managed @@ -699,11 +699,11 @@ .line 39,39 : 37,38 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'q4@39-18'::Invoke + } // end of method q4@39::Invoke - } // end of class 'q4@39-18' + } // end of class q4@39 - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -716,7 +716,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'q4@39-19'::.ctor + } // end of method 'q4@39-1'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -728,11 +728,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'q4@39-19'::Invoke + } // end of method 'q4@39-1'::Invoke - } // end of class 'q4@39-19' + } // end of class 'q4@39-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-20' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-2' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -745,7 +745,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'q4@39-20'::.ctor + } // end of method 'q4@39-2'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(string c, @@ -759,11 +759,11 @@ IL_0002: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_0007: ret - } // end of method 'q4@39-20'::Invoke + } // end of method 'q4@39-2'::Invoke - } // end of class 'q4@39-20' + } // end of class 'q4@39-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@40-22' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@40-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product,string>,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -785,15 +785,15 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product,string>,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@40-22'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@40-4'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q4@40-22'::ps + IL_000f: stfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q4@40-4'::ps IL_0014: ldarg.0 IL_0015: ldarg.3 - IL_0016: stfld string Linq101Joins01/'q4@40-22'::c + IL_0016: stfld string Linq101Joins01/'q4@40-4'::c IL_001b: ret - } // end of method 'q4@40-22'::.ctor + } // end of method 'q4@40-4'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product,string>,object> Invoke(class [Utils]Utils/Product _arg2) cil managed @@ -832,11 +832,11 @@ IL_0023: stloc.1 .line 42,42 : 9,22 '' IL_0024: ldarg.0 - IL_0025: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@40-22'::builder@ + IL_0025: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@40-4'::builder@ IL_002a: ldarg.0 - IL_002b: ldfld string Linq101Joins01/'q4@40-22'::c + IL_002b: ldfld string Linq101Joins01/'q4@40-4'::c IL_0030: ldarg.0 - IL_0031: ldfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q4@40-22'::ps + IL_0031: ldfld class [mscorlib]System.Collections.Generic.IEnumerable`1 Linq101Joins01/'q4@40-4'::ps IL_0036: ldloc.0 IL_0037: ldloc.1 IL_0038: newobj instance void class [mscorlib]System.Tuple`4,class [Utils]Utils/Product,string>::.ctor(!0, @@ -846,11 +846,11 @@ IL_003d: tail. IL_003f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,class [Utils]Utils/Product,string>,object>(!!0) IL_0044: ret - } // end of method 'q4@40-22'::Invoke + } // end of method 'q4@40-4'::Invoke - } // end of class 'q4@40-22' + } // end of class 'q4@40-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-21' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@39-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -868,9 +868,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-21'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-3'::builder@ IL_000d: ret - } // end of method 'q4@39-21'::.ctor + } // end of method 'q4@39-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable> Invoke(class [mscorlib]System.Tuple`2> _arg1) cil managed @@ -890,28 +890,28 @@ IL_000a: call instance !0 class [mscorlib]System.Tuple`2>::get_Item1() IL_000f: stloc.2 IL_0010: ldarg.0 - IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-21'::builder@ + IL_0011: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-3'::builder@ IL_0016: ldarg.0 - IL_0017: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-21'::builder@ + IL_0017: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-3'::builder@ IL_001c: ldloc.1 IL_001d: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [System.Core]System.Linq.Enumerable::DefaultIfEmpty(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0022: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0027: ldarg.0 - IL_0028: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-21'::builder@ + IL_0028: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Joins01/'q4@39-3'::builder@ IL_002d: ldloc.1 IL_002e: ldloc.2 - IL_002f: newobj instance void Linq101Joins01/'q4@40-22'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [mscorlib]System.Collections.Generic.IEnumerable`1, - string) + IL_002f: newobj instance void Linq101Joins01/'q4@40-4'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [mscorlib]System.Collections.Generic.IEnumerable`1, + string) IL_0034: tail. IL_0036: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [Utils]Utils/Product,string>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_003b: ret - } // end of method 'q4@39-21'::Invoke + } // end of method 'q4@39-3'::Invoke - } // end of class 'q4@39-21' + } // end of class 'q4@39-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@42-23' + .class auto ansi serializable sealed nested assembly beforefieldinit 'q4@42-5' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -924,7 +924,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [Utils]Utils/Product,string>,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'q4@42-23'::.ctor + } // end of method 'q4@42-5'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`4,class [Utils]Utils/Product,string> tupledArg) cil managed @@ -954,16 +954,16 @@ IL_001e: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0023: ret - } // end of method 'q4@42-23'::Invoke + } // end of method 'q4@42-5'::Invoke - } // end of class 'q4@42-23' + } // end of class 'q4@42-5' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_categories() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'categories@8-14' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'categories@8-2' IL_0005: ret } // end of method Linq101Joins01::get_categories @@ -972,7 +972,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'products@9-60' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'products@9-6' IL_0005: ret } // end of method Linq101Joins01::get_products @@ -981,7 +981,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q@11-28' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q@11 IL_0005: ret } // end of method Linq101Joins01::get_q @@ -990,7 +990,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Joins01::'q2@19-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Joins01::q2@19 IL_0005: ret } // end of method Linq101Joins01::get_q2 @@ -999,7 +999,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q3@27-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q3@27 IL_0005: ret } // end of method Linq101Joins01::get_q3 @@ -1008,7 +1008,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q4@36-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q4@36 IL_0005: ret } // end of method Linq101Joins01::get_q4 @@ -1053,17 +1053,17 @@ .class private abstract auto ansi sealed ''.$Linq101Joins01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'categories@8-14' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'categories@8-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@9-60' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@9-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'q@11-28' + .field static assembly class [mscorlib]System.Tuple`2[] q@11 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] 'q2@19-6' + .field static assembly class [mscorlib]System.Tuple`2>[] q2@19 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'q3@27-6' + .field static assembly class [mscorlib]System.Tuple`2[] q3@27 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'q4@36-6' + .field static assembly class [mscorlib]System.Tuple`2[] q4@36 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1102,12 +1102,12 @@ IL_0032: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0037: dup - IL_0038: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'categories@8-14' + IL_0038: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'categories@8-2' IL_003d: stloc.0 .line 9,9 : 1,32 '' IL_003e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0043: dup - IL_0044: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'products@9-60' + IL_0044: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Joins01::'products@9-6' IL_0049: stloc.1 .line 11,16 : 1,21 '' IL_004a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1121,25 +1121,25 @@ IL_0063: ldloc.s V_6 IL_0065: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Joins01::get_products() IL_006a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_006f: newobj instance void Linq101Joins01/'q@14-15'::.ctor() - IL_0074: newobj instance void Linq101Joins01/'q@14-16'::.ctor() - IL_0079: newobj instance void Linq101Joins01/'q@14-17'::.ctor() + IL_006f: newobj instance void Linq101Joins01/q@14::.ctor() + IL_0074: newobj instance void Linq101Joins01/'q@14-1'::.ctor() + IL_0079: newobj instance void Linq101Joins01/'q@14-2'::.ctor() IL_007e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Join>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_0083: ldloc.s V_6 - IL_0085: newobj instance void Linq101Joins01/'q@14-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0085: newobj instance void Linq101Joins01/'q@14-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_008a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_008f: newobj instance void Linq101Joins01/'q@15-19'::.ctor() + IL_008f: newobj instance void Linq101Joins01/'q@15-4'::.ctor() IL_0094: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0099: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_009e: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00a3: dup - IL_00a4: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q@11-28' + IL_00a4: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q@11 IL_00a9: stloc.2 .line 19,24 : 1,21 '' IL_00aa: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1153,25 +1153,25 @@ IL_00c3: ldloc.s V_7 IL_00c5: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Joins01::get_products() IL_00ca: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_00cf: newobj instance void Linq101Joins01/'q2@22-15'::.ctor() - IL_00d4: newobj instance void Linq101Joins01/'q2@22-16'::.ctor() - IL_00d9: newobj instance void Linq101Joins01/'q2@22-17'::.ctor() + IL_00cf: newobj instance void Linq101Joins01/q2@22::.ctor() + IL_00d4: newobj instance void Linq101Joins01/'q2@22-1'::.ctor() + IL_00d9: newobj instance void Linq101Joins01/'q2@22-2'::.ctor() IL_00de: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupJoin>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,!!4>>) IL_00e3: ldloc.s V_7 - IL_00e5: newobj instance void Linq101Joins01/'q2@22-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00e5: newobj instance void Linq101Joins01/'q2@22-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00ea: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00ef: newobj instance void Linq101Joins01/'q2@23-19'::.ctor() + IL_00ef: newobj instance void Linq101Joins01/'q2@23-4'::.ctor() IL_00f4: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00f9: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_00fe: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0103: dup - IL_0104: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Joins01::'q2@19-6' + IL_0104: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Joins01::q2@19 IL_0109: stloc.3 .line 27,33 : 1,21 '' IL_010a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1185,25 +1185,25 @@ IL_0123: ldloc.s V_8 IL_0125: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Joins01::get_products() IL_012a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_012f: newobj instance void Linq101Joins01/'q3@30-18'::.ctor() - IL_0134: newobj instance void Linq101Joins01/'q3@30-19'::.ctor() - IL_0139: newobj instance void Linq101Joins01/'q3@30-20'::.ctor() + IL_012f: newobj instance void Linq101Joins01/q3@30::.ctor() + IL_0134: newobj instance void Linq101Joins01/'q3@30-1'::.ctor() + IL_0139: newobj instance void Linq101Joins01/'q3@30-2'::.ctor() IL_013e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupJoin>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,!!4>>) IL_0143: ldloc.s V_8 - IL_0145: newobj instance void Linq101Joins01/'q3@30-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0145: newobj instance void Linq101Joins01/'q3@30-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_014a: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_014f: newobj instance void Linq101Joins01/'q3@32-23'::.ctor() + IL_014f: newobj instance void Linq101Joins01/'q3@32-5'::.ctor() IL_0154: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [Utils]Utils/Product>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0159: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_015e: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0163: dup - IL_0164: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q3@27-6' + IL_0164: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q3@27 IL_0169: stloc.s q3 .line 36,43 : 1,21 '' IL_016b: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1217,25 +1217,25 @@ IL_0184: ldloc.s V_9 IL_0186: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Joins01::get_products() IL_018b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0190: newobj instance void Linq101Joins01/'q4@39-18'::.ctor() - IL_0195: newobj instance void Linq101Joins01/'q4@39-19'::.ctor() - IL_019a: newobj instance void Linq101Joins01/'q4@39-20'::.ctor() + IL_0190: newobj instance void Linq101Joins01/q4@39::.ctor() + IL_0195: newobj instance void Linq101Joins01/'q4@39-1'::.ctor() + IL_019a: newobj instance void Linq101Joins01/'q4@39-2'::.ctor() IL_019f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupJoin>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,!!4>>) IL_01a4: ldloc.s V_9 - IL_01a6: newobj instance void Linq101Joins01/'q4@39-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01a6: newobj instance void Linq101Joins01/'q4@39-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01ab: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`4,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01b0: newobj instance void Linq101Joins01/'q4@42-23'::.ctor() + IL_01b0: newobj instance void Linq101Joins01/'q4@42-5'::.ctor() IL_01b5: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [Utils]Utils/Product,string>,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01ba: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_01bf: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01c4: dup - IL_01c5: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::'q4@36-6' + IL_01c5: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Joins01::q4@36 IL_01ca: stloc.s q4 IL_01cc: ret } // end of method $Linq101Joins01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl index 8c678c5b4ed..b1d6936810d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Ordering01.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x00000510 Length: 0x00000000 } .module Linq101Ordering01.exe -// MVID: {5BF2D3C6-649A-6956-A745-0383C6D3F25B} +// MVID: {5C6C932B-763B-E3AC-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01000000 +// Image base: 0x01B50000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sortedWords@11-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname sortedWords@11 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -88,17 +88,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_0009: stfld int32 Linq101Ordering01/sortedWords@11::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Ordering01/'sortedWords@11-6'::current + IL_0010: stfld string Linq101Ordering01/sortedWords@11::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'sortedWords@11-6'::.ctor + } // end of method sortedWords@11::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -110,7 +110,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Ordering01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedWords@11::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_003d: stfld int32 Linq101Ordering01/sortedWords@11::pc .line 11,11 : 9,26 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 11,11 : 9,26 '' @@ -162,11 +162,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_005f: stfld int32 Linq101Ordering01/sortedWords@11::pc .line 12,12 : 9,17 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Ordering01/'sortedWords@11-6'::current + IL_0066: stfld string Linq101Ordering01/sortedWords@11::current IL_006b: ldc.i4.1 IL_006c: ret @@ -176,24 +176,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_0072: stfld int32 Linq101Ordering01/sortedWords@11::pc .line 11,11 : 9,26 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_008c: stfld int32 Linq101Ordering01/sortedWords@11::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Ordering01/'sortedWords@11-6'::current + IL_0093: stfld string Linq101Ordering01/sortedWords@11::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'sortedWords@11-6'::GenerateNext + } // end of method sortedWords@11::GenerateNext .method public strict virtual instance void Close() cil managed @@ -205,7 +205,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedWords@11::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -221,7 +221,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_001b: ldfld int32 Linq101Ordering01/sortedWords@11::pc IL_0020: switch ( IL_0037, IL_0039, @@ -259,19 +259,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_004f: stfld int32 Linq101Ordering01/sortedWords@11::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords@11-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords@11::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_0063: stfld int32 Linq101Ordering01/sortedWords@11::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Ordering01/'sortedWords@11-6'::current + IL_006a: stfld string Linq101Ordering01/sortedWords@11::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -311,7 +311,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'sortedWords@11-6'::Close + } // end of method sortedWords@11::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -320,7 +320,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedWords@11-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedWords@11::pc IL_0006: switch ( IL_001d, IL_001f, @@ -362,7 +362,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'sortedWords@11-6'::get_CheckClose + } // end of method sortedWords@11::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -372,9 +372,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Ordering01/'sortedWords@11-6'::current + IL_0001: ldfld string Linq101Ordering01/sortedWords@11::current IL_0006: ret - } // end of method 'sortedWords@11-6'::get_LastGenerated + } // end of method sortedWords@11::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -386,15 +386,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Ordering01/'sortedWords@11-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Ordering01/sortedWords@11::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'sortedWords@11-6'::GetFreshEnumerator + } // end of method sortedWords@11::GetFreshEnumerator - } // end of class 'sortedWords@11-6' + } // end of class sortedWords@11 - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedWords@12-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedWords@12-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -407,7 +407,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedWords@12-7'::.ctor + } // end of method 'sortedWords@12-1'::.ctor .method public strict virtual instance string Invoke(string w) cil managed @@ -417,11 +417,11 @@ .line 12,12 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'sortedWords@12-7'::Invoke + } // end of method 'sortedWords@12-1'::Invoke - } // end of class 'sortedWords@12-7' + } // end of class 'sortedWords@12-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sortedWords2@18-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname sortedWords2@18 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -446,17 +446,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_0009: stfld int32 Linq101Ordering01/sortedWords2@18::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Ordering01/'sortedWords2@18-6'::current + IL_0010: stfld string Linq101Ordering01/sortedWords2@18::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'sortedWords2@18-6'::.ctor + } // end of method sortedWords2@18::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -467,7 +467,7 @@ [1] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedWords2@18::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -500,18 +500,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_003d: stfld int32 Linq101Ordering01/sortedWords2@18::pc .line 18,18 : 9,26 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 18,18 : 9,26 '' @@ -519,11 +519,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_005f: stfld int32 Linq101Ordering01/sortedWords2@18::pc .line 19,19 : 9,26 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Ordering01/'sortedWords2@18-6'::current + IL_0066: stfld string Linq101Ordering01/sortedWords2@18::current IL_006b: ldc.i4.1 IL_006c: ret @@ -533,24 +533,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_0072: stfld int32 Linq101Ordering01/sortedWords2@18::pc .line 18,18 : 9,26 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_008c: stfld int32 Linq101Ordering01/sortedWords2@18::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Ordering01/'sortedWords2@18-6'::current + IL_0093: stfld string Linq101Ordering01/sortedWords2@18::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'sortedWords2@18-6'::GenerateNext + } // end of method sortedWords2@18::GenerateNext .method public strict virtual instance void Close() cil managed @@ -562,7 +562,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedWords2@18::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -578,7 +578,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_001b: ldfld int32 Linq101Ordering01/sortedWords2@18::pc IL_0020: switch ( IL_0037, IL_0039, @@ -616,19 +616,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_004f: stfld int32 Linq101Ordering01/sortedWords2@18::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedWords2@18-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedWords2@18::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_0063: stfld int32 Linq101Ordering01/sortedWords2@18::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Ordering01/'sortedWords2@18-6'::current + IL_006a: stfld string Linq101Ordering01/sortedWords2@18::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -668,7 +668,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'sortedWords2@18-6'::Close + } // end of method sortedWords2@18::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -677,7 +677,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedWords2@18-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedWords2@18::pc IL_0006: switch ( IL_001d, IL_001f, @@ -719,7 +719,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'sortedWords2@18-6'::get_CheckClose + } // end of method sortedWords2@18::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -729,9 +729,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Ordering01/'sortedWords2@18-6'::current + IL_0001: ldfld string Linq101Ordering01/sortedWords2@18::current IL_0006: ret - } // end of method 'sortedWords2@18-6'::get_LastGenerated + } // end of method sortedWords2@18::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -743,15 +743,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Ordering01/'sortedWords2@18-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Ordering01/sortedWords2@18::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'sortedWords2@18-6'::GetFreshEnumerator + } // end of method sortedWords2@18::GetFreshEnumerator - } // end of class 'sortedWords2@18-6' + } // end of class sortedWords2@18 - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedWords2@19-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedWords2@19-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -764,7 +764,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedWords2@19-7'::.ctor + } // end of method 'sortedWords2@19-1'::.ctor .method public strict virtual instance int32 Invoke(string w) cil managed @@ -775,11 +775,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'sortedWords2@19-7'::Invoke + } // end of method 'sortedWords2@19-1'::Invoke - } // end of class 'sortedWords2@19-7' + } // end of class 'sortedWords2@19-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@26-9' + .class auto ansi serializable sealed nested assembly beforefieldinit sortedProducts@26 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -797,9 +797,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/'sortedProducts@26-9'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/sortedProducts@26::builder@ IL_000d: ret - } // end of method 'sortedProducts@26-9'::.ctor + } // end of method sortedProducts@26::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -812,16 +812,16 @@ IL_0001: stloc.0 .line 27,27 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/'sortedProducts@26-9'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/sortedProducts@26::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'sortedProducts@26-9'::Invoke + } // end of method sortedProducts@26::Invoke - } // end of class 'sortedProducts@26-9' + } // end of class sortedProducts@26 - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@27-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@27-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -834,7 +834,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts@27-10'::.ctor + } // end of method 'sortedProducts@27-1'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -846,11 +846,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_ProductName() IL_0008: ret - } // end of method 'sortedProducts@27-10'::Invoke + } // end of method 'sortedProducts@27-1'::Invoke - } // end of class 'sortedProducts@27-10' + } // end of class 'sortedProducts@27-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@28-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts@28-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -863,7 +863,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts@28-11'::.ctor + } // end of method 'sortedProducts@28-2'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -873,11 +873,11 @@ .line 28,28 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'sortedProducts@28-11'::Invoke + } // end of method 'sortedProducts@28-2'::Invoke - } // end of class 'sortedProducts@28-11' + } // end of class 'sortedProducts@28-2' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sortedProducts2@44-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname sortedProducts2@44 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -902,17 +902,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_0009: stfld int32 Linq101Ordering01/sortedProducts2@44::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current + IL_0010: stfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'sortedProducts2@44-6'::.ctor + } // end of method sortedProducts2@44::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -923,7 +923,7 @@ [1] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedProducts2@44::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -956,18 +956,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_products() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_003d: stfld int32 Linq101Ordering01/sortedProducts2@44::pc .line 44,44 : 9,29 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 44,44 : 9,29 '' @@ -975,11 +975,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_005f: stfld int32 Linq101Ordering01/sortedProducts2@44::pc .line 45,45 : 9,40 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current + IL_0066: stfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current IL_006b: ldc.i4.1 IL_006c: ret @@ -989,24 +989,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_0072: stfld int32 Linq101Ordering01/sortedProducts2@44::pc .line 44,44 : 9,29 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_008c: stfld int32 Linq101Ordering01/sortedProducts2@44::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current + IL_0093: stfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'sortedProducts2@44-6'::GenerateNext + } // end of method sortedProducts2@44::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1018,7 +1018,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedProducts2@44::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1034,7 +1034,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_001b: ldfld int32 Linq101Ordering01/sortedProducts2@44::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1072,19 +1072,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_004f: stfld int32 Linq101Ordering01/sortedProducts2@44::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedProducts2@44-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedProducts2@44::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_0063: stfld int32 Linq101Ordering01/sortedProducts2@44::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current + IL_006a: stfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1124,7 +1124,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'sortedProducts2@44-6'::Close + } // end of method sortedProducts2@44::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1133,7 +1133,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedProducts2@44-6'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedProducts2@44::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1175,7 +1175,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'sortedProducts2@44-6'::get_CheckClose + } // end of method sortedProducts2@44::get_CheckClose .method public strict virtual instance class [Utils]Utils/Product get_LastGenerated() cil managed @@ -1185,9 +1185,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [Utils]Utils/Product Linq101Ordering01/'sortedProducts2@44-6'::current + IL_0001: ldfld class [Utils]Utils/Product Linq101Ordering01/sortedProducts2@44::current IL_0006: ret - } // end of method 'sortedProducts2@44-6'::get_LastGenerated + } // end of method sortedProducts2@44::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1199,15 +1199,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Ordering01/'sortedProducts2@44-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_0003: newobj instance void Linq101Ordering01/sortedProducts2@44::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_0008: ret - } // end of method 'sortedProducts2@44-6'::GetFreshEnumerator + } // end of method sortedProducts2@44::GetFreshEnumerator - } // end of class 'sortedProducts2@44-6' + } // end of class sortedProducts2@44 - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts2@45-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts2@45-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1220,7 +1220,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts2@45-7'::.ctor + } // end of method 'sortedProducts2@45-1'::.ctor .method public strict virtual instance int32 Invoke(class [Utils]Utils/Product p) cil managed @@ -1232,11 +1232,11 @@ IL_0001: tail. IL_0003: callvirt instance int32 [Utils]Utils/Product::get_UnitsInStock() IL_0008: ret - } // end of method 'sortedProducts2@45-7'::Invoke + } // end of method 'sortedProducts2@45-1'::Invoke - } // end of class 'sortedProducts2@45-7' + } // end of class 'sortedProducts2@45-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'sortedDigits@52-9' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname sortedDigits@52 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1261,17 +1261,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_0009: stfld int32 Linq101Ordering01/sortedDigits@52::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Ordering01/'sortedDigits@52-9'::current + IL_0010: stfld string Linq101Ordering01/sortedDigits@52::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'sortedDigits@52-9'::.ctor + } // end of method sortedDigits@52::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1282,7 +1282,7 @@ [1] string d) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedDigits@52::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1315,18 +1315,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_digits() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_003d: stfld int32 Linq101Ordering01/sortedDigits@52::pc .line 52,52 : 9,27 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 52,52 : 9,27 '' @@ -1334,11 +1334,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_005f: stfld int32 Linq101Ordering01/sortedDigits@52::pc .line 53,53 : 9,24 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Ordering01/'sortedDigits@52-9'::current + IL_0066: stfld string Linq101Ordering01/sortedDigits@52::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1348,24 +1348,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_0072: stfld int32 Linq101Ordering01/sortedDigits@52::pc .line 52,52 : 9,27 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_008c: stfld int32 Linq101Ordering01/sortedDigits@52::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Ordering01/'sortedDigits@52-9'::current + IL_0093: stfld string Linq101Ordering01/sortedDigits@52::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'sortedDigits@52-9'::GenerateNext + } // end of method sortedDigits@52::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1377,7 +1377,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedDigits@52::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1393,7 +1393,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_001b: ldfld int32 Linq101Ordering01/sortedDigits@52::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1431,19 +1431,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_004f: stfld int32 Linq101Ordering01/sortedDigits@52::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/'sortedDigits@52-9'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Ordering01/sortedDigits@52::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_0063: stfld int32 Linq101Ordering01/sortedDigits@52::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Ordering01/'sortedDigits@52-9'::current + IL_006a: stfld string Linq101Ordering01/sortedDigits@52::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1483,7 +1483,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'sortedDigits@52-9'::Close + } // end of method sortedDigits@52::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1492,7 +1492,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Ordering01/'sortedDigits@52-9'::pc + IL_0001: ldfld int32 Linq101Ordering01/sortedDigits@52::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1534,7 +1534,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'sortedDigits@52-9'::get_CheckClose + } // end of method sortedDigits@52::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -1544,9 +1544,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Ordering01/'sortedDigits@52-9'::current + IL_0001: ldfld string Linq101Ordering01/sortedDigits@52::current IL_0006: ret - } // end of method 'sortedDigits@52-9'::get_LastGenerated + } // end of method sortedDigits@52::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1558,15 +1558,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Ordering01/'sortedDigits@52-9'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Ordering01/sortedDigits@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'sortedDigits@52-9'::GetFreshEnumerator + } // end of method sortedDigits@52::GetFreshEnumerator - } // end of class 'sortedDigits@52-9' + } // end of class sortedDigits@52 - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedDigits@53-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedDigits@53-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1579,7 +1579,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedDigits@53-10'::.ctor + } // end of method 'sortedDigits@53-1'::.ctor .method public strict virtual instance int32 Invoke(string d) cil managed @@ -1590,11 +1590,11 @@ IL_0000: ldarg.1 IL_0001: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0006: ret - } // end of method 'sortedDigits@53-10'::Invoke + } // end of method 'sortedDigits@53-1'::Invoke - } // end of class 'sortedDigits@53-10' + } // end of class 'sortedDigits@53-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedDigits@54-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedDigits@54-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1607,7 +1607,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedDigits@54-11'::.ctor + } // end of method 'sortedDigits@54-2'::.ctor .method public strict virtual instance string Invoke(string d) cil managed @@ -1617,11 +1617,11 @@ .line 54,54 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'sortedDigits@54-11'::Invoke + } // end of method 'sortedDigits@54-2'::Invoke - } // end of class 'sortedDigits@54-11' + } // end of class 'sortedDigits@54-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@60-12' + .class auto ansi serializable sealed nested assembly beforefieldinit sortedProducts3@60 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1639,9 +1639,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/'sortedProducts3@60-12'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/sortedProducts3@60::builder@ IL_000d: ret - } // end of method 'sortedProducts3@60-12'::.ctor + } // end of method sortedProducts3@60::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -1654,16 +1654,16 @@ IL_0001: stloc.0 .line 61,61 : 9,26 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/'sortedProducts3@60-12'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Ordering01/sortedProducts3@60::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'sortedProducts3@60-12'::Invoke + } // end of method sortedProducts3@60::Invoke - } // end of class 'sortedProducts3@60-12' + } // end of class sortedProducts3@60 - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@61-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@61-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1676,7 +1676,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts3@61-13'::.ctor + } // end of method 'sortedProducts3@61-1'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -1688,11 +1688,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'sortedProducts3@61-13'::Invoke + } // end of method 'sortedProducts3@61-1'::Invoke - } // end of class 'sortedProducts3@61-13' + } // end of class 'sortedProducts3@61-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@62-14' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@62-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1705,7 +1705,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts3@62-14'::.ctor + } // end of method 'sortedProducts3@62-2'::.ctor .method public strict virtual instance valuetype [mscorlib]System.Decimal Invoke(class [Utils]Utils/Product p) cil managed @@ -1717,11 +1717,11 @@ IL_0001: tail. IL_0003: callvirt instance valuetype [mscorlib]System.Decimal [Utils]Utils/Product::get_UnitPrice() IL_0008: ret - } // end of method 'sortedProducts3@62-14'::Invoke + } // end of method 'sortedProducts3@62-2'::Invoke - } // end of class 'sortedProducts3@62-14' + } // end of class 'sortedProducts3@62-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@63-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'sortedProducts3@63-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1734,7 +1734,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'sortedProducts3@63-15'::.ctor + } // end of method 'sortedProducts3@63-3'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -1744,16 +1744,16 @@ .line 63,63 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'sortedProducts3@63-15'::Invoke + } // end of method 'sortedProducts3@63-3'::Invoke - } // end of class 'sortedProducts3@63-15' + } // end of class 'sortedProducts3@63-3' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_words() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'words@8-34' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'words@8-4' IL_0005: ret } // end of method Linq101Ordering01::get_words @@ -1762,7 +1762,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedWords@9-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedWords@9 IL_0005: ret } // end of method Linq101Ordering01::get_sortedWords @@ -1771,7 +1771,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedWords2@16-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedWords2@16 IL_0005: ret } // end of method Linq101Ordering01::get_sortedWords2 @@ -1780,7 +1780,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'products@23-62' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'products@23-8' IL_0005: ret } // end of method Linq101Ordering01::get_products @@ -1789,7 +1789,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts@24-6' + IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts@24 IL_0005: ret } // end of method Linq101Ordering01::get_sortedProducts @@ -1798,7 +1798,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts2@42-6' + IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts2@42 IL_0005: ret } // end of method Linq101Ordering01::get_sortedProducts2 @@ -1807,7 +1807,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'digits@49-26' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'digits@49-2' IL_0005: ret } // end of method Linq101Ordering01::get_digits @@ -1816,7 +1816,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedDigits@50-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedDigits@50 IL_0005: ret } // end of method Linq101Ordering01::get_sortedDigits @@ -1825,7 +1825,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts3@58-6' + IL_0000: ldsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts3@58 IL_0005: ret } // end of method Linq101Ordering01::get_sortedProducts3 @@ -1885,23 +1885,23 @@ .class private abstract auto ansi sealed ''.$Linq101Ordering01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@8-34' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@8-4' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'sortedWords@9-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 sortedWords@9 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'sortedWords2@16-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 sortedWords2@16 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@23-62' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@23-8' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Product[] 'sortedProducts@24-6' + .field static assembly class [Utils]Utils/Product[] sortedProducts@24 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Product[] 'sortedProducts2@42-6' + .field static assembly class [Utils]Utils/Product[] sortedProducts2@42 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@49-26' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@49-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'sortedDigits@50-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 sortedDigits@50 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Product[] 'sortedProducts3@58-6' + .field static assembly class [Utils]Utils/Product[] sortedProducts3@58 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1939,7 +1939,7 @@ IL_001e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0023: dup - IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'words@8-34' + IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'words@8-4' IL_0029: stloc.0 .line 9,13 : 1,20 '' IL_002a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1948,17 +1948,17 @@ IL_0033: ldnull IL_0034: ldc.i4.0 IL_0035: ldnull - IL_0036: newobj instance void Linq101Ordering01/'sortedWords@11-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0036: newobj instance void Linq101Ordering01/sortedWords@11::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_003b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0040: newobj instance void Linq101Ordering01/'sortedWords@12-7'::.ctor() + IL_0040: newobj instance void Linq101Ordering01/'sortedWords@12-1'::.ctor() IL_0045: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_004a: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_004f: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0054: dup - IL_0055: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedWords@9-6' + IL_0055: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedWords@9 IL_005a: stloc.1 .line 16,20 : 1,20 '' IL_005b: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1967,22 +1967,22 @@ IL_0064: ldnull IL_0065: ldc.i4.0 IL_0066: ldnull - IL_0067: newobj instance void Linq101Ordering01/'sortedWords2@18-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0067: newobj instance void Linq101Ordering01/sortedWords2@18::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_006c: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0071: newobj instance void Linq101Ordering01/'sortedWords2@19-7'::.ctor() + IL_0071: newobj instance void Linq101Ordering01/'sortedWords2@19-1'::.ctor() IL_0076: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_007b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0080: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0085: dup - IL_0086: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedWords2@16-6' + IL_0086: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedWords2@16 IL_008b: stloc.2 .line 23,23 : 1,32 '' IL_008c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0091: dup - IL_0092: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'products@23-62' + IL_0092: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'products@23-8' IL_0097: stloc.3 .line 24,29 : 1,21 '' IL_0098: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1994,19 +1994,19 @@ IL_00a7: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_products() IL_00ac: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00b1: ldloc.s V_11 - IL_00b3: newobj instance void Linq101Ordering01/'sortedProducts@26-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00b3: newobj instance void Linq101Ordering01/sortedProducts@26::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00b8: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00bd: newobj instance void Linq101Ordering01/'sortedProducts@27-10'::.ctor() + IL_00bd: newobj instance void Linq101Ordering01/'sortedProducts@27-1'::.ctor() IL_00c2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_00c7: newobj instance void Linq101Ordering01/'sortedProducts@28-11'::.ctor() + IL_00c7: newobj instance void Linq101Ordering01/'sortedProducts@28-2'::.ctor() IL_00cc: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00d1: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_00d6: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00db: dup - IL_00dc: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts@24-6' + IL_00dc: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts@24 IL_00e1: stloc.s sortedProducts .line 42,46 : 1,21 '' IL_00e3: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2015,17 +2015,17 @@ IL_00ec: ldnull IL_00ed: ldc.i4.0 IL_00ee: ldnull - IL_00ef: newobj instance void Linq101Ordering01/'sortedProducts2@44-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [Utils]Utils/Product) + IL_00ef: newobj instance void Linq101Ordering01/sortedProducts2@44::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [Utils]Utils/Product) IL_00f4: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_00f9: newobj instance void Linq101Ordering01/'sortedProducts2@45-7'::.ctor() + IL_00f9: newobj instance void Linq101Ordering01/'sortedProducts2@45-1'::.ctor() IL_00fe: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortByDescending(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0103: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0108: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_010d: dup - IL_010e: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts2@42-6' + IL_010e: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts2@42 IL_0113: stloc.s sortedProducts2 .line 49,49 : 1,96 '' IL_0115: ldstr "zero" @@ -2060,7 +2060,7 @@ IL_0179: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_017e: dup - IL_017f: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'digits@49-26' + IL_017f: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'digits@49-2' IL_0184: stloc.s digits .line 50,55 : 1,20 '' IL_0186: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2070,20 +2070,20 @@ IL_0191: ldnull IL_0192: ldc.i4.0 IL_0193: ldnull - IL_0194: newobj instance void Linq101Ordering01/'sortedDigits@52-9'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0194: newobj instance void Linq101Ordering01/sortedDigits@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0199: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_019e: newobj instance void Linq101Ordering01/'sortedDigits@53-10'::.ctor() + IL_019e: newobj instance void Linq101Ordering01/'sortedDigits@53-1'::.ctor() IL_01a3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_01a8: newobj instance void Linq101Ordering01/'sortedDigits@54-11'::.ctor() + IL_01a8: newobj instance void Linq101Ordering01/'sortedDigits@54-2'::.ctor() IL_01ad: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::ThenBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01b2: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_01b7: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01bc: dup - IL_01bd: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::'sortedDigits@50-6' + IL_01bd: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Ordering01::sortedDigits@50 IL_01c2: stloc.s sortedDigits .line 58,64 : 1,21 '' IL_01c4: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2096,22 +2096,22 @@ IL_01d5: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Ordering01::get_products() IL_01da: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01df: ldloc.s V_14 - IL_01e1: newobj instance void Linq101Ordering01/'sortedProducts3@60-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01e1: newobj instance void Linq101Ordering01/sortedProducts3@60::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01e6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01eb: newobj instance void Linq101Ordering01/'sortedProducts3@61-13'::.ctor() + IL_01eb: newobj instance void Linq101Ordering01/'sortedProducts3@61-1'::.ctor() IL_01f0: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SortBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_01f5: newobj instance void Linq101Ordering01/'sortedProducts3@62-14'::.ctor() + IL_01f5: newobj instance void Linq101Ordering01/'sortedProducts3@62-2'::.ctor() IL_01fa: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::ThenByDescending(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_01ff: newobj instance void Linq101Ordering01/'sortedProducts3@63-15'::.ctor() + IL_01ff: newobj instance void Linq101Ordering01/'sortedProducts3@63-3'::.ctor() IL_0204: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0209: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_020e: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0213: dup - IL_0214: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::'sortedProducts3@58-6' + IL_0214: stsfld class [Utils]Utils/Product[] ''.$Linq101Ordering01::sortedProducts3@58 IL_0219: stloc.s sortedProducts3 IL_021b: ret } // end of method $Linq101Ordering01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl index f100f7ded91..89a9c2c360d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Partitioning01.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x00000540 Length: 0x00000000 } .module Linq101Partitioning01.exe -// MVID: {5BF2D3C6-B280-A6A2-A745-0383C6D3F25B} +// MVID: {5C6C932B-4363-38D6-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01410000 +// Image base: 0x01290000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'first3Numbers@12-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname first3Numbers@12 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -88,17 +88,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_0009: stfld int32 Linq101Partitioning01/first3Numbers@12::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current + IL_0010: stfld int32 Linq101Partitioning01/first3Numbers@12::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'first3Numbers@12-3'::.ctor + } // end of method first3Numbers@12::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -110,7 +110,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Partitioning01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_0001: ldfld int32 Linq101Partitioning01/first3Numbers@12::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_003d: stfld int32 Linq101Partitioning01/first3Numbers@12::pc .line 12,12 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 12,12 : 9,28 '' @@ -162,11 +162,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_005f: stfld int32 Linq101Partitioning01/first3Numbers@12::pc .line 13,13 : 9,15 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current + IL_0066: stfld int32 Linq101Partitioning01/first3Numbers@12::current IL_006b: ldc.i4.1 IL_006c: ret @@ -176,24 +176,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_0072: stfld int32 Linq101Partitioning01/first3Numbers@12::pc .line 12,12 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_008c: stfld int32 Linq101Partitioning01/first3Numbers@12::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current + IL_0093: stfld int32 Linq101Partitioning01/first3Numbers@12::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'first3Numbers@12-3'::GenerateNext + } // end of method first3Numbers@12::GenerateNext .method public strict virtual instance void Close() cil managed @@ -205,7 +205,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_0001: ldfld int32 Linq101Partitioning01/first3Numbers@12::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -221,7 +221,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_001b: ldfld int32 Linq101Partitioning01/first3Numbers@12::pc IL_0020: switch ( IL_0037, IL_0039, @@ -259,19 +259,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_004f: stfld int32 Linq101Partitioning01/first3Numbers@12::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'first3Numbers@12-3'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/first3Numbers@12::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_0063: stfld int32 Linq101Partitioning01/first3Numbers@12::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current + IL_006a: stfld int32 Linq101Partitioning01/first3Numbers@12::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -311,7 +311,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'first3Numbers@12-3'::Close + } // end of method first3Numbers@12::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -320,7 +320,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::pc + IL_0001: ldfld int32 Linq101Partitioning01/first3Numbers@12::pc IL_0006: switch ( IL_001d, IL_001f, @@ -362,7 +362,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'first3Numbers@12-3'::get_CheckClose + } // end of method first3Numbers@12::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -372,9 +372,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'first3Numbers@12-3'::current + IL_0001: ldfld int32 Linq101Partitioning01/first3Numbers@12::current IL_0006: ret - } // end of method 'first3Numbers@12-3'::get_LastGenerated + } // end of method first3Numbers@12::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -386,15 +386,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Partitioning01/'first3Numbers@12-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Partitioning01/first3Numbers@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'first3Numbers@12-3'::GetFreshEnumerator + } // end of method first3Numbers@12::GetFreshEnumerator - } // end of class 'first3Numbers@12-3' + } // end of class first3Numbers@12 - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@21-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@21-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -414,12 +414,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@21-13'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@21-1'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders@21-13'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders@21-1'::c IL_0014: ret - } // end of method 'WAOrders@21-13'::.ctor + } // end of method 'WAOrders@21-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -432,20 +432,20 @@ IL_0001: stloc.0 .line 22,22 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@21-13'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@21-1'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders@21-13'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders@21-1'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'WAOrders@21-13'::Invoke + } // end of method 'WAOrders@21-1'::Invoke - } // end of class 'WAOrders@21-13' + } // end of class 'WAOrders@21-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@20-12' + .class auto ansi serializable sealed nested assembly beforefieldinit WAOrders@20 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -463,9 +463,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@20-12'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders@20::builder@ IL_000d: ret - } // end of method 'WAOrders@20-12'::.ctor + } // end of method WAOrders@20::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -478,26 +478,26 @@ IL_0001: stloc.0 .line 21,21 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@20-12'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders@20::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@20-12'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders@20::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders@20-12'::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders@20::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Partitioning01/'WAOrders@21-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Partitioning01/'WAOrders@21-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'WAOrders@20-12'::Invoke + } // end of method WAOrders@20::Invoke - } // end of class 'WAOrders@20-12' + } // end of class WAOrders@20 - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@22-14' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@22-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -510,7 +510,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'WAOrders@22-14'::.ctor + } // end of method 'WAOrders@22-2'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -533,11 +533,11 @@ IL_0019: call bool [mscorlib]System.String::Equals(string, string) IL_001e: ret - } // end of method 'WAOrders@22-14'::Invoke + } // end of method 'WAOrders@22-2'::Invoke - } // end of class 'WAOrders@22-14' + } // end of class 'WAOrders@22-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@23-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders@23-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -550,7 +550,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'WAOrders@23-15'::.ctor + } // end of method 'WAOrders@23-3'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -577,11 +577,11 @@ !1, !2) IL_0025: ret - } // end of method 'WAOrders@23-15'::Invoke + } // end of method 'WAOrders@23-3'::Invoke - } // end of class 'WAOrders@23-15' + } // end of class 'WAOrders@23-3' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'allButFirst4Numbers@29-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname allButFirst4Numbers@29 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -606,17 +606,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_0009: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current + IL_0010: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'allButFirst4Numbers@29-3'::.ctor + } // end of method allButFirst4Numbers@29::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -627,7 +627,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_0001: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -660,18 +660,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_003d: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc .line 29,29 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 29,29 : 9,28 '' @@ -679,11 +679,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_005f: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc .line 30,30 : 9,15 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current + IL_0066: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current IL_006b: ldc.i4.1 IL_006c: ret @@ -693,24 +693,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_0072: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc .line 29,29 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_008c: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current + IL_0093: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'allButFirst4Numbers@29-3'::GenerateNext + } // end of method allButFirst4Numbers@29::GenerateNext .method public strict virtual instance void Close() cil managed @@ -722,7 +722,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_0001: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -738,7 +738,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_001b: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc IL_0020: switch ( IL_0037, IL_0039, @@ -776,19 +776,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_004f: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst4Numbers@29-3'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst4Numbers@29::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_0063: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current + IL_006a: stfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -828,7 +828,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'allButFirst4Numbers@29-3'::Close + } // end of method allButFirst4Numbers@29::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -837,7 +837,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::pc + IL_0001: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::pc IL_0006: switch ( IL_001d, IL_001f, @@ -879,7 +879,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'allButFirst4Numbers@29-3'::get_CheckClose + } // end of method allButFirst4Numbers@29::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -889,9 +889,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst4Numbers@29-3'::current + IL_0001: ldfld int32 Linq101Partitioning01/allButFirst4Numbers@29::current IL_0006: ret - } // end of method 'allButFirst4Numbers@29-3'::get_LastGenerated + } // end of method allButFirst4Numbers@29::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -903,15 +903,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Partitioning01/'allButFirst4Numbers@29-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Partitioning01/allButFirst4Numbers@29::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'allButFirst4Numbers@29-3'::GetFreshEnumerator + } // end of method allButFirst4Numbers@29::GetFreshEnumerator - } // end of class 'allButFirst4Numbers@29-3' + } // end of class allButFirst4Numbers@29 - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@37-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@37-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -931,12 +931,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@37-13'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@37-1'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders2@37-13'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders2@37-1'::c IL_0014: ret - } // end of method 'WAOrders2@37-13'::.ctor + } // end of method 'WAOrders2@37-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -949,20 +949,20 @@ IL_0001: stloc.0 .line 38,38 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@37-13'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@37-1'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders2@37-13'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Partitioning01/'WAOrders2@37-1'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'WAOrders2@37-13'::Invoke + } // end of method 'WAOrders2@37-1'::Invoke - } // end of class 'WAOrders2@37-13' + } // end of class 'WAOrders2@37-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@36-12' + .class auto ansi serializable sealed nested assembly beforefieldinit WAOrders2@36 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -980,9 +980,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@36-12'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders2@36::builder@ IL_000d: ret - } // end of method 'WAOrders2@36-12'::.ctor + } // end of method WAOrders2@36::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -995,26 +995,26 @@ IL_0001: stloc.0 .line 37,37 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@36-12'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders2@36::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@36-12'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders2@36::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/'WAOrders2@36-12'::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Partitioning01/WAOrders2@36::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Partitioning01/'WAOrders2@37-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Partitioning01/'WAOrders2@37-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'WAOrders2@36-12'::Invoke + } // end of method WAOrders2@36::Invoke - } // end of class 'WAOrders2@36-12' + } // end of class WAOrders2@36 - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@38-14' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@38-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -1027,7 +1027,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'WAOrders2@38-14'::.ctor + } // end of method 'WAOrders2@38-2'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -1050,11 +1050,11 @@ IL_0019: call bool [mscorlib]System.String::Equals(string, string) IL_001e: ret - } // end of method 'WAOrders2@38-14'::Invoke + } // end of method 'WAOrders2@38-2'::Invoke - } // end of class 'WAOrders2@38-14' + } // end of class 'WAOrders2@38-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@39-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'WAOrders2@39-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -1067,7 +1067,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'WAOrders2@39-15'::.ctor + } // end of method 'WAOrders2@39-3'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -1094,11 +1094,11 @@ !1, !2) IL_0025: ret - } // end of method 'WAOrders2@39-15'::Invoke + } // end of method 'WAOrders2@39-3'::Invoke - } // end of class 'WAOrders2@39-15' + } // end of class 'WAOrders2@39-3' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'firstNumbersLessThan6@45-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname firstNumbersLessThan6@45 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1123,17 +1123,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_0009: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current + IL_0010: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'firstNumbersLessThan6@45-6'::.ctor + } // end of method firstNumbersLessThan6@45::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1144,7 +1144,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_0001: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1177,18 +1177,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_003d: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc .line 45,45 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 45,45 : 9,28 '' @@ -1196,11 +1196,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_005f: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc .line 46,46 : 9,26 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current + IL_0066: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1210,24 +1210,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_0072: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc .line 45,45 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_008c: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current + IL_0093: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'firstNumbersLessThan6@45-6'::GenerateNext + } // end of method firstNumbersLessThan6@45::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1239,7 +1239,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_0001: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1255,7 +1255,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_001b: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1293,19 +1293,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_004f: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/firstNumbersLessThan6@45::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_0063: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current + IL_006a: stfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1345,7 +1345,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'firstNumbersLessThan6@45-6'::Close + } // end of method firstNumbersLessThan6@45::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1354,7 +1354,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::pc + IL_0001: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1396,7 +1396,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'firstNumbersLessThan6@45-6'::get_CheckClose + } // end of method firstNumbersLessThan6@45::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -1406,9 +1406,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'firstNumbersLessThan6@45-6'::current + IL_0001: ldfld int32 Linq101Partitioning01/firstNumbersLessThan6@45::current IL_0006: ret - } // end of method 'firstNumbersLessThan6@45-6'::get_LastGenerated + } // end of method firstNumbersLessThan6@45::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1420,15 +1420,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Partitioning01/'firstNumbersLessThan6@45-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Partitioning01/firstNumbersLessThan6@45::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'firstNumbersLessThan6@45-6'::GetFreshEnumerator + } // end of method firstNumbersLessThan6@45::GetFreshEnumerator - } // end of class 'firstNumbersLessThan6@45-6' + } // end of class firstNumbersLessThan6@45 - .class auto ansi serializable sealed nested assembly beforefieldinit 'firstNumbersLessThan6@46-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'firstNumbersLessThan6@46-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1441,7 +1441,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'firstNumbersLessThan6@46-7'::.ctor + } // end of method 'firstNumbersLessThan6@46-1'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -1453,11 +1453,11 @@ IL_0001: ldc.i4.6 IL_0002: clt IL_0004: ret - } // end of method 'firstNumbersLessThan6@46-7'::Invoke + } // end of method 'firstNumbersLessThan6@46-1'::Invoke - } // end of class 'firstNumbersLessThan6@46-7' + } // end of class 'firstNumbersLessThan6@46-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'allButFirst3Numbers@52-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname allButFirst3Numbers@52 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1482,17 +1482,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_0009: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current + IL_0010: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'allButFirst3Numbers@52-6'::.ctor + } // end of method allButFirst3Numbers@52::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1503,7 +1503,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_0001: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1536,18 +1536,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_003d: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc .line 52,52 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 52,52 : 9,28 '' @@ -1555,11 +1555,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_005f: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc .line 53,53 : 9,31 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current + IL_0066: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current IL_006b: ldc.i4.1 IL_006c: ret @@ -1569,24 +1569,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_0072: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc .line 52,52 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_008c: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current + IL_0093: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'allButFirst3Numbers@52-6'::GenerateNext + } // end of method allButFirst3Numbers@52::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1598,7 +1598,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_0001: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1614,7 +1614,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_001b: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1652,19 +1652,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_004f: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/'allButFirst3Numbers@52-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Partitioning01/allButFirst3Numbers@52::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_0063: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current + IL_006a: stfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1704,7 +1704,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'allButFirst3Numbers@52-6'::Close + } // end of method allButFirst3Numbers@52::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1713,7 +1713,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::pc + IL_0001: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1755,7 +1755,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'allButFirst3Numbers@52-6'::get_CheckClose + } // end of method allButFirst3Numbers@52::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -1765,9 +1765,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Partitioning01/'allButFirst3Numbers@52-6'::current + IL_0001: ldfld int32 Linq101Partitioning01/allButFirst3Numbers@52::current IL_0006: ret - } // end of method 'allButFirst3Numbers@52-6'::get_LastGenerated + } // end of method allButFirst3Numbers@52::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1779,15 +1779,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Partitioning01/'allButFirst3Numbers@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Partitioning01/allButFirst3Numbers@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'allButFirst3Numbers@52-6'::GetFreshEnumerator + } // end of method allButFirst3Numbers@52::GetFreshEnumerator - } // end of class 'allButFirst3Numbers@52-6' + } // end of class allButFirst3Numbers@52 - .class auto ansi serializable sealed nested assembly beforefieldinit 'allButFirst3Numbers@53-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'allButFirst3Numbers@53-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1800,7 +1800,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'allButFirst3Numbers@53-7'::.ctor + } // end of method 'allButFirst3Numbers@53-1'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -1816,16 +1816,16 @@ IL_0006: ldc.i4.0 IL_0007: ceq IL_0009: ret - } // end of method 'allButFirst3Numbers@53-7'::Invoke + } // end of method 'allButFirst3Numbers@53-1'::Invoke - } // end of class 'allButFirst3Numbers@53-7' + } // end of class 'allButFirst3Numbers@53-1' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_numbers() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'numbers@7-44' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'numbers@7-5' IL_0005: ret } // end of method Linq101Partitioning01::get_numbers @@ -1834,7 +1834,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'first3Numbers@10-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::first3Numbers@10 IL_0005: ret } // end of method Linq101Partitioning01::get_first3Numbers @@ -1843,7 +1843,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'customers@17-32' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'customers@17-2' IL_0005: ret } // end of method Linq101Partitioning01::get_customers @@ -1852,7 +1852,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Partitioning01::'WAOrders@18-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Partitioning01::WAOrders@18 IL_0005: ret } // end of method Linq101Partitioning01::get_WAOrders @@ -1861,7 +1861,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'allButFirst4Numbers@27-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::allButFirst4Numbers@27 IL_0005: ret } // end of method Linq101Partitioning01::get_allButFirst4Numbers @@ -1870,7 +1870,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Partitioning01::'WAOrders2@34-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Partitioning01::WAOrders2@34 IL_0005: ret } // end of method Linq101Partitioning01::get_WAOrders2 @@ -1879,7 +1879,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'firstNumbersLessThan6@43-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::firstNumbersLessThan6@43 IL_0005: ret } // end of method Linq101Partitioning01::get_firstNumbersLessThan6 @@ -1888,7 +1888,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'allButFirst3Numbers@50-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::allButFirst3Numbers@50 IL_0005: ret } // end of method Linq101Partitioning01::get_allButFirst3Numbers @@ -1945,21 +1945,21 @@ .class private abstract auto ansi sealed ''.$Linq101Partitioning01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@7-44' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@7-5' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'first3Numbers@10-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 first3Numbers@10 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@17-32' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@17-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`3[] 'WAOrders@18-6' + .field static assembly class [mscorlib]System.Tuple`3[] WAOrders@18 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'allButFirst4Numbers@27-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 allButFirst4Numbers@27 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> 'WAOrders2@34-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> WAOrders2@34 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'firstNumbersLessThan6@43-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 firstNumbersLessThan6@43 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'allButFirst3Numbers@50-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 allButFirst3Numbers@50 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -2017,7 +2017,7 @@ IL_003d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0042: dup - IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'numbers@7-44' + IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'numbers@7-5' IL_0048: stloc.0 .line 10,14 : 1,20 '' IL_0049: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2026,9 +2026,9 @@ IL_0052: ldnull IL_0053: ldc.i4.0 IL_0054: ldc.i4.0 - IL_0055: newobj instance void Linq101Partitioning01/'first3Numbers@12-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0055: newobj instance void Linq101Partitioning01/first3Numbers@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_005a: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_005f: ldc.i4.3 IL_0060: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Take(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, @@ -2036,12 +2036,12 @@ IL_0065: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_006a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_006f: dup - IL_0070: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'first3Numbers@10-6' + IL_0070: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::first3Numbers@10 IL_0075: stloc.1 .line 17,17 : 1,34 '' IL_0076: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_007b: dup - IL_007c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'customers@17-32' + IL_007c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'customers@17-2' IL_0081: stloc.2 .line 18,24 : 1,21 '' IL_0082: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2053,19 +2053,19 @@ IL_0091: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_customers() IL_0096: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_009b: ldloc.s V_9 - IL_009d: newobj instance void Linq101Partitioning01/'WAOrders@20-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_009d: newobj instance void Linq101Partitioning01/WAOrders@20::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00a2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00a7: newobj instance void Linq101Partitioning01/'WAOrders@22-14'::.ctor() + IL_00a7: newobj instance void Linq101Partitioning01/'WAOrders@22-2'::.ctor() IL_00ac: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_00b1: newobj instance void Linq101Partitioning01/'WAOrders@23-15'::.ctor() + IL_00b1: newobj instance void Linq101Partitioning01/'WAOrders@23-3'::.ctor() IL_00b6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00bb: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_00c0: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00c5: dup - IL_00c6: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Partitioning01::'WAOrders@18-6' + IL_00c6: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Partitioning01::WAOrders@18 IL_00cb: stloc.3 .line 27,31 : 1,20 '' IL_00cc: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2074,9 +2074,9 @@ IL_00d5: ldnull IL_00d6: ldc.i4.0 IL_00d7: ldc.i4.0 - IL_00d8: newobj instance void Linq101Partitioning01/'allButFirst4Numbers@29-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_00d8: newobj instance void Linq101Partitioning01/allButFirst4Numbers@29::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_00dd: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00e2: ldc.i4.4 IL_00e3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Skip(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, @@ -2084,7 +2084,7 @@ IL_00e8: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_00ed: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00f2: dup - IL_00f3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'allButFirst4Numbers@27-6' + IL_00f3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::allButFirst4Numbers@27 IL_00f8: stloc.s allButFirst4Numbers .line 34,40 : 1,34 '' IL_00fa: ldc.i4.2 @@ -2097,13 +2097,13 @@ IL_010a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Partitioning01::get_customers() IL_010f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0114: ldloc.s V_11 - IL_0116: newobj instance void Linq101Partitioning01/'WAOrders2@36-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0116: newobj instance void Linq101Partitioning01/WAOrders2@36::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_011b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0120: newobj instance void Linq101Partitioning01/'WAOrders2@38-14'::.ctor() + IL_0120: newobj instance void Linq101Partitioning01/'WAOrders2@38-2'::.ctor() IL_0125: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_012a: newobj instance void Linq101Partitioning01/'WAOrders2@39-15'::.ctor() + IL_012a: newobj instance void Linq101Partitioning01/'WAOrders2@39-3'::.ctor() IL_012f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0134: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() @@ -2111,7 +2111,7 @@ class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_013e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0143: dup - IL_0144: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Partitioning01::'WAOrders2@34-6' + IL_0144: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Partitioning01::WAOrders2@34 IL_0149: stloc.s WAOrders2 .line 43,47 : 1,20 '' IL_014b: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2120,17 +2120,17 @@ IL_0154: ldnull IL_0155: ldc.i4.0 IL_0156: ldc.i4.0 - IL_0157: newobj instance void Linq101Partitioning01/'firstNumbersLessThan6@45-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0157: newobj instance void Linq101Partitioning01/firstNumbersLessThan6@45::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_015c: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0161: newobj instance void Linq101Partitioning01/'firstNumbersLessThan6@46-7'::.ctor() + IL_0161: newobj instance void Linq101Partitioning01/'firstNumbersLessThan6@46-1'::.ctor() IL_0166: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::TakeWhile(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_016b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0170: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0175: dup - IL_0176: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'firstNumbersLessThan6@43-6' + IL_0176: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::firstNumbersLessThan6@43 IL_017b: stloc.s firstNumbersLessThan6 .line 50,54 : 1,20 '' IL_017d: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -2139,17 +2139,17 @@ IL_0186: ldnull IL_0187: ldc.i4.0 IL_0188: ldc.i4.0 - IL_0189: newobj instance void Linq101Partitioning01/'allButFirst3Numbers@52-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0189: newobj instance void Linq101Partitioning01/allButFirst3Numbers@52::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_018e: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0193: newobj instance void Linq101Partitioning01/'allButFirst3Numbers@53-7'::.ctor() + IL_0193: newobj instance void Linq101Partitioning01/'allButFirst3Numbers@53-1'::.ctor() IL_0198: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::SkipWhile(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_019d: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_01a2: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01a7: dup - IL_01a8: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::'allButFirst3Numbers@50-6' + IL_01a8: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Partitioning01::allButFirst3Numbers@50 IL_01ad: stloc.s allButFirst3Numbers IL_01af: ret } // end of method $Linq101Partitioning01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl index 0652274c2bf..6a7ef8b91ce 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Quantifiers01.il.bsl @@ -53,13 +53,13 @@ // Offset: 0x000004C8 Length: 0x00000000 } .module Linq101Quantifiers01.exe -// MVID: {5BF2D3C6-76DD-E373-A745-0383C6D3F25B} +// MVID: {5C6C932B-BDD0-1A4E-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00380000 +// Image base: 0x01A60000 // =============== CLASS MEMBERS DECLARATION =================== @@ -68,7 +68,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'iAfterE@12-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname iAfterE@12 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -93,17 +93,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_0009: stfld int32 Linq101Quantifiers01/iAfterE@12::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Quantifiers01/'iAfterE@12-6'::current + IL_0010: stfld string Linq101Quantifiers01/iAfterE@12::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'iAfterE@12-6'::.ctor + } // end of method iAfterE@12::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -115,7 +115,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101Quantifiers01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_0001: ldfld int32 Linq101Quantifiers01/iAfterE@12::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -148,18 +148,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Quantifiers01::get_words() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_003d: stfld int32 Linq101Quantifiers01/iAfterE@12::pc .line 12,12 : 9,26 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 12,12 : 9,26 '' @@ -167,11 +167,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_005f: stfld int32 Linq101Quantifiers01/iAfterE@12::pc .line 13,13 : 9,34 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld string Linq101Quantifiers01/'iAfterE@12-6'::current + IL_0066: stfld string Linq101Quantifiers01/iAfterE@12::current IL_006b: ldc.i4.1 IL_006c: ret @@ -181,24 +181,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_0072: stfld int32 Linq101Quantifiers01/iAfterE@12::pc .line 12,12 : 9,26 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_008c: stfld int32 Linq101Quantifiers01/iAfterE@12::pc IL_0091: ldarg.0 IL_0092: ldnull - IL_0093: stfld string Linq101Quantifiers01/'iAfterE@12-6'::current + IL_0093: stfld string Linq101Quantifiers01/iAfterE@12::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'iAfterE@12-6'::GenerateNext + } // end of method iAfterE@12::GenerateNext .method public strict virtual instance void Close() cil managed @@ -210,7 +210,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_0001: ldfld int32 Linq101Quantifiers01/iAfterE@12::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -226,7 +226,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_001b: ldfld int32 Linq101Quantifiers01/iAfterE@12::pc IL_0020: switch ( IL_0037, IL_0039, @@ -264,19 +264,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_004f: stfld int32 Linq101Quantifiers01/iAfterE@12::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'iAfterE@12-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/iAfterE@12::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_0063: stfld int32 Linq101Quantifiers01/iAfterE@12::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Quantifiers01/'iAfterE@12-6'::current + IL_006a: stfld string Linq101Quantifiers01/iAfterE@12::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -316,7 +316,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'iAfterE@12-6'::Close + } // end of method iAfterE@12::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -325,7 +325,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/'iAfterE@12-6'::pc + IL_0001: ldfld int32 Linq101Quantifiers01/iAfterE@12::pc IL_0006: switch ( IL_001d, IL_001f, @@ -367,7 +367,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'iAfterE@12-6'::get_CheckClose + } // end of method iAfterE@12::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -377,9 +377,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Quantifiers01/'iAfterE@12-6'::current + IL_0001: ldfld string Linq101Quantifiers01/iAfterE@12::current IL_0006: ret - } // end of method 'iAfterE@12-6'::get_LastGenerated + } // end of method iAfterE@12::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -391,15 +391,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Quantifiers01/'iAfterE@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Quantifiers01/iAfterE@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'iAfterE@12-6'::GetFreshEnumerator + } // end of method iAfterE@12::GetFreshEnumerator - } // end of class 'iAfterE@12-6' + } // end of class iAfterE@12 - .class auto ansi serializable sealed nested assembly beforefieldinit 'iAfterE@13-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'iAfterE@13-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -412,7 +412,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'iAfterE@13-7'::.ctor + } // end of method 'iAfterE@13-1'::.ctor .method public strict virtual instance bool Invoke(string w) cil managed @@ -424,11 +424,11 @@ IL_0001: ldstr "ei" IL_0006: callvirt instance bool [mscorlib]System.String::Contains(string) IL_000b: ret - } // end of method 'iAfterE@13-7'::Invoke + } // end of method 'iAfterE@13-1'::Invoke - } // end of class 'iAfterE@13-7' + } // end of class 'iAfterE@13-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@21-21' + .class auto ansi serializable sealed nested assembly beforefieldinit productGroups@21 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -446,9 +446,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@21-21'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/productGroups@21::builder@ IL_000d: ret - } // end of method 'productGroups@21-21'::.ctor + } // end of method productGroups@21::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -461,16 +461,16 @@ IL_0001: stloc.0 .line 22,22 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@21-21'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/productGroups@21::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'productGroups@21-21'::Invoke + } // end of method productGroups@21::Invoke - } // end of class 'productGroups@21-21' + } // end of class productGroups@21 - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-22' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -483,7 +483,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'productGroups@22-22'::.ctor + } // end of method 'productGroups@22-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -493,11 +493,11 @@ .line 22,22 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'productGroups@22-22'::Invoke + } // end of method 'productGroups@22-1'::Invoke - } // end of class 'productGroups@22-22' + } // end of class 'productGroups@22-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-23' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -510,7 +510,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'productGroups@22-23'::.ctor + } // end of method 'productGroups@22-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -522,11 +522,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'productGroups@22-23'::Invoke + } // end of method 'productGroups@22-2'::Invoke - } // end of class 'productGroups@22-23' + } // end of class 'productGroups@22-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-24' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@22-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -544,9 +544,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@22-24'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@22-3'::builder@ IL_000d: ret - } // end of method 'productGroups@22-24'::.ctor + } // end of method 'productGroups@22-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -558,16 +558,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@22-24'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups@22-3'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'productGroups@22-24'::Invoke + } // end of method 'productGroups@22-3'::Invoke - } // end of class 'productGroups@22-24' + } // end of class 'productGroups@22-3' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productGroups@23-26' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productGroups@23-5' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -579,7 +579,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'productGroups@23-26'::.ctor + } // end of method 'productGroups@23-5'::.ctor .method assembly hidebysig instance bool Invoke(class [Utils]Utils/Product x) cil managed @@ -592,11 +592,11 @@ IL_0006: ldc.i4.0 IL_0007: ceq IL_0009: ret - } // end of method 'productGroups@23-26'::Invoke + } // end of method 'productGroups@23-5'::Invoke - } // end of class 'productGroups@23-26' + } // end of class 'productGroups@23-5' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@23-25' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@23-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -609,7 +609,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'productGroups@23-25'::.ctor + } // end of method 'productGroups@23-4'::.ctor .method public strict virtual instance bool Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -618,18 +618,18 @@ .maxstack 8 .line 23,23 : 16,50 '' IL_0000: ldarg.1 - IL_0001: newobj instance void Linq101Quantifiers01/'productGroups@23-26'::.ctor() - IL_0006: ldftn instance bool Linq101Quantifiers01/'productGroups@23-26'::Invoke(class [Utils]Utils/Product) + IL_0001: newobj instance void Linq101Quantifiers01/'productGroups@23-5'::.ctor() + IL_0006: ldftn instance bool Linq101Quantifiers01/'productGroups@23-5'::Invoke(class [Utils]Utils/Product) IL_000c: newobj instance void class [mscorlib]System.Func`2::.ctor(object, native int) IL_0011: call bool [System.Core]System.Linq.Enumerable::Any(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [mscorlib]System.Func`2) IL_0016: ret - } // end of method 'productGroups@23-25'::Invoke + } // end of method 'productGroups@23-4'::Invoke - } // end of class 'productGroups@23-25' + } // end of class 'productGroups@23-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@24-27' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups@24-6' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -642,7 +642,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'productGroups@24-27'::.ctor + } // end of method 'productGroups@24-6'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -656,11 +656,11 @@ IL_0007: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_000c: ret - } // end of method 'productGroups@24-27'::Invoke + } // end of method 'productGroups@24-6'::Invoke - } // end of class 'productGroups@24-27' + } // end of class 'productGroups@24-6' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'onlyOdd@32-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname onlyOdd@32 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -685,17 +685,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_0009: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current + IL_0010: stfld int32 Linq101Quantifiers01/onlyOdd@32::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'onlyOdd@32-6'::.ctor + } // end of method onlyOdd@32::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -706,7 +706,7 @@ [1] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_0001: ldfld int32 Linq101Quantifiers01/onlyOdd@32::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -739,18 +739,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Quantifiers01::get_numbers() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_003d: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc .line 32,32 : 9,28 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 32,32 : 9,28 '' @@ -758,11 +758,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_005f: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc .line 33,33 : 9,24 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current + IL_0066: stfld int32 Linq101Quantifiers01/onlyOdd@32::current IL_006b: ldc.i4.1 IL_006c: ret @@ -772,24 +772,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_0072: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc .line 32,32 : 9,28 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_008c: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current + IL_0093: stfld int32 Linq101Quantifiers01/onlyOdd@32::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'onlyOdd@32-6'::GenerateNext + } // end of method onlyOdd@32::GenerateNext .method public strict virtual instance void Close() cil managed @@ -801,7 +801,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_0001: ldfld int32 Linq101Quantifiers01/onlyOdd@32::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -817,7 +817,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_001b: ldfld int32 Linq101Quantifiers01/onlyOdd@32::pc IL_0020: switch ( IL_0037, IL_0039, @@ -855,19 +855,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_004f: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/'onlyOdd@32-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Quantifiers01/onlyOdd@32::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_0063: stfld int32 Linq101Quantifiers01/onlyOdd@32::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current + IL_006a: stfld int32 Linq101Quantifiers01/onlyOdd@32::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -907,7 +907,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'onlyOdd@32-6'::Close + } // end of method onlyOdd@32::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -916,7 +916,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::pc + IL_0001: ldfld int32 Linq101Quantifiers01/onlyOdd@32::pc IL_0006: switch ( IL_001d, IL_001f, @@ -958,7 +958,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'onlyOdd@32-6'::get_CheckClose + } // end of method onlyOdd@32::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -968,9 +968,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Quantifiers01/'onlyOdd@32-6'::current + IL_0001: ldfld int32 Linq101Quantifiers01/onlyOdd@32::current IL_0006: ret - } // end of method 'onlyOdd@32-6'::get_LastGenerated + } // end of method onlyOdd@32::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -982,15 +982,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Quantifiers01/'onlyOdd@32-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Quantifiers01/onlyOdd@32::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'onlyOdd@32-6'::GetFreshEnumerator + } // end of method onlyOdd@32::GetFreshEnumerator - } // end of class 'onlyOdd@32-6' + } // end of class onlyOdd@32 - .class auto ansi serializable sealed nested assembly beforefieldinit 'onlyOdd@33-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'onlyOdd@33-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1003,7 +1003,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'onlyOdd@33-7'::.ctor + } // end of method 'onlyOdd@33-1'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -1017,11 +1017,11 @@ IL_0003: ldc.i4.1 IL_0004: ceq IL_0006: ret - } // end of method 'onlyOdd@33-7'::Invoke + } // end of method 'onlyOdd@33-1'::Invoke - } // end of class 'onlyOdd@33-7' + } // end of class 'onlyOdd@33-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@39-21' + .class auto ansi serializable sealed nested assembly beforefieldinit productGroups2@39 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1039,9 +1039,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@39-21'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/productGroups2@39::builder@ IL_000d: ret - } // end of method 'productGroups2@39-21'::.ctor + } // end of method productGroups2@39::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -1054,16 +1054,16 @@ IL_0001: stloc.0 .line 40,40 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@39-21'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/productGroups2@39::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'productGroups2@39-21'::Invoke + } // end of method productGroups2@39::Invoke - } // end of class 'productGroups2@39-21' + } // end of class productGroups2@39 - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-22' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1076,7 +1076,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'productGroups2@40-22'::.ctor + } // end of method 'productGroups2@40-1'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -1086,11 +1086,11 @@ .line 40,40 : 20,21 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'productGroups2@40-22'::Invoke + } // end of method 'productGroups2@40-1'::Invoke - } // end of class 'productGroups2@40-22' + } // end of class 'productGroups2@40-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-23' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -1103,7 +1103,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'productGroups2@40-23'::.ctor + } // end of method 'productGroups2@40-2'::.ctor .method public strict virtual instance string Invoke(class [Utils]Utils/Product p) cil managed @@ -1115,11 +1115,11 @@ IL_0001: tail. IL_0003: callvirt instance string [Utils]Utils/Product::get_Category() IL_0008: ret - } // end of method 'productGroups2@40-23'::Invoke + } // end of method 'productGroups2@40-2'::Invoke - } // end of class 'productGroups2@40-23' + } // end of class 'productGroups2@40-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-24' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@40-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -1137,9 +1137,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@40-24'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@40-3'::builder@ IL_000d: ret - } // end of method 'productGroups2@40-24'::.ctor + } // end of method 'productGroups2@40-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [System.Core]System.Linq.IGrouping`2 _arg2) cil managed @@ -1151,16 +1151,16 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@40-24'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Quantifiers01/'productGroups2@40-3'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_0010: ret - } // end of method 'productGroups2@40-24'::Invoke + } // end of method 'productGroups2@40-3'::Invoke - } // end of class 'productGroups2@40-24' + } // end of class 'productGroups2@40-3' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productGroups2@41-26' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productGroups2@41-5' extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1172,7 +1172,7 @@ IL_0000: ldarg.0 IL_0001: call instance void [mscorlib]System.Object::.ctor() IL_0006: ret - } // end of method 'productGroups2@41-26'::.ctor + } // end of method 'productGroups2@41-5'::.ctor .method assembly hidebysig instance bool Invoke(class [Utils]Utils/Product x) cil managed @@ -1185,11 +1185,11 @@ IL_0006: ldc.i4.0 IL_0007: cgt IL_0009: ret - } // end of method 'productGroups2@41-26'::Invoke + } // end of method 'productGroups2@41-5'::Invoke - } // end of class 'productGroups2@41-26' + } // end of class 'productGroups2@41-5' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@41-25' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@41-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -1202,7 +1202,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'productGroups2@41-25'::.ctor + } // end of method 'productGroups2@41-4'::.ctor .method public strict virtual instance bool Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -1211,18 +1211,18 @@ .maxstack 8 .line 41,41 : 16,50 '' IL_0000: ldarg.1 - IL_0001: newobj instance void Linq101Quantifiers01/'productGroups2@41-26'::.ctor() - IL_0006: ldftn instance bool Linq101Quantifiers01/'productGroups2@41-26'::Invoke(class [Utils]Utils/Product) + IL_0001: newobj instance void Linq101Quantifiers01/'productGroups2@41-5'::.ctor() + IL_0006: ldftn instance bool Linq101Quantifiers01/'productGroups2@41-5'::Invoke(class [Utils]Utils/Product) IL_000c: newobj instance void class [mscorlib]System.Func`2::.ctor(object, native int) IL_0011: call bool [System.Core]System.Linq.Enumerable::All(class [mscorlib]System.Collections.Generic.IEnumerable`1, class [mscorlib]System.Func`2) IL_0016: ret - } // end of method 'productGroups2@41-25'::Invoke + } // end of method 'productGroups2@41-4'::Invoke - } // end of class 'productGroups2@41-25' + } // end of class 'productGroups2@41-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@42-27' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productGroups2@42-6' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>> { .method assembly specialname rtspecialname @@ -1235,7 +1235,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>>::.ctor() IL_0006: ret - } // end of method 'productGroups2@42-27'::.ctor + } // end of method 'productGroups2@42-6'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2> Invoke(class [System.Core]System.Linq.IGrouping`2 g) cil managed @@ -1249,16 +1249,16 @@ IL_0007: newobj instance void class [mscorlib]System.Tuple`2>::.ctor(!0, !1) IL_000c: ret - } // end of method 'productGroups2@42-27'::Invoke + } // end of method 'productGroups2@42-6'::Invoke - } // end of class 'productGroups2@42-27' + } // end of class 'productGroups2@42-6' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_words() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'words@8-36' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'words@8-6' IL_0005: ret } // end of method Linq101Quantifiers01::get_words @@ -1267,7 +1267,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld bool ''.$Linq101Quantifiers01::'iAfterE@10-6' + IL_0000: ldsfld bool ''.$Linq101Quantifiers01::iAfterE@10 IL_0005: ret } // end of method Linq101Quantifiers01::get_iAfterE @@ -1276,7 +1276,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'products@17-64' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'products@17-10' IL_0005: ret } // end of method Linq101Quantifiers01::get_products @@ -1285,7 +1285,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::'productGroups@19-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::productGroups@19 IL_0005: ret } // end of method Linq101Quantifiers01::get_productGroups @@ -1294,7 +1294,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'numbers@28-46' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'numbers@28-7' IL_0005: ret } // end of method Linq101Quantifiers01::get_numbers @@ -1303,7 +1303,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld bool ''.$Linq101Quantifiers01::'onlyOdd@30-6' + IL_0000: ldsfld bool ''.$Linq101Quantifiers01::onlyOdd@30 IL_0005: ret } // end of method Linq101Quantifiers01::get_onlyOdd @@ -1312,7 +1312,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::'productGroups2@37-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::productGroups2@37 IL_0005: ret } // end of method Linq101Quantifiers01::get_productGroups2 @@ -1361,19 +1361,19 @@ .class private abstract auto ansi sealed ''.$Linq101Quantifiers01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@8-36' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@8-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly bool 'iAfterE@10-6' + .field static assembly bool iAfterE@10 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@17-64' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@17-10' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] 'productGroups@19-6' + .field static assembly class [mscorlib]System.Tuple`2>[] productGroups@19 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@28-46' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@28-7' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly bool 'onlyOdd@30-6' + .field static assembly bool onlyOdd@30 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2>[] 'productGroups2@37-6' + .field static assembly class [mscorlib]System.Tuple`2>[] productGroups2@37 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1408,26 +1408,26 @@ IL_0028: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_002d: dup - IL_002e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'words@8-36' + IL_002e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'words@8-6' IL_0033: stloc.0 IL_0034: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0039: ldnull IL_003a: ldc.i4.0 IL_003b: ldnull - IL_003c: newobj instance void Linq101Quantifiers01/'iAfterE@12-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_003c: newobj instance void Linq101Quantifiers01/iAfterE@12::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0041: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_0046: newobj instance void Linq101Quantifiers01/'iAfterE@13-7'::.ctor() + IL_0046: newobj instance void Linq101Quantifiers01/'iAfterE@13-1'::.ctor() IL_004b: callvirt instance bool [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Exists(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0050: dup - IL_0051: stsfld bool ''.$Linq101Quantifiers01::'iAfterE@10-6' + IL_0051: stsfld bool ''.$Linq101Quantifiers01::iAfterE@10 IL_0056: stloc.1 .line 17,17 : 1,32 '' IL_0057: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_005c: dup - IL_005d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'products@17-64' + IL_005d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'products@17-10' IL_0062: stloc.2 .line 19,25 : 1,21 '' IL_0063: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1441,28 +1441,28 @@ IL_0076: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Quantifiers01::get_products() IL_007b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0080: ldloc.s V_7 - IL_0082: newobj instance void Linq101Quantifiers01/'productGroups@21-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0082: newobj instance void Linq101Quantifiers01/productGroups@21::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0087: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_008c: newobj instance void Linq101Quantifiers01/'productGroups@22-22'::.ctor() - IL_0091: newobj instance void Linq101Quantifiers01/'productGroups@22-23'::.ctor() + IL_008c: newobj instance void Linq101Quantifiers01/'productGroups@22-1'::.ctor() + IL_0091: newobj instance void Linq101Quantifiers01/'productGroups@22-2'::.ctor() IL_0096: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_009b: ldloc.s V_7 - IL_009d: newobj instance void Linq101Quantifiers01/'productGroups@22-24'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_009d: newobj instance void Linq101Quantifiers01/'productGroups@22-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00a2: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00a7: newobj instance void Linq101Quantifiers01/'productGroups@23-25'::.ctor() + IL_00a7: newobj instance void Linq101Quantifiers01/'productGroups@23-4'::.ctor() IL_00ac: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_00b1: newobj instance void Linq101Quantifiers01/'productGroups@24-27'::.ctor() + IL_00b1: newobj instance void Linq101Quantifiers01/'productGroups@24-6'::.ctor() IL_00b6: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00bb: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_00c0: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00c5: dup - IL_00c6: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::'productGroups@19-6' + IL_00c6: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::productGroups@19 IL_00cb: stloc.3 .line 28,28 : 1,35 '' IL_00cc: ldc.i4.1 @@ -1488,21 +1488,21 @@ IL_00fb: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0100: dup - IL_0101: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'numbers@28-46' + IL_0101: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Quantifiers01::'numbers@28-7' IL_0106: stloc.s numbers IL_0108: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_010d: ldnull IL_010e: ldc.i4.0 IL_010f: ldc.i4.0 - IL_0110: newobj instance void Linq101Quantifiers01/'onlyOdd@32-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0110: newobj instance void Linq101Quantifiers01/onlyOdd@32::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0115: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) - IL_011a: newobj instance void Linq101Quantifiers01/'onlyOdd@33-7'::.ctor() + IL_011a: newobj instance void Linq101Quantifiers01/'onlyOdd@33-1'::.ctor() IL_011f: callvirt instance bool [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::All(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0124: dup - IL_0125: stsfld bool ''.$Linq101Quantifiers01::'onlyOdd@30-6' + IL_0125: stsfld bool ''.$Linq101Quantifiers01::onlyOdd@30 IL_012a: stloc.s onlyOdd .line 37,43 : 1,21 '' IL_012c: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1516,28 +1516,28 @@ IL_013f: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Quantifiers01::get_products() IL_0144: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0149: ldloc.s V_8 - IL_014b: newobj instance void Linq101Quantifiers01/'productGroups2@39-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_014b: newobj instance void Linq101Quantifiers01/productGroups2@39::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0150: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0155: newobj instance void Linq101Quantifiers01/'productGroups2@40-22'::.ctor() - IL_015a: newobj instance void Linq101Quantifiers01/'productGroups2@40-23'::.ctor() + IL_0155: newobj instance void Linq101Quantifiers01/'productGroups2@40-1'::.ctor() + IL_015a: newobj instance void Linq101Quantifiers01/'productGroups2@40-2'::.ctor() IL_015f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,!!3> [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::GroupValBy(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0164: ldloc.s V_8 - IL_0166: newobj instance void Linq101Quantifiers01/'productGroups2@40-24'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0166: newobj instance void Linq101Quantifiers01/'productGroups2@40-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_016b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable,class [System.Core]System.Linq.IGrouping`2,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0170: newobj instance void Linq101Quantifiers01/'productGroups2@41-25'::.ctor() + IL_0170: newobj instance void Linq101Quantifiers01/'productGroups2@41-4'::.ctor() IL_0175: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_017a: newobj instance void Linq101Quantifiers01/'productGroups2@42-27'::.ctor() + IL_017a: newobj instance void Linq101Quantifiers01/'productGroups2@42-6'::.ctor() IL_017f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0184: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2>,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0189: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_018e: dup - IL_018f: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::'productGroups2@37-6' + IL_018f: stsfld class [mscorlib]System.Tuple`2>[] ''.$Linq101Quantifiers01::productGroups2@37 IL_0194: stloc.s productGroups2 IL_0196: ret } // end of method $Linq101Quantifiers01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl index c48df9a0f4c..298eb5e5df6 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Select01.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000008B0 Length: 0x00000000 } .module Linq101Select01.exe -// MVID: {5BF2D3C6-6057-8F80-A745-0383C6D3F25B} +// MVID: {5C6C932B-0F15-430A-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007A0000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'numsPlusOne@12-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'numsPlusOne@12-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -76,7 +76,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'numsPlusOne@12-7'::.ctor + } // end of method 'numsPlusOne@12-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(int32 _arg1) cil managed @@ -93,11 +93,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'numsPlusOne@12-7'::Invoke + } // end of method 'numsPlusOne@12-1'::Invoke - } // end of class 'numsPlusOne@12-7' + } // end of class 'numsPlusOne@12-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'numsPlusOne@13-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname numsPlusOne@13 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -122,17 +122,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_0009: stfld int32 Linq101Select01/numsPlusOne@13::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101Select01/'numsPlusOne@13-6'::current + IL_0010: stfld int32 Linq101Select01/numsPlusOne@13::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'numsPlusOne@13-6'::.ctor + } // end of method numsPlusOne@13::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -142,7 +142,7 @@ .locals init ([0] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_0001: ldfld int32 Linq101Select01/numsPlusOne@13::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -173,34 +173,34 @@ IL_002a: nop .line 13,13 : 9,23 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101Select01/'numsPlusOne@12-7'::.ctor() + IL_002c: newobj instance void Linq101Select01/'numsPlusOne@12-1'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbers() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,int32>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_0047: stfld int32 Linq101Select01/numsPlusOne@13::pc .line 13,13 : 9,23 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_007a IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_0067: stfld int32 Linq101Select01/numsPlusOne@13::pc .line 13,13 : 17,22 '' IL_006c: ldarg.0 IL_006d: ldloc.0 IL_006e: ldc.i4.1 IL_006f: add - IL_0070: stfld int32 Linq101Select01/'numsPlusOne@13-6'::current + IL_0070: stfld int32 Linq101Select01/numsPlusOne@13::current IL_0075: ldc.i4.1 IL_0076: ret @@ -210,24 +210,24 @@ IL_007a: ldarg.0 IL_007b: ldc.i4.3 - IL_007c: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_007c: stfld int32 Linq101Select01/numsPlusOne@13::pc .line 13,13 : 9,23 '' IL_0081: ldarg.0 - IL_0082: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' + IL_0082: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' IL_0087: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_008c: nop IL_008d: ldarg.0 IL_008e: ldnull - IL_008f: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' + IL_008f: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' IL_0094: ldarg.0 IL_0095: ldc.i4.3 - IL_0096: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_0096: stfld int32 Linq101Select01/numsPlusOne@13::pc IL_009b: ldarg.0 IL_009c: ldc.i4.0 - IL_009d: stfld int32 Linq101Select01/'numsPlusOne@13-6'::current + IL_009d: stfld int32 Linq101Select01/numsPlusOne@13::current IL_00a2: ldc.i4.0 IL_00a3: ret - } // end of method 'numsPlusOne@13-6'::GenerateNext + } // end of method numsPlusOne@13::GenerateNext .method public strict virtual instance void Close() cil managed @@ -239,7 +239,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_0001: ldfld int32 Linq101Select01/numsPlusOne@13::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -255,7 +255,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_001b: ldfld int32 Linq101Select01/numsPlusOne@13::pc IL_0020: switch ( IL_0037, IL_0039, @@ -293,19 +293,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_004f: stfld int32 Linq101Select01/numsPlusOne@13::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'numsPlusOne@13-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/numsPlusOne@13::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_0063: stfld int32 Linq101Select01/numsPlusOne@13::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101Select01/'numsPlusOne@13-6'::current + IL_006a: stfld int32 Linq101Select01/numsPlusOne@13::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -345,7 +345,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'numsPlusOne@13-6'::Close + } // end of method numsPlusOne@13::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -354,7 +354,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::pc + IL_0001: ldfld int32 Linq101Select01/numsPlusOne@13::pc IL_0006: switch ( IL_001d, IL_001f, @@ -396,7 +396,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'numsPlusOne@13-6'::get_CheckClose + } // end of method numsPlusOne@13::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -406,9 +406,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'numsPlusOne@13-6'::current + IL_0001: ldfld int32 Linq101Select01/numsPlusOne@13::current IL_0006: ret - } // end of method 'numsPlusOne@13-6'::get_LastGenerated + } // end of method numsPlusOne@13::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -420,15 +420,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101Select01/'numsPlusOne@13-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0003: newobj instance void Linq101Select01/numsPlusOne@13::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0008: ret - } // end of method 'numsPlusOne@13-6'::GetFreshEnumerator + } // end of method numsPlusOne@13::GetFreshEnumerator - } // end of class 'numsPlusOne@13-6' + } // end of class numsPlusOne@13 - .class auto ansi serializable sealed nested assembly beforefieldinit 'productNames@21-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productNames@21-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -441,7 +441,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'productNames@21-7'::.ctor + } // end of method 'productNames@21-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -457,11 +457,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'productNames@21-7'::Invoke + } // end of method 'productNames@21-1'::Invoke - } // end of class 'productNames@21-7' + } // end of class 'productNames@21-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productNames@22-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname productNames@22 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -486,17 +486,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/'productNames@22-6'::pc + IL_0009: stfld int32 Linq101Select01/productNames@22::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Select01/'productNames@22-6'::current + IL_0010: stfld string Linq101Select01/productNames@22::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'productNames@22-6'::.ctor + } // end of method productNames@22::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -506,7 +506,7 @@ .locals init ([0] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'productNames@22-6'::pc + IL_0001: ldfld int32 Linq101Select01/productNames@22::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -537,33 +537,33 @@ IL_002a: nop .line 22,22 : 9,31 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101Select01/'productNames@21-7'::.ctor() + IL_002c: newobj instance void Linq101Select01/'productNames@21-1'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_products() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Product>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101Select01/'productNames@22-6'::pc + IL_0047: stfld int32 Linq101Select01/productNames@22::pc .line 22,22 : 9,31 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_007d IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101Select01/'productNames@22-6'::pc + IL_0067: stfld int32 Linq101Select01/productNames@22::pc .line 22,22 : 17,30 '' IL_006c: ldarg.0 IL_006d: ldloc.0 IL_006e: callvirt instance string [Utils]Utils/Product::get_ProductName() - IL_0073: stfld string Linq101Select01/'productNames@22-6'::current + IL_0073: stfld string Linq101Select01/productNames@22::current IL_0078: ldc.i4.1 IL_0079: ret @@ -573,24 +573,24 @@ IL_007d: ldarg.0 IL_007e: ldc.i4.3 - IL_007f: stfld int32 Linq101Select01/'productNames@22-6'::pc + IL_007f: stfld int32 Linq101Select01/productNames@22::pc .line 22,22 : 9,31 '' IL_0084: ldarg.0 - IL_0085: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' + IL_0085: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' IL_008a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_008f: nop IL_0090: ldarg.0 IL_0091: ldnull - IL_0092: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' + IL_0092: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' IL_0097: ldarg.0 IL_0098: ldc.i4.3 - IL_0099: stfld int32 Linq101Select01/'productNames@22-6'::pc + IL_0099: stfld int32 Linq101Select01/productNames@22::pc IL_009e: ldarg.0 IL_009f: ldnull - IL_00a0: stfld string Linq101Select01/'productNames@22-6'::current + IL_00a0: stfld string Linq101Select01/productNames@22::current IL_00a5: ldc.i4.0 IL_00a6: ret - } // end of method 'productNames@22-6'::GenerateNext + } // end of method productNames@22::GenerateNext .method public strict virtual instance void Close() cil managed @@ -602,7 +602,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'productNames@22-6'::pc + IL_0001: ldfld int32 Linq101Select01/productNames@22::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -618,7 +618,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/'productNames@22-6'::pc + IL_001b: ldfld int32 Linq101Select01/productNames@22::pc IL_0020: switch ( IL_0037, IL_0039, @@ -656,19 +656,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/'productNames@22-6'::pc + IL_004f: stfld int32 Linq101Select01/productNames@22::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productNames@22-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productNames@22::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/'productNames@22-6'::pc + IL_0063: stfld int32 Linq101Select01/productNames@22::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Select01/'productNames@22-6'::current + IL_006a: stfld string Linq101Select01/productNames@22::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -708,7 +708,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'productNames@22-6'::Close + } // end of method productNames@22::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -717,7 +717,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'productNames@22-6'::pc + IL_0001: ldfld int32 Linq101Select01/productNames@22::pc IL_0006: switch ( IL_001d, IL_001f, @@ -759,7 +759,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'productNames@22-6'::get_CheckClose + } // end of method productNames@22::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -769,9 +769,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Select01/'productNames@22-6'::current + IL_0001: ldfld string Linq101Select01/productNames@22::current IL_0006: ret - } // end of method 'productNames@22-6'::get_LastGenerated + } // end of method productNames@22::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -783,15 +783,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/'productNames@22-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Select01/productNames@22::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'productNames@22-6'::GetFreshEnumerator + } // end of method productNames@22::GetFreshEnumerator - } // end of class 'productNames@22-6' + } // end of class productNames@22 - .class auto ansi serializable sealed nested assembly beforefieldinit 'textNums@29-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'textNums@29-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -804,7 +804,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'textNums@29-7'::.ctor + } // end of method 'textNums@29-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(int32 _arg1) cil managed @@ -820,11 +820,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'textNums@29-7'::Invoke + } // end of method 'textNums@29-1'::Invoke - } // end of class 'textNums@29-7' + } // end of class 'textNums@29-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'textNums@30-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname textNums@30 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -849,17 +849,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/'textNums@30-6'::pc + IL_0009: stfld int32 Linq101Select01/textNums@30::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Select01/'textNums@30-6'::current + IL_0010: stfld string Linq101Select01/textNums@30::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'textNums@30-6'::.ctor + } // end of method textNums@30::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -869,7 +869,7 @@ .locals init ([0] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'textNums@30-6'::pc + IL_0001: ldfld int32 Linq101Select01/textNums@30::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -900,34 +900,34 @@ IL_002a: nop .line 30,30 : 9,29 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101Select01/'textNums@29-7'::.ctor() + IL_002c: newobj instance void Linq101Select01/'textNums@29-1'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbers() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,int32>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101Select01/'textNums@30-6'::pc + IL_0047: stfld int32 Linq101Select01/textNums@30::pc .line 30,30 : 9,29 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_0082 IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101Select01/'textNums@30-6'::pc + IL_0067: stfld int32 Linq101Select01/textNums@30::pc .line 30,30 : 17,28 '' IL_006c: ldarg.0 IL_006d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_strings() IL_0072: ldloc.0 IL_0073: callvirt instance !0 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::get_Item(int32) - IL_0078: stfld string Linq101Select01/'textNums@30-6'::current + IL_0078: stfld string Linq101Select01/textNums@30::current IL_007d: ldc.i4.1 IL_007e: ret @@ -937,24 +937,24 @@ IL_0082: ldarg.0 IL_0083: ldc.i4.3 - IL_0084: stfld int32 Linq101Select01/'textNums@30-6'::pc + IL_0084: stfld int32 Linq101Select01/textNums@30::pc .line 30,30 : 9,29 '' IL_0089: ldarg.0 - IL_008a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' + IL_008a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' IL_008f: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0094: nop IL_0095: ldarg.0 IL_0096: ldnull - IL_0097: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' + IL_0097: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' IL_009c: ldarg.0 IL_009d: ldc.i4.3 - IL_009e: stfld int32 Linq101Select01/'textNums@30-6'::pc + IL_009e: stfld int32 Linq101Select01/textNums@30::pc IL_00a3: ldarg.0 IL_00a4: ldnull - IL_00a5: stfld string Linq101Select01/'textNums@30-6'::current + IL_00a5: stfld string Linq101Select01/textNums@30::current IL_00aa: ldc.i4.0 IL_00ab: ret - } // end of method 'textNums@30-6'::GenerateNext + } // end of method textNums@30::GenerateNext .method public strict virtual instance void Close() cil managed @@ -966,7 +966,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'textNums@30-6'::pc + IL_0001: ldfld int32 Linq101Select01/textNums@30::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -982,7 +982,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/'textNums@30-6'::pc + IL_001b: ldfld int32 Linq101Select01/textNums@30::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1020,19 +1020,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/'textNums@30-6'::pc + IL_004f: stfld int32 Linq101Select01/textNums@30::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'textNums@30-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/textNums@30::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/'textNums@30-6'::pc + IL_0063: stfld int32 Linq101Select01/textNums@30::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Select01/'textNums@30-6'::current + IL_006a: stfld string Linq101Select01/textNums@30::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1072,7 +1072,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'textNums@30-6'::Close + } // end of method textNums@30::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1081,7 +1081,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'textNums@30-6'::pc + IL_0001: ldfld int32 Linq101Select01/textNums@30::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1123,7 +1123,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'textNums@30-6'::get_CheckClose + } // end of method textNums@30::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -1133,9 +1133,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Select01/'textNums@30-6'::current + IL_0001: ldfld string Linq101Select01/textNums@30::current IL_0006: ret - } // end of method 'textNums@30-6'::get_LastGenerated + } // end of method textNums@30::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1147,15 +1147,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/'textNums@30-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Select01/textNums@30::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'textNums@30-6'::GetFreshEnumerator + } // end of method textNums@30::GetFreshEnumerator - } // end of class 'textNums@30-6' + } // end of class textNums@30 - .class auto ansi serializable sealed nested assembly beforefieldinit 'upperLowerWords@38-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'upperLowerWords@38-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -1168,7 +1168,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'upperLowerWords@38-7'::.ctor + } // end of method 'upperLowerWords@38-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(string _arg1) cil managed @@ -1184,11 +1184,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'upperLowerWords@38-7'::Invoke + } // end of method 'upperLowerWords@38-1'::Invoke - } // end of class 'upperLowerWords@38-7' + } // end of class 'upperLowerWords@38-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'upperLowerWords@39-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname upperLowerWords@39 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1> { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1213,17 +1213,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_0009: stfld int32 Linq101Select01/upperLowerWords@39::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current + IL_0010: stfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1>::.ctor() IL_001b: ret - } // end of method 'upperLowerWords@39-6'::.ctor + } // end of method upperLowerWords@39::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1>& next) cil managed @@ -1233,7 +1233,7 @@ .locals init ([0] string w) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_0001: ldfld int32 Linq101Select01/upperLowerWords@39::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1264,28 +1264,28 @@ IL_002d: nop .line 39,39 : 8,41 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101Select01/'upperLowerWords@38-7'::.ctor() + IL_002f: newobj instance void Linq101Select01/'upperLowerWords@38-1'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_words() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,string>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_004a: stfld int32 Linq101Select01/upperLowerWords@39::pc .line 39,39 : 8,41 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_008b IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_006a: stfld int32 Linq101Select01/upperLowerWords@39::pc .line 39,39 : 16,40 '' IL_006f: ldarg.0 IL_0070: ldloc.0 @@ -1294,7 +1294,7 @@ IL_0077: callvirt instance string [mscorlib]System.String::ToLower() IL_007c: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) - IL_0081: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current + IL_0081: stfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current IL_0086: ldc.i4.1 IL_0087: ret @@ -1304,24 +1304,24 @@ IL_008b: ldarg.0 IL_008c: ldc.i4.3 - IL_008d: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_008d: stfld int32 Linq101Select01/upperLowerWords@39::pc .line 39,39 : 8,41 '' IL_0092: ldarg.0 - IL_0093: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' + IL_0093: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' IL_0098: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_009d: nop IL_009e: ldarg.0 IL_009f: ldnull - IL_00a0: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' + IL_00a0: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' IL_00a5: ldarg.0 IL_00a6: ldc.i4.3 - IL_00a7: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_00a7: stfld int32 Linq101Select01/upperLowerWords@39::pc IL_00ac: ldarg.0 IL_00ad: ldnull - IL_00ae: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current + IL_00ae: stfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current IL_00b3: ldc.i4.0 IL_00b4: ret - } // end of method 'upperLowerWords@39-6'::GenerateNext + } // end of method upperLowerWords@39::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1333,7 +1333,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_0001: ldfld int32 Linq101Select01/upperLowerWords@39::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1349,7 +1349,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_001b: ldfld int32 Linq101Select01/upperLowerWords@39::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1387,19 +1387,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_004f: stfld int32 Linq101Select01/upperLowerWords@39::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'upperLowerWords@39-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/upperLowerWords@39::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_0063: stfld int32 Linq101Select01/upperLowerWords@39::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current + IL_006a: stfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1439,7 +1439,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'upperLowerWords@39-6'::Close + } // end of method upperLowerWords@39::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1448,7 +1448,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'upperLowerWords@39-6'::pc + IL_0001: ldfld int32 Linq101Select01/upperLowerWords@39::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1490,7 +1490,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'upperLowerWords@39-6'::get_CheckClose + } // end of method upperLowerWords@39::get_CheckClose .method public strict virtual instance class [mscorlib]System.Tuple`2 get_LastGenerated() cil managed @@ -1500,9 +1500,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [mscorlib]System.Tuple`2 Linq101Select01/'upperLowerWords@39-6'::current + IL_0001: ldfld class [mscorlib]System.Tuple`2 Linq101Select01/upperLowerWords@39::current IL_0006: ret - } // end of method 'upperLowerWords@39-6'::get_LastGenerated + } // end of method upperLowerWords@39::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1> GetFreshEnumerator() cil managed @@ -1514,15 +1514,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/'upperLowerWords@39-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`2) + IL_0003: newobj instance void Linq101Select01/upperLowerWords@39::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`2) IL_0008: ret - } // end of method 'upperLowerWords@39-6'::GetFreshEnumerator + } // end of method upperLowerWords@39::GetFreshEnumerator - } // end of class 'upperLowerWords@39-6' + } // end of class upperLowerWords@39 - .class auto ansi serializable sealed nested assembly beforefieldinit 'digitOddEvens@45-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'digitOddEvens@45-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -1535,7 +1535,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'digitOddEvens@45-7'::.ctor + } // end of method 'digitOddEvens@45-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(int32 _arg1) cil managed @@ -1551,11 +1551,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'digitOddEvens@45-7'::Invoke + } // end of method 'digitOddEvens@45-1'::Invoke - } // end of class 'digitOddEvens@45-7' + } // end of class 'digitOddEvens@45-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'digitOddEvens@46-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname digitOddEvens@46 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1> { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1580,17 +1580,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_0009: stfld int32 Linq101Select01/digitOddEvens@46::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current + IL_0010: stfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1>::.ctor() IL_001b: ret - } // end of method 'digitOddEvens@46-6'::.ctor + } // end of method digitOddEvens@46::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1>& next) cil managed @@ -1600,7 +1600,7 @@ .locals init ([0] int32 n) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_0001: ldfld int32 Linq101Select01/digitOddEvens@46::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1631,28 +1631,28 @@ IL_002d: nop .line 46,46 : 9,42 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101Select01/'digitOddEvens@45-7'::.ctor() + IL_002f: newobj instance void Linq101Select01/'digitOddEvens@45-1'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbers() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,int32>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_004a: stfld int32 Linq101Select01/digitOddEvens@46::pc .line 46,46 : 9,42 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_0090 IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_006a: stfld int32 Linq101Select01/digitOddEvens@46::pc .line 46,46 : 17,41 '' IL_006f: ldarg.0 IL_0070: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_strings() @@ -1665,7 +1665,7 @@ IL_007f: ceq IL_0081: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) - IL_0086: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current + IL_0086: stfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current IL_008b: ldc.i4.1 IL_008c: ret @@ -1675,24 +1675,24 @@ IL_0090: ldarg.0 IL_0091: ldc.i4.3 - IL_0092: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_0092: stfld int32 Linq101Select01/digitOddEvens@46::pc .line 46,46 : 9,42 '' IL_0097: ldarg.0 - IL_0098: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' + IL_0098: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' IL_009d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_00a2: nop IL_00a3: ldarg.0 IL_00a4: ldnull - IL_00a5: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' + IL_00a5: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' IL_00aa: ldarg.0 IL_00ab: ldc.i4.3 - IL_00ac: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_00ac: stfld int32 Linq101Select01/digitOddEvens@46::pc IL_00b1: ldarg.0 IL_00b2: ldnull - IL_00b3: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current + IL_00b3: stfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current IL_00b8: ldc.i4.0 IL_00b9: ret - } // end of method 'digitOddEvens@46-6'::GenerateNext + } // end of method digitOddEvens@46::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1704,7 +1704,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_0001: ldfld int32 Linq101Select01/digitOddEvens@46::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1720,7 +1720,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_001b: ldfld int32 Linq101Select01/digitOddEvens@46::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1758,19 +1758,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_004f: stfld int32 Linq101Select01/digitOddEvens@46::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'digitOddEvens@46-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/digitOddEvens@46::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_0063: stfld int32 Linq101Select01/digitOddEvens@46::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current + IL_006a: stfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1810,7 +1810,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'digitOddEvens@46-6'::Close + } // end of method digitOddEvens@46::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1819,7 +1819,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'digitOddEvens@46-6'::pc + IL_0001: ldfld int32 Linq101Select01/digitOddEvens@46::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1861,7 +1861,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'digitOddEvens@46-6'::get_CheckClose + } // end of method digitOddEvens@46::get_CheckClose .method public strict virtual instance class [mscorlib]System.Tuple`2 get_LastGenerated() cil managed @@ -1871,9 +1871,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [mscorlib]System.Tuple`2 Linq101Select01/'digitOddEvens@46-6'::current + IL_0001: ldfld class [mscorlib]System.Tuple`2 Linq101Select01/digitOddEvens@46::current IL_0006: ret - } // end of method 'digitOddEvens@46-6'::get_LastGenerated + } // end of method digitOddEvens@46::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1> GetFreshEnumerator() cil managed @@ -1885,15 +1885,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/'digitOddEvens@46-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`2) + IL_0003: newobj instance void Linq101Select01/digitOddEvens@46::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`2) IL_0008: ret - } // end of method 'digitOddEvens@46-6'::GetFreshEnumerator + } // end of method digitOddEvens@46::GetFreshEnumerator - } // end of class 'digitOddEvens@46-6' + } // end of class digitOddEvens@46 - .class auto ansi serializable sealed nested assembly beforefieldinit 'productInfos@52-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productInfos@52-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -1906,7 +1906,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'productInfos@52-7'::.ctor + } // end of method 'productInfos@52-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -1922,11 +1922,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'productInfos@52-7'::Invoke + } // end of method 'productInfos@52-1'::Invoke - } // end of class 'productInfos@52-7' + } // end of class 'productInfos@52-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productInfos@53-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname productInfos@53 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1> { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1951,17 +1951,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_0009: stfld int32 Linq101Select01/productInfos@53::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current + IL_0010: stfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1>::.ctor() IL_001b: ret - } // end of method 'productInfos@53-6'::.ctor + } // end of method productInfos@53::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1>& next) cil managed @@ -1971,7 +1971,7 @@ .locals init ([0] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_0001: ldfld int32 Linq101Select01/productInfos@53::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -2002,28 +2002,28 @@ IL_002d: nop .line 53,53 : 9,56 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101Select01/'productInfos@52-7'::.ctor() + IL_002f: newobj instance void Linq101Select01/'productInfos@52-1'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_products() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Product>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_004a: stfld int32 Linq101Select01/productInfos@53::pc .line 53,53 : 9,56 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_0091 IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_006a: stfld int32 Linq101Select01/productInfos@53::pc .line 53,53 : 17,55 '' IL_006f: ldarg.0 IL_0070: ldloc.0 @@ -2035,7 +2035,7 @@ IL_0082: newobj instance void class [mscorlib]System.Tuple`3::.ctor(!0, !1, !2) - IL_0087: stfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current + IL_0087: stfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current IL_008c: ldc.i4.1 IL_008d: ret @@ -2045,24 +2045,24 @@ IL_0091: ldarg.0 IL_0092: ldc.i4.3 - IL_0093: stfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_0093: stfld int32 Linq101Select01/productInfos@53::pc .line 53,53 : 9,56 '' IL_0098: ldarg.0 - IL_0099: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' + IL_0099: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' IL_009e: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_00a3: nop IL_00a4: ldarg.0 IL_00a5: ldnull - IL_00a6: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' + IL_00a6: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' IL_00ab: ldarg.0 IL_00ac: ldc.i4.3 - IL_00ad: stfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_00ad: stfld int32 Linq101Select01/productInfos@53::pc IL_00b2: ldarg.0 IL_00b3: ldnull - IL_00b4: stfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current + IL_00b4: stfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current IL_00b9: ldc.i4.0 IL_00ba: ret - } // end of method 'productInfos@53-6'::GenerateNext + } // end of method productInfos@53::GenerateNext .method public strict virtual instance void Close() cil managed @@ -2074,7 +2074,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_0001: ldfld int32 Linq101Select01/productInfos@53::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -2090,7 +2090,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_001b: ldfld int32 Linq101Select01/productInfos@53::pc IL_0020: switch ( IL_0037, IL_0039, @@ -2128,19 +2128,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_004f: stfld int32 Linq101Select01/productInfos@53::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/'productInfos@53-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Select01/productInfos@53::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_0063: stfld int32 Linq101Select01/productInfos@53::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current + IL_006a: stfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -2180,7 +2180,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'productInfos@53-6'::Close + } // end of method productInfos@53::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -2189,7 +2189,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Select01/'productInfos@53-6'::pc + IL_0001: ldfld int32 Linq101Select01/productInfos@53::pc IL_0006: switch ( IL_001d, IL_001f, @@ -2231,7 +2231,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'productInfos@53-6'::get_CheckClose + } // end of method productInfos@53::get_CheckClose .method public strict virtual instance class [mscorlib]System.Tuple`3 get_LastGenerated() cil managed @@ -2241,9 +2241,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [mscorlib]System.Tuple`3 Linq101Select01/'productInfos@53-6'::current + IL_0001: ldfld class [mscorlib]System.Tuple`3 Linq101Select01/productInfos@53::current IL_0006: ret - } // end of method 'productInfos@53-6'::get_LastGenerated + } // end of method productInfos@53::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1> GetFreshEnumerator() cil managed @@ -2255,15 +2255,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Select01/'productInfos@53-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`3) + IL_0003: newobj instance void Linq101Select01/productInfos@53::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`3) IL_0008: ret - } // end of method 'productInfos@53-6'::GetFreshEnumerator + } // end of method productInfos@53::GetFreshEnumerator - } // end of class 'productInfos@53-6' + } // end of class productInfos@53 - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@60-18' + .class auto ansi serializable sealed nested assembly beforefieldinit lowNums@60 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2281,9 +2281,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'lowNums@60-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/lowNums@60::builder@ IL_000d: ret - } // end of method 'lowNums@60-18'::.ctor + } // end of method lowNums@60::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(int32 _arg1) cil managed @@ -2296,16 +2296,16 @@ IL_0001: stloc.0 .line 61,61 : 9,22 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'lowNums@60-18'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/lowNums@60::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'lowNums@60-18'::Invoke + } // end of method lowNums@60::Invoke - } // end of class 'lowNums@60-18' + } // end of class lowNums@60 - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@61-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@61-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2318,7 +2318,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'lowNums@61-19'::.ctor + } // end of method 'lowNums@61-1'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -2330,11 +2330,11 @@ IL_0001: ldc.i4.5 IL_0002: clt IL_0004: ret - } // end of method 'lowNums@61-19'::Invoke + } // end of method 'lowNums@61-1'::Invoke - } // end of class 'lowNums@61-19' + } // end of class 'lowNums@61-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@62-20' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@62-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -2347,7 +2347,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'lowNums@62-20'::.ctor + } // end of method 'lowNums@62-2'::.ctor .method public strict virtual instance string Invoke(int32 n) cil managed @@ -2360,11 +2360,11 @@ IL_0006: tail. IL_0008: callvirt instance !0 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::get_Item(int32) IL_000d: ret - } // end of method 'lowNums@62-20'::Invoke + } // end of method 'lowNums@62-2'::Invoke - } // end of class 'lowNums@62-20' + } // end of class 'lowNums@62-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@73-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@73-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2384,12 +2384,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@73-13'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@73-1'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld int32 Linq101Select01/'pairs@73-13'::a + IL_000f: stfld int32 Linq101Select01/'pairs@73-1'::a IL_0014: ret - } // end of method 'pairs@73-13'::.ctor + } // end of method 'pairs@73-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(int32 _arg2) cil managed @@ -2402,20 +2402,20 @@ IL_0001: stloc.0 .line 74,74 : 9,22 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@73-13'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@73-1'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld int32 Linq101Select01/'pairs@73-13'::a + IL_0009: ldfld int32 Linq101Select01/'pairs@73-1'::a IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'pairs@73-13'::Invoke + } // end of method 'pairs@73-1'::Invoke - } // end of class 'pairs@73-13' + } // end of class 'pairs@73-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@72-12' + .class auto ansi serializable sealed nested assembly beforefieldinit pairs@72 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2433,9 +2433,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@72-12'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/pairs@72::builder@ IL_000d: ret - } // end of method 'pairs@72-12'::.ctor + } // end of method pairs@72::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(int32 _arg1) cil managed @@ -2448,25 +2448,25 @@ IL_0001: stloc.0 .line 73,73 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@72-12'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/pairs@72::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@72-12'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/pairs@72::builder@ IL_000e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbersB() IL_0013: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0018: ldarg.0 - IL_0019: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'pairs@72-12'::builder@ + IL_0019: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/pairs@72::builder@ IL_001e: ldloc.0 - IL_001f: newobj instance void Linq101Select01/'pairs@73-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - int32) + IL_001f: newobj instance void Linq101Select01/'pairs@73-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + int32) IL_0024: tail. IL_0026: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002b: ret - } // end of method 'pairs@72-12'::Invoke + } // end of method pairs@72::Invoke - } // end of class 'pairs@72-12' + } // end of class pairs@72 - .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@74-14' + .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@74-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -2479,7 +2479,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'pairs@74-14'::.ctor + } // end of method 'pairs@74-2'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2500,11 +2500,11 @@ IL_000f: ldloc.1 IL_0010: clt IL_0012: ret - } // end of method 'pairs@74-14'::Invoke + } // end of method 'pairs@74-2'::Invoke - } // end of class 'pairs@74-14' + } // end of class 'pairs@74-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@75-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'pairs@75-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -2517,7 +2517,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'pairs@75-15'::.ctor + } // end of method 'pairs@75-3'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2539,11 +2539,11 @@ IL_0010: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0015: ret - } // end of method 'pairs@75-15'::Invoke + } // end of method 'pairs@75-3'::Invoke - } // end of class 'pairs@75-15' + } // end of class 'pairs@75-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@83-21' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@83-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2563,12 +2563,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@83-21'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@83-3'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders@83-21'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders@83-3'::c IL_0014: ret - } // end of method 'orders@83-21'::.ctor + } // end of method 'orders@83-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -2581,20 +2581,20 @@ IL_0001: stloc.0 .line 84,84 : 9,34 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@83-21'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@83-3'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders@83-21'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders@83-3'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'orders@83-21'::Invoke + } // end of method 'orders@83-3'::Invoke - } // end of class 'orders@83-21' + } // end of class 'orders@83-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@82-20' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@82-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2612,9 +2612,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-20'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-2'::builder@ IL_000d: ret - } // end of method 'orders@82-20'::.ctor + } // end of method 'orders@82-2'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -2627,26 +2627,26 @@ IL_0001: stloc.0 .line 83,83 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-20'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-2'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-20'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-2'::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-20'::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders@82-2'::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Select01/'orders@83-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Select01/'orders@83-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'orders@82-20'::Invoke + } // end of method 'orders@82-2'::Invoke - } // end of class 'orders@82-20' + } // end of class 'orders@82-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@84-22' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@84-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -2659,7 +2659,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'orders@84-22'::.ctor + } // end of method 'orders@84-4'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2691,11 +2691,11 @@ IL_0022: call bool [mscorlib]System.Decimal::op_LessThan(valuetype [mscorlib]System.Decimal, valuetype [mscorlib]System.Decimal) IL_0027: ret - } // end of method 'orders@84-22'::Invoke + } // end of method 'orders@84-4'::Invoke - } // end of class 'orders@84-22' + } // end of class 'orders@84-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@85-23' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders@85-5' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -2708,7 +2708,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'orders@85-23'::.ctor + } // end of method 'orders@85-5'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2735,11 +2735,11 @@ !1, !2) IL_0025: ret - } // end of method 'orders@85-23'::Invoke + } // end of method 'orders@85-5'::Invoke - } // end of class 'orders@85-23' + } // end of class 'orders@85-5' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@92-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@92-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2759,12 +2759,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@92-13'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@92-1'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders2@92-13'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders2@92-1'::c IL_0014: ret - } // end of method 'orders2@92-13'::.ctor + } // end of method 'orders2@92-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -2777,20 +2777,20 @@ IL_0001: stloc.0 .line 93,93 : 9,51 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@92-13'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@92-1'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders2@92-13'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders2@92-1'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'orders2@92-13'::Invoke + } // end of method 'orders2@92-1'::Invoke - } // end of class 'orders2@92-13' + } // end of class 'orders2@92-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@91-12' + .class auto ansi serializable sealed nested assembly beforefieldinit orders2@91 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2808,9 +2808,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@91-12'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders2@91::builder@ IL_000d: ret - } // end of method 'orders2@91-12'::.ctor + } // end of method orders2@91::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -2823,26 +2823,26 @@ IL_0001: stloc.0 .line 92,92 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@91-12'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders2@91::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@91-12'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders2@91::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders2@91-12'::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders2@91::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Select01/'orders2@92-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Select01/'orders2@92-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'orders2@91-12'::Invoke + } // end of method orders2@91::Invoke - } // end of class 'orders2@91-12' + } // end of class orders2@91 - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@93-14' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@93-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -2855,7 +2855,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'orders2@93-14'::.ctor + } // end of method 'orders2@93-2'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2884,11 +2884,11 @@ IL_0022: call bool [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/HashCompare::GenericGreaterOrEqualIntrinsic(!!0, !!0) IL_0027: ret - } // end of method 'orders2@93-14'::Invoke + } // end of method 'orders2@93-2'::Invoke - } // end of class 'orders2@93-14' + } // end of class 'orders2@93-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@94-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders2@94-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -2901,7 +2901,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'orders2@94-15'::.ctor + } // end of method 'orders2@94-3'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -2928,11 +2928,11 @@ !1, !2) IL_0025: ret - } // end of method 'orders2@94-15'::Invoke + } // end of method 'orders2@94-3'::Invoke - } // end of class 'orders2@94-15' + } // end of class 'orders2@94-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@101-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@101-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -2952,12 +2952,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@101-13'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@101-1'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders3@101-13'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders3@101-1'::c IL_0014: ret - } // end of method 'orders3@101-13'::.ctor + } // end of method 'orders3@101-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg2) cil managed @@ -2970,20 +2970,20 @@ IL_0001: stloc.0 .line 102,102 : 9,35 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@101-13'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@101-1'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders3@101-13'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders3@101-1'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'orders3@101-13'::Invoke + } // end of method 'orders3@101-1'::Invoke - } // end of class 'orders3@101-13' + } // end of class 'orders3@101-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@100-12' + .class auto ansi serializable sealed nested assembly beforefieldinit orders3@100 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3001,9 +3001,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@100-12'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders3@100::builder@ IL_000d: ret - } // end of method 'orders3@100-12'::.ctor + } // end of method orders3@100::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -3016,26 +3016,26 @@ IL_0001: stloc.0 .line 101,101 : 9,29 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@100-12'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders3@100::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@100-12'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders3@100::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders3@100-12'::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders3@100::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Select01/'orders3@101-13'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Select01/'orders3@101-1'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'orders3@100-12'::Invoke + } // end of method orders3@100::Invoke - } // end of class 'orders3@100-12' + } // end of class orders3@100 - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@102-14' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@102-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -3048,7 +3048,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'orders3@102-14'::.ctor + } // end of method 'orders3@102-2'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -3080,11 +3080,11 @@ IL_0022: call bool [mscorlib]System.Decimal::op_GreaterThanOrEqual(valuetype [mscorlib]System.Decimal, valuetype [mscorlib]System.Decimal) IL_0027: ret - } // end of method 'orders3@102-14'::Invoke + } // end of method 'orders3@102-2'::Invoke - } // end of class 'orders3@102-14' + } // end of class 'orders3@102-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@103-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders3@103-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3> { .method assembly specialname rtspecialname @@ -3097,7 +3097,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`3>::.ctor() IL_0006: ret - } // end of method 'orders3@103-15'::.ctor + } // end of method 'orders3@103-3'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`3 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -3124,11 +3124,11 @@ !1, !2) IL_0025: ret - } // end of method 'orders3@103-15'::Invoke + } // end of method 'orders3@103-3'::Invoke - } // end of class 'orders3@103-15' + } // end of class 'orders3@103-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@111-18' + .class auto ansi serializable sealed nested assembly beforefieldinit orders4@111 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3146,9 +3146,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-18'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders4@111::builder@ IL_000d: ret - } // end of method 'orders4@111-18'::.ctor + } // end of method orders4@111::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -3161,16 +3161,16 @@ IL_0001: stloc.0 .line 112,112 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-18'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/orders4@111::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'orders4@111-18'::Invoke + } // end of method orders4@111::Invoke - } // end of class 'orders4@111-18' + } // end of class orders4@111 - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@112-19' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@112-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -3183,7 +3183,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'orders4@112-19'::.ctor + } // end of method 'orders4@112-1'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Customer c) cil managed @@ -3197,11 +3197,11 @@ IL_000b: call bool [mscorlib]System.String::Equals(string, string) IL_0010: ret - } // end of method 'orders4@112-19'::Invoke + } // end of method 'orders4@112-1'::Invoke - } // end of class 'orders4@112-19' + } // end of class 'orders4@112-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@113-21' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@113-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3221,12 +3221,12 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,object>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@113-21'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@113-3'::builder@ IL_000d: ldarg.0 IL_000e: ldarg.2 - IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders4@113-21'::c + IL_000f: stfld class [Utils]Utils/Customer Linq101Select01/'orders4@113-3'::c IL_0014: ret - } // end of method 'orders4@113-21'::.ctor + } // end of method 'orders4@113-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,object> Invoke(class [Utils]Utils/Order _arg3) cil managed @@ -3239,20 +3239,20 @@ IL_0001: stloc.0 .line 114,114 : 9,42 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@113-21'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@113-3'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders4@113-21'::c + IL_0009: ldfld class [Utils]Utils/Customer Linq101Select01/'orders4@113-3'::c IL_000e: ldloc.0 IL_000f: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_0014: tail. IL_0016: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield,object>(!!0) IL_001b: ret - } // end of method 'orders4@113-21'::Invoke + } // end of method 'orders4@113-3'::Invoke - } // end of class 'orders4@113-21' + } // end of class 'orders4@113-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@111-20' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@111-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -3270,9 +3270,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Collections.IEnumerable>>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-20'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-2'::builder@ IL_000d: ret - } // end of method 'orders4@111-20'::.ctor + } // end of method 'orders4@111-2'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable> Invoke(class [Utils]Utils/Customer _arg2) cil managed @@ -3284,26 +3284,26 @@ IL_0000: ldarg.1 IL_0001: stloc.0 IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-20'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-2'::builder@ IL_0008: ldarg.0 - IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-20'::builder@ + IL_0009: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-2'::builder@ IL_000e: ldloc.0 IL_000f: callvirt instance class [Utils]Utils/Order[] [Utils]Utils/Customer::get_Orders() IL_0014: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0019: ldarg.0 - IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-20'::builder@ + IL_001a: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Select01/'orders4@111-2'::builder@ IL_001f: ldloc.0 - IL_0020: newobj instance void Linq101Select01/'orders4@113-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, - class [Utils]Utils/Customer) + IL_0020: newobj instance void Linq101Select01/'orders4@113-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder, + class [Utils]Utils/Customer) IL_0025: tail. IL_0027: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,object>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) IL_002c: ret - } // end of method 'orders4@111-20'::Invoke + } // end of method 'orders4@111-2'::Invoke - } // end of class 'orders4@111-20' + } // end of class 'orders4@111-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@114-22' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@114-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool> { .method assembly specialname rtspecialname @@ -3316,7 +3316,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,bool>::.ctor() IL_0006: ret - } // end of method 'orders4@114-22'::.ctor + } // end of method 'orders4@114-4'::.ctor .method public strict virtual instance bool Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -3340,11 +3340,11 @@ IL_001b: call bool [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/HashCompare::GenericGreaterOrEqualIntrinsic(!!0, !!0) IL_0020: ret - } // end of method 'orders4@114-22'::Invoke + } // end of method 'orders4@114-4'::Invoke - } // end of class 'orders4@114-22' + } // end of class 'orders4@114-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@115-23' + .class auto ansi serializable sealed nested assembly beforefieldinit 'orders4@115-5' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2> { .method assembly specialname rtspecialname @@ -3357,7 +3357,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [mscorlib]System.Tuple`2>::.ctor() IL_0006: ret - } // end of method 'orders4@115-23'::.ctor + } // end of method 'orders4@115-5'::.ctor .method public strict virtual instance class [mscorlib]System.Tuple`2 Invoke(class [mscorlib]System.Tuple`2 tupledArg) cil managed @@ -3381,16 +3381,16 @@ IL_001a: newobj instance void class [mscorlib]System.Tuple`2::.ctor(!0, !1) IL_001f: ret - } // end of method 'orders4@115-23'::Invoke + } // end of method 'orders4@115-5'::Invoke - } // end of class 'orders4@115-23' + } // end of class 'orders4@115-5' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_numbers() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbers@7-48' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbers@7-9' IL_0005: ret } // end of method Linq101Select01::get_numbers @@ -3399,7 +3399,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numsPlusOne@10-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numsPlusOne@10 IL_0005: ret } // end of method Linq101Select01::get_numsPlusOne @@ -3408,7 +3408,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'products@17-66' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'products@17-12' IL_0005: ret } // end of method Linq101Select01::get_products @@ -3417,7 +3417,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Select01::'productNames@19-6' + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Select01::productNames@19 IL_0005: ret } // end of method Linq101Select01::get_productNames @@ -3426,7 +3426,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'strings@26-14' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'strings@26-2' IL_0005: ret } // end of method Linq101Select01::get_strings @@ -3435,7 +3435,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'textNums@27-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::textNums@27 IL_0005: ret } // end of method Linq101Select01::get_textNums @@ -3444,7 +3444,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'words@34-38' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'words@34-8' IL_0005: ret } // end of method Linq101Select01::get_words @@ -3453,7 +3453,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::'upperLowerWords@36-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::upperLowerWords@36 IL_0005: ret } // end of method Linq101Select01::get_upperLowerWords @@ -3462,7 +3462,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Select01::'digitOddEvens@43-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Select01::digitOddEvens@43 IL_0005: ret } // end of method Linq101Select01::get_digitOddEvens @@ -3471,7 +3471,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'productInfos@50-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::productInfos@50 IL_0005: ret } // end of method Linq101Select01::get_productInfos @@ -3480,7 +3480,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'digits@57-28' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'digits@57-4' IL_0005: ret } // end of method Linq101Select01::get_digits @@ -3489,7 +3489,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'lowNums@58-12' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::lowNums@58 IL_0005: ret } // end of method Linq101Select01::get_lowNums @@ -3498,7 +3498,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbersA@67-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numbersA@67 IL_0005: ret } // end of method Linq101Select01::get_numbersA @@ -3507,7 +3507,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbersB@68-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numbersB@68 IL_0005: ret } // end of method Linq101Select01::get_numbersB @@ -3516,7 +3516,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::'pairs@70-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::pairs@70 IL_0005: ret } // end of method Linq101Select01::get_pairs @@ -3525,7 +3525,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'customers@79-34' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'customers@79-4' IL_0005: ret } // end of method Linq101Select01::get_customers @@ -3534,7 +3534,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'orders@80-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::orders@80 IL_0005: ret } // end of method Linq101Select01::get_orders @@ -3543,7 +3543,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'orders2@89-6' + IL_0000: ldsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::orders2@89 IL_0005: ret } // end of method Linq101Select01::get_orders2 @@ -3552,7 +3552,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::'orders3@98-6' + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::orders3@98 IL_0005: ret } // end of method Linq101Select01::get_orders3 @@ -3561,7 +3561,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld valuetype [mscorlib]System.DateTime ''.$Linq101Select01::'cutOffDate@107-6' + IL_0000: ldsfld valuetype [mscorlib]System.DateTime ''.$Linq101Select01::cutOffDate@107 IL_0005: ret } // end of method Linq101Select01::get_cutOffDate @@ -3570,7 +3570,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::'orders4@109-6' + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::orders4@109 IL_0005: ret } // end of method Linq101Select01::get_orders4 @@ -3705,47 +3705,47 @@ .class private abstract auto ansi sealed ''.$Linq101Select01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@7-48' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@7-9' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numsPlusOne@10-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numsPlusOne@10 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@17-66' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@17-12' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'productNames@19-6' + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 productNames@19 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'strings@26-14' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'strings@26-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'textNums@27-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 textNums@27 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@34-38' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'words@34-8' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'upperLowerWords@36-6' + .field static assembly class [mscorlib]System.Tuple`2[] upperLowerWords@36 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> 'digitOddEvens@43-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> digitOddEvens@43 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`3[] 'productInfos@50-6' + .field static assembly class [mscorlib]System.Tuple`3[] productInfos@50 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@57-28' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@57-4' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'lowNums@58-12' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 lowNums@58 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbersA@67-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numbersA@67 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbersB@68-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 numbersB@68 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`2[] 'pairs@70-6' + .field static assembly class [mscorlib]System.Tuple`2[] pairs@70 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@79-34' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@79-4' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`3[] 'orders@80-6' + .field static assembly class [mscorlib]System.Tuple`3[] orders@80 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Tuple`3[] 'orders2@89-6' + .field static assembly class [mscorlib]System.Tuple`3[] orders2@89 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1> 'orders3@98-6' + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1> orders3@98 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly valuetype [mscorlib]System.DateTime 'cutOffDate@107-6' + .field static assembly valuetype [mscorlib]System.DateTime cutOffDate@107 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1> 'orders4@109-6' + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1> orders4@109 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -3824,7 +3824,7 @@ IL_003d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0042: dup - IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbers@7-48' + IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbers@7-9' IL_0048: stloc.0 .line 10,14 : 1,20 '' IL_0049: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3832,28 +3832,28 @@ IL_0050: ldnull IL_0051: ldc.i4.0 IL_0052: ldc.i4.0 - IL_0053: newobj instance void Linq101Select01/'numsPlusOne@13-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0053: newobj instance void Linq101Select01/numsPlusOne@13::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0058: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_005d: dup - IL_005e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numsPlusOne@10-6' + IL_005e: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numsPlusOne@10 IL_0063: stloc.1 .line 17,17 : 1,32 '' IL_0064: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0069: dup - IL_006a: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'products@17-66' + IL_006a: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'products@17-12' IL_006f: stloc.2 IL_0070: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0075: stloc.s V_22 IL_0077: ldnull IL_0078: ldc.i4.0 IL_0079: ldnull - IL_007a: newobj instance void Linq101Select01/'productNames@22-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_007a: newobj instance void Linq101Select01/productNames@22::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_007f: dup - IL_0080: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Select01::'productNames@19-6' + IL_0080: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Select01::productNames@19 IL_0085: stloc.3 .line 26,26 : 1,97 '' IL_0086: ldstr "zero" @@ -3888,7 +3888,7 @@ IL_00ea: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_00ef: dup - IL_00f0: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'strings@26-14' + IL_00f0: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'strings@26-2' IL_00f5: stloc.s strings .line 27,31 : 1,20 '' IL_00f7: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3896,12 +3896,12 @@ IL_00fe: ldnull IL_00ff: ldc.i4.0 IL_0100: ldnull - IL_0101: newobj instance void Linq101Select01/'textNums@30-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0101: newobj instance void Linq101Select01/textNums@30::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0106: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_010b: dup - IL_010c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'textNums@27-6' + IL_010c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::textNums@27 IL_0111: stloc.s textNums .line 34,34 : 1,46 '' IL_0113: ldstr "aPPLE" @@ -3915,7 +3915,7 @@ IL_0131: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0136: dup - IL_0137: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'words@34-38' + IL_0137: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'words@34-8' IL_013c: stloc.s words .line 36,40 : 1,20 '' IL_013e: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3923,12 +3923,12 @@ IL_0145: ldnull IL_0146: ldc.i4.0 IL_0147: ldnull - IL_0148: newobj instance void Linq101Select01/'upperLowerWords@39-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`2) + IL_0148: newobj instance void Linq101Select01/upperLowerWords@39::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`2) IL_014d: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0152: dup - IL_0153: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::'upperLowerWords@36-6' + IL_0153: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::upperLowerWords@36 IL_0158: stloc.s upperLowerWords .line 43,47 : 1,20 '' IL_015a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3936,12 +3936,12 @@ IL_0161: ldnull IL_0162: ldc.i4.0 IL_0163: ldnull - IL_0164: newobj instance void Linq101Select01/'digitOddEvens@46-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`2) + IL_0164: newobj instance void Linq101Select01/digitOddEvens@46::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`2) IL_0169: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_016e: dup - IL_016f: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Select01::'digitOddEvens@43-6' + IL_016f: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1> ''.$Linq101Select01::digitOddEvens@43 IL_0174: stloc.s digitOddEvens .line 50,54 : 1,21 '' IL_0176: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3949,17 +3949,17 @@ IL_017d: ldnull IL_017e: ldc.i4.0 IL_017f: ldnull - IL_0180: newobj instance void Linq101Select01/'productInfos@53-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - class [mscorlib]System.Tuple`3) + IL_0180: newobj instance void Linq101Select01/productInfos@53::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + class [mscorlib]System.Tuple`3) IL_0185: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_018a: dup - IL_018b: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'productInfos@50-6' + IL_018b: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::productInfos@50 IL_0190: stloc.s productInfos .line 57,57 : 1,21 '' IL_0192: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_strings() IL_0197: dup - IL_0198: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'digits@57-28' + IL_0198: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'digits@57-4' IL_019d: stloc.s digits .line 58,63 : 1,20 '' IL_019f: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -3971,19 +3971,19 @@ IL_01ae: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbers() IL_01b3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01b8: ldloc.s V_27 - IL_01ba: newobj instance void Linq101Select01/'lowNums@60-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_01ba: newobj instance void Linq101Select01/lowNums@60::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_01bf: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_01c4: newobj instance void Linq101Select01/'lowNums@61-19'::.ctor() + IL_01c4: newobj instance void Linq101Select01/'lowNums@61-1'::.ctor() IL_01c9: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_01ce: newobj instance void Linq101Select01/'lowNums@62-20'::.ctor() + IL_01ce: newobj instance void Linq101Select01/'lowNums@62-2'::.ctor() IL_01d3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_01d8: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_01dd: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_01e2: dup - IL_01e3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'lowNums@58-12' + IL_01e3: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::lowNums@58 IL_01e8: stloc.s lowNums .line 64,64 : 1,59 '' IL_01ea: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_lowNums() @@ -4057,7 +4057,7 @@ IL_0287: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_028c: dup - IL_028d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbersA@67-6' + IL_028d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numbersA@67 IL_0292: stloc.s numbersA .line 68,68 : 1,31 '' IL_0294: ldc.i4.1 @@ -4077,7 +4077,7 @@ IL_02b2: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_02b7: dup - IL_02b8: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'numbersB@68-6' + IL_02b8: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::numbersB@68 IL_02bd: stloc.s numbersB .line 70,76 : 1,21 '' IL_02bf: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -4089,24 +4089,24 @@ IL_02ce: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_numbersA() IL_02d3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_02d8: ldloc.s V_30 - IL_02da: newobj instance void Linq101Select01/'pairs@72-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_02da: newobj instance void Linq101Select01/pairs@72::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_02df: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_02e4: newobj instance void Linq101Select01/'pairs@74-14'::.ctor() + IL_02e4: newobj instance void Linq101Select01/'pairs@74-2'::.ctor() IL_02e9: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_02ee: newobj instance void Linq101Select01/'pairs@75-15'::.ctor() + IL_02ee: newobj instance void Linq101Select01/'pairs@75-3'::.ctor() IL_02f3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_02f8: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_02fd: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0302: dup - IL_0303: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::'pairs@70-6' + IL_0303: stsfld class [mscorlib]System.Tuple`2[] ''.$Linq101Select01::pairs@70 IL_0308: stloc.s pairs .line 79,79 : 1,34 '' IL_030a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_030f: dup - IL_0310: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'customers@79-34' + IL_0310: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Select01::'customers@79-4' IL_0315: stloc.s customers .line 80,86 : 1,21 '' IL_0317: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -4118,19 +4118,19 @@ IL_0326: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_customers() IL_032b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0330: ldloc.s V_31 - IL_0332: newobj instance void Linq101Select01/'orders@82-20'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0332: newobj instance void Linq101Select01/'orders@82-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0337: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_033c: newobj instance void Linq101Select01/'orders@84-22'::.ctor() + IL_033c: newobj instance void Linq101Select01/'orders@84-4'::.ctor() IL_0341: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0346: newobj instance void Linq101Select01/'orders@85-23'::.ctor() + IL_0346: newobj instance void Linq101Select01/'orders@85-5'::.ctor() IL_034b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0350: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_0355: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_035a: dup - IL_035b: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'orders@80-6' + IL_035b: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::orders@80 IL_0360: stloc.s orders .line 89,95 : 1,21 '' IL_0362: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -4142,19 +4142,19 @@ IL_0371: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_customers() IL_0376: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_037b: ldloc.s V_32 - IL_037d: newobj instance void Linq101Select01/'orders2@91-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_037d: newobj instance void Linq101Select01/orders2@91::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0382: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0387: newobj instance void Linq101Select01/'orders2@93-14'::.ctor() + IL_0387: newobj instance void Linq101Select01/'orders2@93-2'::.ctor() IL_038c: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0391: newobj instance void Linq101Select01/'orders2@94-15'::.ctor() + IL_0391: newobj instance void Linq101Select01/'orders2@94-3'::.ctor() IL_0396: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_039b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_03a0: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray>(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03a5: dup - IL_03a6: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::'orders2@89-6' + IL_03a6: stsfld class [mscorlib]System.Tuple`3[] ''.$Linq101Select01::orders2@89 IL_03ab: stloc.s orders2 IL_03ad: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_03b2: stloc.s V_33 @@ -4165,18 +4165,18 @@ IL_03bc: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_customers() IL_03c1: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_03c6: ldloc.s V_33 - IL_03c8: newobj instance void Linq101Select01/'orders3@100-12'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_03c8: newobj instance void Linq101Select01/orders3@100::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_03cd: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_03d2: newobj instance void Linq101Select01/'orders3@102-14'::.ctor() + IL_03d2: newobj instance void Linq101Select01/'orders3@102-2'::.ctor() IL_03d7: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_03dc: newobj instance void Linq101Select01/'orders3@103-15'::.ctor() + IL_03dc: newobj instance void Linq101Select01/'orders3@103-3'::.ctor() IL_03e1: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`3>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_03e6: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_03eb: dup - IL_03ec: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::'orders3@98-6' + IL_03ec: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::orders3@98 IL_03f1: stloc.s orders3 .line 107,107 : 1,38 '' IL_03f3: ldc.i4 0x7cd @@ -4186,7 +4186,7 @@ int32, int32) IL_03ff: dup - IL_0400: stsfld valuetype [mscorlib]System.DateTime ''.$Linq101Select01::'cutOffDate@107-6' + IL_0400: stsfld valuetype [mscorlib]System.DateTime ''.$Linq101Select01::cutOffDate@107 IL_0405: stloc.s cutOffDate IL_0407: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_040c: stloc.s V_34 @@ -4199,25 +4199,25 @@ IL_041a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Select01::get_customers() IL_041f: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0424: ldloc.s V_34 - IL_0426: newobj instance void Linq101Select01/'orders4@111-18'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0426: newobj instance void Linq101Select01/orders4@111::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_042b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0430: newobj instance void Linq101Select01/'orders4@112-19'::.ctor() + IL_0430: newobj instance void Linq101Select01/'orders4@112-1'::.ctor() IL_0435: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_043a: ldloc.s V_34 - IL_043c: newobj instance void Linq101Select01/'orders4@111-20'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_043c: newobj instance void Linq101Select01/'orders4@111-2'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0441: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0446: newobj instance void Linq101Select01/'orders4@114-22'::.ctor() + IL_0446: newobj instance void Linq101Select01/'orders4@114-4'::.ctor() IL_044b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where,class [mscorlib]System.Collections.IEnumerable>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0450: newobj instance void Linq101Select01/'orders4@115-23'::.ctor() + IL_0450: newobj instance void Linq101Select01/'orders4@115-5'::.ctor() IL_0455: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select,class [mscorlib]System.Collections.IEnumerable,class [mscorlib]System.Tuple`2>(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_045a: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2,class [mscorlib]System.Collections.IEnumerable>::get_Source() IL_045f: dup - IL_0460: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::'orders4@109-6' + IL_0460: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1> ''.$Linq101Select01::orders4@109 IL_0465: stloc.s orders4 IL_0467: ret } // end of method $Linq101Select01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl index 0e8801c53c3..a19053aa1cd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101SetOperators01.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x000004E0 Length: 0x00000000 } .module Linq101SetOperators01.exe -// MVID: {5BF2D3C6-4EE5-349F-A745-0383C6D3F25B} +// MVID: {5C6C932B-7E0C-F396-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CB0000 +// Image base: 0x033A0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'uniqueFactors@13-7' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'uniqueFactors@13-1' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -88,17 +88,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_0009: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current + IL_0010: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'uniqueFactors@13-7'::.ctor + } // end of method 'uniqueFactors@13-1'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -110,7 +110,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\QueryExpressionStepping\\Linq101SetOperators01.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -143,18 +143,18 @@ IL_002b: ldarg.0 IL_002c: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101SetOperators01::get_factorsOf300() IL_0031: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' + IL_0036: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_003d: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc .line 13,13 : 9,33 '' IL_0042: ldarg.0 - IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' + IL_0043: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' IL_0048: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_004d: brfalse.s IL_0070 IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' IL_0055: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_005a: stloc.0 .line 13,13 : 9,33 '' @@ -162,11 +162,11 @@ IL_005c: stloc.1 IL_005d: ldarg.0 IL_005e: ldc.i4.2 - IL_005f: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_005f: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc .line 14,14 : 9,17 '' IL_0064: ldarg.0 IL_0065: ldloc.1 - IL_0066: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current + IL_0066: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current IL_006b: ldc.i4.1 IL_006c: ret @@ -176,24 +176,24 @@ IL_0070: ldarg.0 IL_0071: ldc.i4.3 - IL_0072: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_0072: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc .line 13,13 : 9,33 '' IL_0077: ldarg.0 - IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' + IL_0078: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' IL_007d: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0082: nop IL_0083: ldarg.0 IL_0084: ldnull - IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' + IL_0085: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' IL_008a: ldarg.0 IL_008b: ldc.i4.3 - IL_008c: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_008c: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current + IL_0093: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current IL_0098: ldc.i4.0 IL_0099: ret - } // end of method 'uniqueFactors@13-7'::GenerateNext + } // end of method 'uniqueFactors@13-1'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -205,7 +205,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -221,7 +221,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_001b: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -259,19 +259,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_004f: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-7'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'uniqueFactors@13-1'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_0063: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current + IL_006a: stfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -311,7 +311,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'uniqueFactors@13-7'::Close + } // end of method 'uniqueFactors@13-1'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -320,7 +320,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::pc + IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -362,7 +362,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'uniqueFactors@13-7'::get_CheckClose + } // end of method 'uniqueFactors@13-1'::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -372,9 +372,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-7'::current + IL_0001: ldfld int32 Linq101SetOperators01/'uniqueFactors@13-1'::current IL_0006: ret - } // end of method 'uniqueFactors@13-7'::get_LastGenerated + } // end of method 'uniqueFactors@13-1'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -386,15 +386,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101SetOperators01/'uniqueFactors@13-7'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + IL_0003: newobj instance void Linq101SetOperators01/'uniqueFactors@13-1'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, int32, int32) IL_0008: ret - } // end of method 'uniqueFactors@13-7'::GetFreshEnumerator + } // end of method 'uniqueFactors@13-1'::GetFreshEnumerator - } // end of class 'uniqueFactors@13-7' + } // end of class 'uniqueFactors@13-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'categoryNames@22-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'categoryNames@22-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -407,7 +407,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'categoryNames@22-7'::.ctor + } // end of method 'categoryNames@22-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -423,11 +423,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'categoryNames@22-7'::Invoke + } // end of method 'categoryNames@22-1'::Invoke - } // end of class 'categoryNames@22-7' + } // end of class 'categoryNames@22-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'categoryNames@23-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname categoryNames@23 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -452,17 +452,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_0009: stfld int32 Linq101SetOperators01/categoryNames@23::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101SetOperators01/'categoryNames@23-6'::current + IL_0010: stfld string Linq101SetOperators01/categoryNames@23::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'categoryNames@23-6'::.ctor + } // end of method categoryNames@23::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -472,7 +472,7 @@ .locals init ([0] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/categoryNames@23::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -503,33 +503,33 @@ IL_002a: nop .line 23,23 : 9,26 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101SetOperators01/'categoryNames@22-7'::.ctor() + IL_002c: newobj instance void Linq101SetOperators01/'categoryNames@22-1'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101SetOperators01::get_products() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Product>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_0047: stfld int32 Linq101SetOperators01/categoryNames@23::pc .line 23,23 : 9,26 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_007d IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_0067: stfld int32 Linq101SetOperators01/categoryNames@23::pc .line 23,23 : 16,26 '' IL_006c: ldarg.0 IL_006d: ldloc.0 IL_006e: callvirt instance string [Utils]Utils/Product::get_Category() - IL_0073: stfld string Linq101SetOperators01/'categoryNames@23-6'::current + IL_0073: stfld string Linq101SetOperators01/categoryNames@23::current IL_0078: ldc.i4.1 IL_0079: ret @@ -539,24 +539,24 @@ IL_007d: ldarg.0 IL_007e: ldc.i4.3 - IL_007f: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_007f: stfld int32 Linq101SetOperators01/categoryNames@23::pc .line 23,23 : 9,26 '' IL_0084: ldarg.0 - IL_0085: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' + IL_0085: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' IL_008a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_008f: nop IL_0090: ldarg.0 IL_0091: ldnull - IL_0092: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' + IL_0092: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' IL_0097: ldarg.0 IL_0098: ldc.i4.3 - IL_0099: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_0099: stfld int32 Linq101SetOperators01/categoryNames@23::pc IL_009e: ldarg.0 IL_009f: ldnull - IL_00a0: stfld string Linq101SetOperators01/'categoryNames@23-6'::current + IL_00a0: stfld string Linq101SetOperators01/categoryNames@23::current IL_00a5: ldc.i4.0 IL_00a6: ret - } // end of method 'categoryNames@23-6'::GenerateNext + } // end of method categoryNames@23::GenerateNext .method public strict virtual instance void Close() cil managed @@ -568,7 +568,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/categoryNames@23::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -584,7 +584,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_001b: ldfld int32 Linq101SetOperators01/categoryNames@23::pc IL_0020: switch ( IL_0037, IL_0039, @@ -622,19 +622,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_004f: stfld int32 Linq101SetOperators01/categoryNames@23::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'categoryNames@23-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/categoryNames@23::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_0063: stfld int32 Linq101SetOperators01/categoryNames@23::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101SetOperators01/'categoryNames@23-6'::current + IL_006a: stfld string Linq101SetOperators01/categoryNames@23::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -674,7 +674,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'categoryNames@23-6'::Close + } // end of method categoryNames@23::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -683,7 +683,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'categoryNames@23-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/categoryNames@23::pc IL_0006: switch ( IL_001d, IL_001f, @@ -725,7 +725,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'categoryNames@23-6'::get_CheckClose + } // end of method categoryNames@23::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -735,9 +735,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101SetOperators01/'categoryNames@23-6'::current + IL_0001: ldfld string Linq101SetOperators01/categoryNames@23::current IL_0006: ret - } // end of method 'categoryNames@23-6'::get_LastGenerated + } // end of method categoryNames@23::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -749,15 +749,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101SetOperators01/'categoryNames@23-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101SetOperators01/categoryNames@23::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'categoryNames@23-6'::GetFreshEnumerator + } // end of method categoryNames@23::GetFreshEnumerator - } // end of class 'categoryNames@23-6' + } // end of class categoryNames@23 - .class auto ansi serializable sealed nested assembly beforefieldinit 'productFirstChars@32-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'productFirstChars@32-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -770,7 +770,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'productFirstChars@32-7'::.ctor + } // end of method 'productFirstChars@32-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -786,11 +786,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'productFirstChars@32-7'::Invoke + } // end of method 'productFirstChars@32-1'::Invoke - } // end of class 'productFirstChars@32-7' + } // end of class 'productFirstChars@32-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'productFirstChars@33-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname productFirstChars@33 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -815,17 +815,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_0009: stfld int32 Linq101SetOperators01/productFirstChars@33::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld char Linq101SetOperators01/'productFirstChars@33-6'::current + IL_0010: stfld char Linq101SetOperators01/productFirstChars@33::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'productFirstChars@33-6'::.ctor + } // end of method productFirstChars@33::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -835,7 +835,7 @@ .locals init ([0] class [Utils]Utils/Product p) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/productFirstChars@33::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -866,35 +866,35 @@ IL_002d: nop .line 33,33 : 9,33 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101SetOperators01/'productFirstChars@32-7'::.ctor() + IL_002f: newobj instance void Linq101SetOperators01/'productFirstChars@32-1'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101SetOperators01::get_products() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Product>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_004a: stfld int32 Linq101SetOperators01/productFirstChars@33::pc .line 33,33 : 9,33 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_0086 IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_006a: stfld int32 Linq101SetOperators01/productFirstChars@33::pc .line 33,33 : 29,30 '' IL_006f: ldarg.0 IL_0070: ldloc.0 IL_0071: callvirt instance string [Utils]Utils/Product::get_ProductName() IL_0076: ldc.i4.0 IL_0077: callvirt instance char [mscorlib]System.String::get_Chars(int32) - IL_007c: stfld char Linq101SetOperators01/'productFirstChars@33-6'::current + IL_007c: stfld char Linq101SetOperators01/productFirstChars@33::current IL_0081: ldc.i4.1 IL_0082: ret @@ -904,24 +904,24 @@ IL_0086: ldarg.0 IL_0087: ldc.i4.3 - IL_0088: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_0088: stfld int32 Linq101SetOperators01/productFirstChars@33::pc .line 33,33 : 9,33 '' IL_008d: ldarg.0 - IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' + IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' IL_0093: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0098: nop IL_0099: ldarg.0 IL_009a: ldnull - IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' + IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' IL_00a0: ldarg.0 IL_00a1: ldc.i4.3 - IL_00a2: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_00a2: stfld int32 Linq101SetOperators01/productFirstChars@33::pc IL_00a7: ldarg.0 IL_00a8: ldc.i4.0 - IL_00a9: stfld char Linq101SetOperators01/'productFirstChars@33-6'::current + IL_00a9: stfld char Linq101SetOperators01/productFirstChars@33::current IL_00ae: ldc.i4.0 IL_00af: ret - } // end of method 'productFirstChars@33-6'::GenerateNext + } // end of method productFirstChars@33::GenerateNext .method public strict virtual instance void Close() cil managed @@ -933,7 +933,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/productFirstChars@33::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -949,7 +949,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_001b: ldfld int32 Linq101SetOperators01/productFirstChars@33::pc IL_0020: switch ( IL_0037, IL_0039, @@ -987,19 +987,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_004f: stfld int32 Linq101SetOperators01/productFirstChars@33::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'productFirstChars@33-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/productFirstChars@33::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_0063: stfld int32 Linq101SetOperators01/productFirstChars@33::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld char Linq101SetOperators01/'productFirstChars@33-6'::current + IL_006a: stfld char Linq101SetOperators01/productFirstChars@33::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1039,7 +1039,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'productFirstChars@33-6'::Close + } // end of method productFirstChars@33::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1048,7 +1048,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'productFirstChars@33-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/productFirstChars@33::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1090,7 +1090,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'productFirstChars@33-6'::get_CheckClose + } // end of method productFirstChars@33::get_CheckClose .method public strict virtual instance char get_LastGenerated() cil managed @@ -1100,9 +1100,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld char Linq101SetOperators01/'productFirstChars@33-6'::current + IL_0001: ldfld char Linq101SetOperators01/productFirstChars@33::current IL_0006: ret - } // end of method 'productFirstChars@33-6'::get_LastGenerated + } // end of method productFirstChars@33::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1114,15 +1114,15 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101SetOperators01/'productFirstChars@33-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - char) + IL_0003: newobj instance void Linq101SetOperators01/productFirstChars@33::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + char) IL_0008: ret - } // end of method 'productFirstChars@33-6'::GetFreshEnumerator + } // end of method productFirstChars@33::GetFreshEnumerator - } // end of class 'productFirstChars@33-6' + } // end of class productFirstChars@33 - .class auto ansi serializable sealed nested assembly beforefieldinit 'customerFirstChars@38-7' + .class auto ansi serializable sealed nested assembly beforefieldinit 'customerFirstChars@38-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -1135,7 +1135,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'customerFirstChars@38-7'::.ctor + } // end of method 'customerFirstChars@38-1'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -1151,11 +1151,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'customerFirstChars@38-7'::Invoke + } // end of method 'customerFirstChars@38-1'::Invoke - } // end of class 'customerFirstChars@38-7' + } // end of class 'customerFirstChars@38-1' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'customerFirstChars@39-6' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname customerFirstChars@39 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -1180,17 +1180,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_0009: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld char Linq101SetOperators01/'customerFirstChars@39-6'::current + IL_0010: stfld char Linq101SetOperators01/customerFirstChars@39::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'customerFirstChars@39-6'::.ctor + } // end of method customerFirstChars@39::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -1200,7 +1200,7 @@ .locals init ([0] class [Utils]Utils/Customer c) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/customerFirstChars@39::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -1231,35 +1231,35 @@ IL_002d: nop .line 39,39 : 9,33 '' IL_002e: ldarg.0 - IL_002f: newobj instance void Linq101SetOperators01/'customerFirstChars@38-7'::.ctor() + IL_002f: newobj instance void Linq101SetOperators01/'customerFirstChars@38-1'::.ctor() IL_0034: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101SetOperators01::get_customers() IL_0039: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,class [Utils]Utils/Customer>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003e: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' + IL_0043: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' IL_0048: ldarg.0 IL_0049: ldc.i4.1 - IL_004a: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_004a: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc .line 39,39 : 9,33 '' IL_004f: ldarg.0 - IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' + IL_0050: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' IL_0055: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_005a: brfalse.s IL_0086 IL_005c: ldarg.0 - IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' + IL_005d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' IL_0062: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0067: stloc.0 IL_0068: ldarg.0 IL_0069: ldc.i4.2 - IL_006a: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_006a: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc .line 39,39 : 29,30 '' IL_006f: ldarg.0 IL_0070: ldloc.0 IL_0071: callvirt instance string [Utils]Utils/Customer::get_CompanyName() IL_0076: ldc.i4.0 IL_0077: callvirt instance char [mscorlib]System.String::get_Chars(int32) - IL_007c: stfld char Linq101SetOperators01/'customerFirstChars@39-6'::current + IL_007c: stfld char Linq101SetOperators01/customerFirstChars@39::current IL_0081: ldc.i4.1 IL_0082: ret @@ -1269,24 +1269,24 @@ IL_0086: ldarg.0 IL_0087: ldc.i4.3 - IL_0088: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_0088: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc .line 39,39 : 9,33 '' IL_008d: ldarg.0 - IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' + IL_008e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' IL_0093: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0098: nop IL_0099: ldarg.0 IL_009a: ldnull - IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' + IL_009b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' IL_00a0: ldarg.0 IL_00a1: ldc.i4.3 - IL_00a2: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_00a2: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc IL_00a7: ldarg.0 IL_00a8: ldc.i4.0 - IL_00a9: stfld char Linq101SetOperators01/'customerFirstChars@39-6'::current + IL_00a9: stfld char Linq101SetOperators01/customerFirstChars@39::current IL_00ae: ldc.i4.0 IL_00af: ret - } // end of method 'customerFirstChars@39-6'::GenerateNext + } // end of method customerFirstChars@39::GenerateNext .method public strict virtual instance void Close() cil managed @@ -1298,7 +1298,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/customerFirstChars@39::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -1314,7 +1314,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_001b: ldfld int32 Linq101SetOperators01/customerFirstChars@39::pc IL_0020: switch ( IL_0037, IL_0039, @@ -1352,19 +1352,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_004f: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/'customerFirstChars@39-6'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101SetOperators01/customerFirstChars@39::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_0063: stfld int32 Linq101SetOperators01/customerFirstChars@39::pc IL_0068: ldarg.0 IL_0069: ldc.i4.0 - IL_006a: stfld char Linq101SetOperators01/'customerFirstChars@39-6'::current + IL_006a: stfld char Linq101SetOperators01/customerFirstChars@39::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -1404,7 +1404,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'customerFirstChars@39-6'::Close + } // end of method customerFirstChars@39::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -1413,7 +1413,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101SetOperators01/'customerFirstChars@39-6'::pc + IL_0001: ldfld int32 Linq101SetOperators01/customerFirstChars@39::pc IL_0006: switch ( IL_001d, IL_001f, @@ -1455,7 +1455,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'customerFirstChars@39-6'::get_CheckClose + } // end of method customerFirstChars@39::get_CheckClose .method public strict virtual instance char get_LastGenerated() cil managed @@ -1465,9 +1465,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld char Linq101SetOperators01/'customerFirstChars@39-6'::current + IL_0001: ldfld char Linq101SetOperators01/customerFirstChars@39::current IL_0006: ret - } // end of method 'customerFirstChars@39-6'::get_LastGenerated + } // end of method customerFirstChars@39::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -1479,20 +1479,20 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldc.i4.0 - IL_0003: newobj instance void Linq101SetOperators01/'customerFirstChars@39-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - char) + IL_0003: newobj instance void Linq101SetOperators01/customerFirstChars@39::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + char) IL_0008: ret - } // end of method 'customerFirstChars@39-6'::GetFreshEnumerator + } // end of method customerFirstChars@39::GetFreshEnumerator - } // end of class 'customerFirstChars@39-6' + } // end of class customerFirstChars@39 .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_factorsOf300() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'factorsOf300@9-14' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'factorsOf300@9-2' IL_0005: ret } // end of method Linq101SetOperators01::get_factorsOf300 @@ -1501,7 +1501,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'uniqueFactors@11-14' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'uniqueFactors@11-2' IL_0005: ret } // end of method Linq101SetOperators01::get_uniqueFactors @@ -1510,7 +1510,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'products@18-68' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'products@18-14' IL_0005: ret } // end of method Linq101SetOperators01::get_products @@ -1519,7 +1519,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'categoryNames@20-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::categoryNames@20 IL_0005: ret } // end of method Linq101SetOperators01::get_categoryNames @@ -1528,7 +1528,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'customers@28-36' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'customers@28-6' IL_0005: ret } // end of method Linq101SetOperators01::get_customers @@ -1537,7 +1537,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::'productFirstChars@30-6' + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::productFirstChars@30 IL_0005: ret } // end of method Linq101SetOperators01::get_productFirstChars @@ -1546,7 +1546,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::'customerFirstChars@36-6' + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::customerFirstChars@36 IL_0005: ret } // end of method Linq101SetOperators01::get_customerFirstChars @@ -1597,19 +1597,19 @@ .class private abstract auto ansi sealed ''.$Linq101SetOperators01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'factorsOf300@9-14' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'factorsOf300@9-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'uniqueFactors@11-14' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'uniqueFactors@11-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@18-68' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@18-14' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'categoryNames@20-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 categoryNames@20 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@28-36' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@28-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'productFirstChars@30-6' + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 productFirstChars@30 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'customerFirstChars@36-6' + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 customerFirstChars@36 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1649,7 +1649,7 @@ IL_001e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0023: dup - IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'factorsOf300@9-14' + IL_0024: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'factorsOf300@9-2' IL_0029: stloc.0 .line 11,15 : 1,20 '' IL_002a: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1658,7 +1658,7 @@ IL_0033: ldnull IL_0034: ldc.i4.0 IL_0035: ldc.i4.0 - IL_0036: newobj instance void Linq101SetOperators01/'uniqueFactors@13-7'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + IL_0036: newobj instance void Linq101SetOperators01/'uniqueFactors@13-1'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, int32, int32) IL_003b: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) @@ -1666,12 +1666,12 @@ IL_0045: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_004a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_004f: dup - IL_0050: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'uniqueFactors@11-14' + IL_0050: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'uniqueFactors@11-2' IL_0055: stloc.1 .line 18,18 : 1,32 '' IL_0056: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_005b: dup - IL_005c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'products@18-68' + IL_005c: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'products@18-14' IL_0061: stloc.2 .line 20,25 : 1,20 '' IL_0062: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1680,42 +1680,42 @@ IL_006b: ldnull IL_006c: ldc.i4.0 IL_006d: ldnull - IL_006e: newobj instance void Linq101SetOperators01/'categoryNames@23-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_006e: newobj instance void Linq101SetOperators01/categoryNames@23::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0073: newobj instance void class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::.ctor(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0078: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Distinct(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2) IL_007d: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0082: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0087: dup - IL_0088: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'categoryNames@20-6' + IL_0088: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::categoryNames@20 IL_008d: stloc.3 .line 28,28 : 1,34 '' IL_008e: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_0093: dup - IL_0094: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'customers@28-36' + IL_0094: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101SetOperators01::'customers@28-6' IL_0099: stloc.s customers IL_009b: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00a0: stloc.s V_9 IL_00a2: ldnull IL_00a3: ldc.i4.0 IL_00a4: ldc.i4.0 - IL_00a5: newobj instance void Linq101SetOperators01/'productFirstChars@33-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - char) + IL_00a5: newobj instance void Linq101SetOperators01/productFirstChars@33::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + char) IL_00aa: dup - IL_00ab: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::'productFirstChars@30-6' + IL_00ab: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::productFirstChars@30 IL_00b0: stloc.s productFirstChars IL_00b2: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00b7: stloc.s V_10 IL_00b9: ldnull IL_00ba: ldc.i4.0 IL_00bb: ldc.i4.0 - IL_00bc: newobj instance void Linq101SetOperators01/'customerFirstChars@39-6'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - char) + IL_00bc: newobj instance void Linq101SetOperators01/customerFirstChars@39::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + char) IL_00c1: dup - IL_00c2: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::'customerFirstChars@36-6' + IL_00c2: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101SetOperators01::customerFirstChars@36 IL_00c7: stloc.s customerFirstChars IL_00c9: ret } // end of method $Linq101SetOperators01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl index a1d3c038c80..be7a8faca25 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Linq101Where01.il.bsl @@ -48,13 +48,13 @@ // Offset: 0x00000530 Length: 0x00000000 } .module Linq101Where01.exe -// MVID: {5BF2D3C6-FF23-CD21-A745-0383C6D3F25B} +// MVID: {5C6C932B-7DD2-6B6A-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CD0000 +// Image base: 0x01210000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@14-21' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@14-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -81,9 +81,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'lowNums@14-21'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'lowNums@14-3'::builder@ IL_000d: ret - } // end of method 'lowNums@14-21'::.ctor + } // end of method 'lowNums@14-3'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(int32 _arg1) cil managed @@ -97,16 +97,16 @@ IL_0001: stloc.0 .line 15,15 : 9,22 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'lowNums@14-21'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'lowNums@14-3'::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'lowNums@14-21'::Invoke + } // end of method 'lowNums@14-3'::Invoke - } // end of class 'lowNums@14-21' + } // end of class 'lowNums@14-3' - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@15-22' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@15-4' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -119,7 +119,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'lowNums@15-22'::.ctor + } // end of method 'lowNums@15-4'::.ctor .method public strict virtual instance bool Invoke(int32 n) cil managed @@ -131,11 +131,11 @@ IL_0001: ldc.i4.5 IL_0002: clt IL_0004: ret - } // end of method 'lowNums@15-22'::Invoke + } // end of method 'lowNums@15-4'::Invoke - } // end of class 'lowNums@15-22' + } // end of class 'lowNums@15-4' - .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@16-23' + .class auto ansi serializable sealed nested assembly beforefieldinit 'lowNums@16-5' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -148,7 +148,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'lowNums@16-23'::.ctor + } // end of method 'lowNums@16-5'::.ctor .method public strict virtual instance int32 Invoke(int32 n) cil managed @@ -158,11 +158,11 @@ .line 16,16 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'lowNums@16-23'::Invoke + } // end of method 'lowNums@16-5'::Invoke - } // end of class 'lowNums@16-23' + } // end of class 'lowNums@16-5' - .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@24-9' + .class auto ansi serializable sealed nested assembly beforefieldinit soldOutProducts@24 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -180,9 +180,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'soldOutProducts@24-9'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/soldOutProducts@24::builder@ IL_000d: ret - } // end of method 'soldOutProducts@24-9'::.ctor + } // end of method soldOutProducts@24::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -195,16 +195,16 @@ IL_0001: stloc.0 .line 25,25 : 9,35 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'soldOutProducts@24-9'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/soldOutProducts@24::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'soldOutProducts@24-9'::Invoke + } // end of method soldOutProducts@24::Invoke - } // end of class 'soldOutProducts@24-9' + } // end of class soldOutProducts@24 - .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@25-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@25-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -217,7 +217,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'soldOutProducts@25-10'::.ctor + } // end of method 'soldOutProducts@25-1'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product p) cil managed @@ -230,11 +230,11 @@ IL_0006: ldc.i4.0 IL_0007: ceq IL_0009: ret - } // end of method 'soldOutProducts@25-10'::Invoke + } // end of method 'soldOutProducts@25-1'::Invoke - } // end of class 'soldOutProducts@25-10' + } // end of class 'soldOutProducts@25-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@26-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'soldOutProducts@26-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -247,7 +247,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'soldOutProducts@26-11'::.ctor + } // end of method 'soldOutProducts@26-2'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -257,11 +257,11 @@ .line 26,26 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'soldOutProducts@26-11'::Invoke + } // end of method 'soldOutProducts@26-2'::Invoke - } // end of class 'soldOutProducts@26-11' + } // end of class 'soldOutProducts@26-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@32-9' + .class auto ansi serializable sealed nested assembly beforefieldinit expensiveInStockProducts@32 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -279,9 +279,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'expensiveInStockProducts@32-9'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/expensiveInStockProducts@32::builder@ IL_000d: ret - } // end of method 'expensiveInStockProducts@32-9'::.ctor + } // end of method expensiveInStockProducts@32::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Product _arg1) cil managed @@ -294,16 +294,16 @@ IL_0001: stloc.0 .line 33,33 : 9,58 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'expensiveInStockProducts@32-9'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/expensiveInStockProducts@32::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'expensiveInStockProducts@32-9'::Invoke + } // end of method expensiveInStockProducts@32::Invoke - } // end of class 'expensiveInStockProducts@32-9' + } // end of class expensiveInStockProducts@32 - .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@33-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@33-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -316,7 +316,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'expensiveInStockProducts@33-10'::.ctor + } // end of method 'expensiveInStockProducts@33-1'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Product p) cil managed @@ -353,11 +353,11 @@ .line 100001,100001 : 0,0 '' IL_0027: ldc.i4.0 IL_0028: ret - } // end of method 'expensiveInStockProducts@33-10'::Invoke + } // end of method 'expensiveInStockProducts@33-1'::Invoke - } // end of class 'expensiveInStockProducts@33-10' + } // end of class 'expensiveInStockProducts@33-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@34-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'expensiveInStockProducts@34-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -370,7 +370,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'expensiveInStockProducts@34-11'::.ctor + } // end of method 'expensiveInStockProducts@34-2'::.ctor .method public strict virtual instance class [Utils]Utils/Product Invoke(class [Utils]Utils/Product p) cil managed @@ -380,11 +380,11 @@ .line 34,34 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'expensiveInStockProducts@34-11'::Invoke + } // end of method 'expensiveInStockProducts@34-2'::Invoke - } // end of class 'expensiveInStockProducts@34-11' + } // end of class 'expensiveInStockProducts@34-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@42-9' + .class auto ansi serializable sealed nested assembly beforefieldinit waCustomers@42 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .field public class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder builder@ @@ -402,9 +402,9 @@ IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ldarg.0 IL_0007: ldarg.1 - IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'waCustomers@42-9'::builder@ + IL_0008: stfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/waCustomers@42::builder@ IL_000d: ret - } // end of method 'waCustomers@42-9'::.ctor + } // end of method waCustomers@42::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 Invoke(class [Utils]Utils/Customer _arg1) cil managed @@ -417,16 +417,16 @@ IL_0001: stloc.0 .line 43,43 : 9,32 '' IL_0002: ldarg.0 - IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/'waCustomers@42-9'::builder@ + IL_0003: ldfld class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder Linq101Where01/waCustomers@42::builder@ IL_0008: ldloc.0 IL_0009: tail. IL_000b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Yield(!!0) IL_0010: ret - } // end of method 'waCustomers@42-9'::Invoke + } // end of method waCustomers@42::Invoke - } // end of class 'waCustomers@42-9' + } // end of class waCustomers@42 - .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@43-10' + .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@43-1' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -439,7 +439,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'waCustomers@43-10'::.ctor + } // end of method 'waCustomers@43-1'::.ctor .method public strict virtual instance bool Invoke(class [Utils]Utils/Customer c) cil managed @@ -453,11 +453,11 @@ IL_000b: call bool [mscorlib]System.String::Equals(string, string) IL_0010: ret - } // end of method 'waCustomers@43-10'::Invoke + } // end of method 'waCustomers@43-1'::Invoke - } // end of class 'waCustomers@43-10' + } // end of class 'waCustomers@43-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@44-11' + .class auto ansi serializable sealed nested assembly beforefieldinit 'waCustomers@44-2' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -470,7 +470,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'waCustomers@44-11'::.ctor + } // end of method 'waCustomers@44-2'::.ctor .method public strict virtual instance class [Utils]Utils/Customer Invoke(class [Utils]Utils/Customer c) cil managed @@ -480,11 +480,11 @@ .line 44,44 : 16,17 '' IL_0000: ldarg.1 IL_0001: ret - } // end of method 'waCustomers@44-11'::Invoke + } // end of method 'waCustomers@44-2'::Invoke - } // end of class 'waCustomers@44-11' + } // end of class 'waCustomers@44-2' - .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@55-12' + .class auto ansi serializable sealed nested assembly beforefieldinit shortDigits@55 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1> { .method assembly specialname rtspecialname @@ -497,7 +497,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2,class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1>::.ctor() IL_0006: ret - } // end of method 'shortDigits@55-12'::.ctor + } // end of method shortDigits@55::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1 Invoke(class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1 x) cil managed @@ -509,11 +509,11 @@ IL_0001: tail. IL_0003: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::Identity>(!!0) IL_0008: ret - } // end of method 'shortDigits@55-12'::Invoke + } // end of method shortDigits@55::Invoke - } // end of class 'shortDigits@55-12' + } // end of class shortDigits@55 - .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@54-13' + .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@54-1' extends class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3> { .method assembly specialname rtspecialname @@ -526,7 +526,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.OptimizedClosures/FSharpFunc`3>::.ctor() IL_0006: ret - } // end of method 'shortDigits@54-13'::.ctor + } // end of method 'shortDigits@54-1'::.ctor .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.FSharpOption`1 Invoke(int32 i, @@ -552,11 +552,11 @@ .line 54,54 : 63,67 '' IL_0014: ldnull IL_0015: ret - } // end of method 'shortDigits@54-13'::Invoke + } // end of method 'shortDigits@54-1'::Invoke - } // end of class 'shortDigits@54-13' + } // end of class 'shortDigits@54-1' - .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@51-15' + .class auto ansi serializable sealed nested assembly beforefieldinit 'shortDigits@51-3' extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2> { .method assembly specialname rtspecialname @@ -569,7 +569,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>::.ctor() IL_0006: ret - } // end of method 'shortDigits@51-15'::.ctor + } // end of method 'shortDigits@51-3'::.ctor .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerable`1 Invoke(string _arg1) cil managed @@ -585,11 +585,11 @@ IL_0003: tail. IL_0005: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Singleton(!!0) IL_000a: ret - } // end of method 'shortDigits@51-15'::Invoke + } // end of method 'shortDigits@51-3'::Invoke - } // end of class 'shortDigits@51-15' + } // end of class 'shortDigits@51-3' - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'shortDigits@52-14' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'shortDigits@52-2' extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -614,17 +614,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_0009: stfld int32 Linq101Where01/'shortDigits@52-2'::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld string Linq101Where01/'shortDigits@52-14'::current + IL_0010: stfld string Linq101Where01/'shortDigits@52-2'::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_001b: ret - } // end of method 'shortDigits@52-14'::.ctor + } // end of method 'shortDigits@52-2'::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -634,7 +634,7 @@ .locals init ([0] string d) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-2'::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -665,32 +665,32 @@ IL_002a: nop .line 52,52 : 9,17 '' IL_002b: ldarg.0 - IL_002c: newobj instance void Linq101Where01/'shortDigits@51-15'::.ctor() + IL_002c: newobj instance void Linq101Where01/'shortDigits@51-3'::.ctor() IL_0031: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_digits() IL_0036: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Collect,string>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_003b: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' + IL_0040: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' IL_0045: ldarg.0 IL_0046: ldc.i4.1 - IL_0047: stfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_0047: stfld int32 Linq101Where01/'shortDigits@52-2'::pc .line 52,52 : 9,17 '' IL_004c: ldarg.0 - IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' + IL_004d: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' IL_0052: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0057: brfalse.s IL_0078 IL_0059: ldarg.0 - IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' + IL_005a: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' IL_005f: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0064: stloc.0 IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_0067: stfld int32 Linq101Where01/'shortDigits@52-2'::pc .line 52,52 : 16,17 '' IL_006c: ldarg.0 IL_006d: ldloc.0 - IL_006e: stfld string Linq101Where01/'shortDigits@52-14'::current + IL_006e: stfld string Linq101Where01/'shortDigits@52-2'::current IL_0073: ldc.i4.1 IL_0074: ret @@ -700,24 +700,24 @@ IL_0078: ldarg.0 IL_0079: ldc.i4.3 - IL_007a: stfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_007a: stfld int32 Linq101Where01/'shortDigits@52-2'::pc .line 52,52 : 9,17 '' IL_007f: ldarg.0 - IL_0080: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' + IL_0080: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' IL_0085: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_008a: nop IL_008b: ldarg.0 IL_008c: ldnull - IL_008d: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' + IL_008d: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' IL_0092: ldarg.0 IL_0093: ldc.i4.3 - IL_0094: stfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_0094: stfld int32 Linq101Where01/'shortDigits@52-2'::pc IL_0099: ldarg.0 IL_009a: ldnull - IL_009b: stfld string Linq101Where01/'shortDigits@52-14'::current + IL_009b: stfld string Linq101Where01/'shortDigits@52-2'::current IL_00a0: ldc.i4.0 IL_00a1: ret - } // end of method 'shortDigits@52-14'::GenerateNext + } // end of method 'shortDigits@52-2'::GenerateNext .method public strict virtual instance void Close() cil managed @@ -729,7 +729,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-2'::pc IL_0006: ldc.i4.3 IL_0007: sub IL_0008: switch ( @@ -745,7 +745,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_001b: ldfld int32 Linq101Where01/'shortDigits@52-2'::pc IL_0020: switch ( IL_0037, IL_0039, @@ -783,19 +783,19 @@ IL_004c: nop IL_004d: ldarg.0 IL_004e: ldc.i4.3 - IL_004f: stfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_004f: stfld int32 Linq101Where01/'shortDigits@52-2'::pc IL_0054: ldarg.0 - IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-14'::'enum' + IL_0055: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 Linq101Where01/'shortDigits@52-2'::'enum' IL_005a: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_005f: nop .line 100001,100001 : 0,0 '' IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.3 - IL_0063: stfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_0063: stfld int32 Linq101Where01/'shortDigits@52-2'::pc IL_0068: ldarg.0 IL_0069: ldnull - IL_006a: stfld string Linq101Where01/'shortDigits@52-14'::current + IL_006a: stfld string Linq101Where01/'shortDigits@52-2'::current IL_006f: ldnull IL_0070: stloc.1 IL_0071: leave.s IL_007f @@ -835,7 +835,7 @@ .line 100001,100001 : 0,0 '' IL_0093: ret - } // end of method 'shortDigits@52-14'::Close + } // end of method 'shortDigits@52-2'::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -844,7 +844,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-14'::pc + IL_0001: ldfld int32 Linq101Where01/'shortDigits@52-2'::pc IL_0006: switch ( IL_001d, IL_001f, @@ -886,7 +886,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'shortDigits@52-14'::get_CheckClose + } // end of method 'shortDigits@52-2'::get_CheckClose .method public strict virtual instance string get_LastGenerated() cil managed @@ -896,9 +896,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld string Linq101Where01/'shortDigits@52-14'::current + IL_0001: ldfld string Linq101Where01/'shortDigits@52-2'::current IL_0006: ret - } // end of method 'shortDigits@52-14'::get_LastGenerated + } // end of method 'shortDigits@52-2'::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -910,20 +910,20 @@ IL_0000: ldnull IL_0001: ldc.i4.0 IL_0002: ldnull - IL_0003: newobj instance void Linq101Where01/'shortDigits@52-14'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0003: newobj instance void Linq101Where01/'shortDigits@52-2'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_0008: ret - } // end of method 'shortDigits@52-14'::GetFreshEnumerator + } // end of method 'shortDigits@52-2'::GetFreshEnumerator - } // end of class 'shortDigits@52-14' + } // end of class 'shortDigits@52-2' .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_numbers() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'numbers@9-50' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'numbers@9-11' IL_0005: ret } // end of method Linq101Where01::get_numbers @@ -932,7 +932,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'lowNums@12-14' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'lowNums@12-2' IL_0005: ret } // end of method Linq101Where01::get_lowNums @@ -941,7 +941,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'products@20-70' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'products@20-16' IL_0005: ret } // end of method Linq101Where01::get_products @@ -950,7 +950,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'soldOutProducts@22-6' + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::soldOutProducts@22 IL_0005: ret } // end of method Linq101Where01::get_soldOutProducts @@ -959,7 +959,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'expensiveInStockProducts@30-6' + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::expensiveInStockProducts@30 IL_0005: ret } // end of method Linq101Where01::get_expensiveInStockProducts @@ -968,7 +968,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'customers@38-38' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'customers@38-8' IL_0005: ret } // end of method Linq101Where01::get_customers @@ -977,7 +977,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [Utils]Utils/Customer[] ''.$Linq101Where01::'waCustomers@40-6' + IL_0000: ldsfld class [Utils]Utils/Customer[] ''.$Linq101Where01::waCustomers@40 IL_0005: ret } // end of method Linq101Where01::get_waCustomers @@ -986,7 +986,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'digits@48-30' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'digits@48-6' IL_0005: ret } // end of method Linq101Where01::get_digits @@ -995,7 +995,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'shortDigits@49-6' + IL_0000: ldsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::shortDigits@49 IL_0005: ret } // end of method Linq101Where01::get_shortDigits @@ -1058,23 +1058,23 @@ .class private abstract auto ansi sealed ''.$Linq101Where01 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@9-50' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'numbers@9-11' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'lowNums@12-14' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'lowNums@12-2' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@20-70' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'products@20-16' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'soldOutProducts@22-6' + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 soldOutProducts@22 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'expensiveInStockProducts@30-6' + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 expensiveInStockProducts@30 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@38-38' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'customers@38-8' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [Utils]Utils/Customer[] 'waCustomers@40-6' + .field static assembly class [Utils]Utils/Customer[] waCustomers@40 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@48-30' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'digits@48-6' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 'shortDigits@49-6' + .field static assembly class [mscorlib]System.Collections.Generic.IEnumerable`1 shortDigits@49 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -1132,7 +1132,7 @@ IL_003d: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0042: dup - IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'numbers@9-50' + IL_0043: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'numbers@9-11' IL_0048: stloc.0 .line 12,17 : 1,20 '' IL_0049: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1144,24 +1144,24 @@ IL_0058: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_numbers() IL_005d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0062: ldloc.s V_9 - IL_0064: newobj instance void Linq101Where01/'lowNums@14-21'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0064: newobj instance void Linq101Where01/'lowNums@14-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0069: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_006e: newobj instance void Linq101Where01/'lowNums@15-22'::.ctor() + IL_006e: newobj instance void Linq101Where01/'lowNums@15-4'::.ctor() IL_0073: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0078: newobj instance void Linq101Where01/'lowNums@16-23'::.ctor() + IL_0078: newobj instance void Linq101Where01/'lowNums@16-5'::.ctor() IL_007d: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0082: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0087: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.ListModule::OfSeq(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_008c: dup - IL_008d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'lowNums@12-14' + IL_008d: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'lowNums@12-2' IL_0092: stloc.1 .line 20,20 : 1,32 '' IL_0093: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getProductList() IL_0098: dup - IL_0099: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'products@20-70' + IL_0099: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'products@20-16' IL_009e: stloc.2 IL_009f: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00a4: stloc.s V_10 @@ -1172,18 +1172,18 @@ IL_00ae: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_products() IL_00b3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00b8: ldloc.s V_10 - IL_00ba: newobj instance void Linq101Where01/'soldOutProducts@24-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00ba: newobj instance void Linq101Where01/soldOutProducts@24::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_00bf: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_00c4: newobj instance void Linq101Where01/'soldOutProducts@25-10'::.ctor() + IL_00c4: newobj instance void Linq101Where01/'soldOutProducts@25-1'::.ctor() IL_00c9: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_00ce: newobj instance void Linq101Where01/'soldOutProducts@26-11'::.ctor() + IL_00ce: newobj instance void Linq101Where01/'soldOutProducts@26-2'::.ctor() IL_00d3: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_00d8: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_00dd: dup - IL_00de: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'soldOutProducts@22-6' + IL_00de: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::soldOutProducts@22 IL_00e3: stloc.3 IL_00e4: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_00e9: stloc.s V_11 @@ -1194,23 +1194,23 @@ IL_00f3: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_products() IL_00f8: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_00fd: ldloc.s V_11 - IL_00ff: newobj instance void Linq101Where01/'expensiveInStockProducts@32-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_00ff: newobj instance void Linq101Where01/expensiveInStockProducts@32::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0104: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_0109: newobj instance void Linq101Where01/'expensiveInStockProducts@33-10'::.ctor() + IL_0109: newobj instance void Linq101Where01/'expensiveInStockProducts@33-1'::.ctor() IL_010e: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0113: newobj instance void Linq101Where01/'expensiveInStockProducts@34-11'::.ctor() + IL_0113: newobj instance void Linq101Where01/'expensiveInStockProducts@34-2'::.ctor() IL_0118: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_011d: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0122: dup - IL_0123: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'expensiveInStockProducts@30-6' + IL_0123: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::expensiveInStockProducts@30 IL_0128: stloc.s expensiveInStockProducts .line 38,38 : 1,34 '' IL_012a: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [Utils]Utils::getCustomerList() IL_012f: dup - IL_0130: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'customers@38-38' + IL_0130: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'customers@38-8' IL_0135: stloc.s customers .line 40,45 : 1,21 '' IL_0137: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() @@ -1222,19 +1222,19 @@ IL_0146: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 Linq101Where01::get_customers() IL_014b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Source(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0150: ldloc.s V_12 - IL_0152: newobj instance void Linq101Where01/'waCustomers@42-9'::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) + IL_0152: newobj instance void Linq101Where01/waCustomers@42::.ctor(class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder) IL_0157: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::For(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>) - IL_015c: newobj instance void Linq101Where01/'waCustomers@43-10'::.ctor() + IL_015c: newobj instance void Linq101Where01/'waCustomers@43-1'::.ctor() IL_0161: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Where(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) - IL_0166: newobj instance void Linq101Where01/'waCustomers@44-11'::.ctor() + IL_0166: newobj instance void Linq101Where01/'waCustomers@44-2'::.ctor() IL_016b: callvirt instance class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2 [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder::Select(class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2, class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2) IL_0170: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerable`1 class [FSharp.Core]Microsoft.FSharp.Linq.QuerySource`2::get_Source() IL_0175: call !!0[] [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToArray(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_017a: dup - IL_017b: stsfld class [Utils]Utils/Customer[] ''.$Linq101Where01::'waCustomers@40-6' + IL_017b: stsfld class [Utils]Utils/Customer[] ''.$Linq101Where01::waCustomers@40 IL_0180: stloc.s waCustomers .line 48,48 : 1,96 '' IL_0182: ldstr "zero" @@ -1269,25 +1269,25 @@ IL_01e6: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_01eb: dup - IL_01ec: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'digits@48-30' + IL_01ec: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$Linq101Where01::'digits@48-6' IL_01f1: stloc.s digits .line 49,55 : 1,21 '' - IL_01f3: newobj instance void Linq101Where01/'shortDigits@55-12'::.ctor() - IL_01f8: newobj instance void Linq101Where01/'shortDigits@54-13'::.ctor() + IL_01f3: newobj instance void Linq101Where01/shortDigits@55::.ctor() + IL_01f8: newobj instance void Linq101Where01/'shortDigits@54-1'::.ctor() IL_01fd: call class [FSharp.Core]Microsoft.FSharp.Linq.QueryBuilder [FSharp.Core]Microsoft.FSharp.Core.ExtraTopLevelOperators::get_query() IL_0202: stloc.s V_13 IL_0204: ldnull IL_0205: ldc.i4.0 IL_0206: ldnull - IL_0207: newobj instance void Linq101Where01/'shortDigits@52-14'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - string) + IL_0207: newobj instance void Linq101Where01/'shortDigits@52-2'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + string) IL_020c: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::MapIndexed>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0211: call class [mscorlib]System.Collections.Generic.IEnumerable`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::Choose,string>(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2>, class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_0216: dup - IL_0217: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::'shortDigits@49-6' + IL_0217: stsfld class [mscorlib]System.Collections.Generic.IEnumerable`1 ''.$Linq101Where01::shortDigits@49 IL_021c: stloc.s shortDigits IL_021e: ret } // end of method $Linq101Where01::main@ diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl index 71ce10879f9..b909f7cd49e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest1.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000338 Length: 0x00000000 } .module SeqExpressionSteppingTest1.exe -// MVID: {5BF2D3C6-2432-947D-A745-0383C6D3F25B} +// MVID: {5C6C932B-97EE-0B32-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01200000 +// Image base: 0x00E30000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f0@6-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname f0@6 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -83,14 +83,14 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc + IL_0002: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::current + IL_0009: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::current IL_000e: ldarg.0 IL_000f: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0014: ret - } // end of method 'f0@6-3'::.ctor + } // end of method f0@6::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -100,7 +100,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest1.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -124,23 +124,23 @@ IL_0021: nop IL_0022: ldarg.0 IL_0023: ldc.i4.1 - IL_0024: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc + IL_0024: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc .line 6,6 : 15,22 '' IL_0029: ldarg.0 IL_002a: ldc.i4.1 - IL_002b: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::current + IL_002b: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::current IL_0030: ldc.i4.1 IL_0031: ret IL_0032: ldarg.0 IL_0033: ldc.i4.2 - IL_0034: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc + IL_0034: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc IL_0039: ldarg.0 IL_003a: ldc.i4.0 - IL_003b: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::current + IL_003b: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::current IL_0040: ldc.i4.0 IL_0041: ret - } // end of method 'f0@6-3'::GenerateNext + } // end of method f0@6::GenerateNext .method public strict virtual instance void Close() cil managed @@ -149,9 +149,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.2 - IL_0002: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc + IL_0002: stfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc IL_0007: ret - } // end of method 'f0@6-3'::Close + } // end of method f0@6::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -160,7 +160,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::pc IL_0006: switch ( IL_0019, IL_001b, @@ -192,7 +192,7 @@ IL_002b: ldc.i4.0 IL_002c: ret - } // end of method 'f0@6-3'::get_CheckClose + } // end of method f0@6::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -202,9 +202,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::current + IL_0001: ldfld int32 SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::current IL_0006: ret - } // end of method 'f0@6-3'::get_LastGenerated + } // end of method f0@6::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -215,12 +215,12 @@ .maxstack 8 IL_0000: ldc.i4.0 IL_0001: ldc.i4.0 - IL_0002: newobj instance void SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::.ctor(int32, - int32) + IL_0002: newobj instance void SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::.ctor(int32, + int32) IL_0007: ret - } // end of method 'f0@6-3'::GetFreshEnumerator + } // end of method f0@6::GetFreshEnumerator - } // end of class 'f0@6-3' + } // end of class f0@6 .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1 f0() cil managed @@ -230,8 +230,8 @@ .line 6,6 : 9,24 '' IL_0000: ldc.i4.0 IL_0001: ldc.i4.0 - IL_0002: newobj instance void SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/'f0@6-3'::.ctor(int32, - int32) + IL_0002: newobj instance void SeqExpressionSteppingTest1/SeqExpressionSteppingTest1/f0@6::.ctor(int32, + int32) IL_0007: ret } // end of method SeqExpressionSteppingTest1::f0 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl index 04070696eb0..f17100b6b91 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest2.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000338 Length: 0x00000000 } .module SeqExpressionSteppingTest2.exe -// MVID: {5BF2D3C6-2432-951E-A745-0383C6D3F25B} +// MVID: {5C6C932B-74C9-FC32-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A90000 +// Image base: 0x010F0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f1@5-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname f1@5 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -83,14 +83,14 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc + IL_0002: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current + IL_0009: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current IL_000e: ldarg.0 IL_000f: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0014: ret - } // end of method 'f1@5-3'::.ctor + } // end of method f1@5::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -100,7 +100,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest2.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -136,11 +136,11 @@ IL_003a: pop IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc + IL_003d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc .line 6,6 : 15,22 '' IL_0042: ldarg.0 IL_0043: ldc.i4.1 - IL_0044: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current + IL_0044: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current IL_0049: ldc.i4.1 IL_004a: ret @@ -151,23 +151,23 @@ IL_005a: pop IL_005b: ldarg.0 IL_005c: ldc.i4.2 - IL_005d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc + IL_005d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc .line 8,8 : 15,22 '' IL_0062: ldarg.0 IL_0063: ldc.i4.2 - IL_0064: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current + IL_0064: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current IL_0069: ldc.i4.1 IL_006a: ret IL_006b: ldarg.0 IL_006c: ldc.i4.3 - IL_006d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc + IL_006d: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc IL_0072: ldarg.0 IL_0073: ldc.i4.0 - IL_0074: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current + IL_0074: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current IL_0079: ldc.i4.0 IL_007a: ret - } // end of method 'f1@5-3'::GenerateNext + } // end of method f1@5::GenerateNext .method public strict virtual instance void Close() cil managed @@ -176,9 +176,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.3 - IL_0002: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc + IL_0002: stfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc IL_0007: ret - } // end of method 'f1@5-3'::Close + } // end of method f1@5::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -187,7 +187,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::pc IL_0006: switch ( IL_001d, IL_001f, @@ -229,7 +229,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'f1@5-3'::get_CheckClose + } // end of method f1@5::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -239,9 +239,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::current + IL_0001: ldfld int32 SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::current IL_0006: ret - } // end of method 'f1@5-3'::get_LastGenerated + } // end of method f1@5::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -252,12 +252,12 @@ .maxstack 8 IL_0000: ldc.i4.0 IL_0001: ldc.i4.0 - IL_0002: newobj instance void SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::.ctor(int32, - int32) + IL_0002: newobj instance void SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::.ctor(int32, + int32) IL_0007: ret - } // end of method 'f1@5-3'::GetFreshEnumerator + } // end of method f1@5::GetFreshEnumerator - } // end of class 'f1@5-3' + } // end of class f1@5 .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1 f1() cil managed @@ -267,8 +267,8 @@ .line 5,8 : 9,24 '' IL_0000: ldc.i4.0 IL_0001: ldc.i4.0 - IL_0002: newobj instance void SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/'f1@5-3'::.ctor(int32, - int32) + IL_0002: newobj instance void SeqExpressionSteppingTest2/SeqExpressionSteppingTest2/f1@5::.ctor(int32, + int32) IL_0007: ret } // end of method SeqExpressionSteppingTest2::f1 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl index 17e65e7d61a..012d9db3253 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest3.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000350 Length: 0x00000000 } .module SeqExpressionSteppingTest3.exe -// MVID: {5BF2D3C6-2432-943F-A745-0383C6D3F25B} +// MVID: {5C6C932B-A424-AAE4-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01150000 +// Image base: 0x003B0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f2@6-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname f2@6 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1> { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -85,17 +85,17 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x + IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc + IL_0009: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::current + IL_0010: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::current IL_0015: ldarg.0 IL_0016: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1>::.ctor() IL_001b: ret - } // end of method 'f2@6-3'::.ctor + } // end of method f2@6::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1>& next) cil managed @@ -105,7 +105,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest3.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -129,14 +129,14 @@ IL_0021: nop .line 6,6 : 21,27 '' IL_0022: ldarg.0 - IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x + IL_0023: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x IL_0028: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_002d: ldc.i4.4 IL_002e: bge.s IL_0064 .line 7,7 : 18,24 '' IL_0030: ldarg.0 - IL_0031: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x + IL_0031: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x IL_0036: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_003b: nop .line 8,8 : 18,33 '' @@ -146,12 +146,12 @@ IL_004b: pop IL_004c: ldarg.0 IL_004d: ldc.i4.1 - IL_004e: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc + IL_004e: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc .line 9,9 : 18,25 '' IL_0053: ldarg.0 IL_0054: ldarg.0 - IL_0055: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x - IL_005a: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::current + IL_0055: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x + IL_005a: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::current IL_005f: ldc.i4.1 IL_0060: ret @@ -161,13 +161,13 @@ IL_0064: ldarg.0 IL_0065: ldc.i4.2 - IL_0066: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc + IL_0066: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc IL_006b: ldarg.0 IL_006c: ldnull - IL_006d: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::current + IL_006d: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::current IL_0072: ldc.i4.0 IL_0073: ret - } // end of method 'f2@6-3'::GenerateNext + } // end of method f2@6::GenerateNext .method public strict virtual instance void Close() cil managed @@ -176,9 +176,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.2 - IL_0002: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc + IL_0002: stfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc IL_0007: ret - } // end of method 'f2@6-3'::Close + } // end of method f2@6::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -187,7 +187,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::pc IL_0006: switch ( IL_0019, IL_001b, @@ -219,7 +219,7 @@ IL_002b: ldc.i4.0 IL_002c: ret - } // end of method 'f2@6-3'::get_CheckClose + } // end of method f2@6::get_CheckClose .method public strict virtual instance class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 get_LastGenerated() cil managed @@ -229,9 +229,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::current + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::current IL_0006: ret - } // end of method 'f2@6-3'::get_LastGenerated + } // end of method f2@6::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1> GetFreshEnumerator() cil managed @@ -241,16 +241,16 @@ // Code size 14 (0xe) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::x + IL_0001: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::x IL_0006: ldc.i4.0 IL_0007: ldnull - IL_0008: newobj instance void SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_0008: newobj instance void SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000d: ret - } // end of method 'f2@6-3'::GetFreshEnumerator + } // end of method f2@6::GetFreshEnumerator - } // end of class 'f2@6-3' + } // end of class f2@6 .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1> f2() cil managed @@ -266,9 +266,9 @@ IL_0007: ldloc.0 IL_0008: ldc.i4.0 IL_0009: ldnull - IL_000a: newobj instance void SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/'f2@6-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) + IL_000a: newobj instance void SeqExpressionSteppingTest3/SeqExpressionSteppingTest3/f2@6::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_000f: ret } // end of method SeqExpressionSteppingTest3::f2 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl index 1c0464c3307..952211cb6bb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest4.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000338 Length: 0x00000000 } .module SeqExpressionSteppingTest4.exe -// MVID: {5BF2D3C6-2432-93E0-A745-0383C6D3F25B} +// MVID: {5C6C932B-E627-5A98-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00210000 +// Image base: 0x00960000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f3@5-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname f3@5 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -87,20 +87,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x + IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y + IL_0009: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc + IL_0010: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current + IL_0018: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'f3@5-3'::.ctor + } // end of method f3@5::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -111,7 +111,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest4.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -144,69 +144,69 @@ IL_002e: ldarg.0 IL_002f: ldc.i4.0 IL_0030: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) - IL_0035: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x + IL_0035: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x .line 6,6 : 15,21 '' IL_003a: ldarg.0 - IL_003b: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x + IL_003b: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x IL_0040: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0045: nop .line 7,7 : 15,28 '' IL_0046: ldarg.0 IL_0047: ldc.i4.0 IL_0048: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) - IL_004d: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y + IL_004d: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y .line 8,8 : 15,21 '' IL_0052: ldarg.0 - IL_0053: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y + IL_0053: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y IL_0058: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_005d: nop IL_005e: ldarg.0 IL_005f: ldc.i4.1 - IL_0060: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc + IL_0060: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc .line 9,9 : 15,23 '' IL_0065: ldarg.0 IL_0066: ldarg.0 - IL_0067: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x + IL_0067: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x IL_006c: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) - IL_0071: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current + IL_0071: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current IL_0076: ldc.i4.1 IL_0077: ret .line 10,10 : 15,30 '' IL_0078: ldarg.0 - IL_0079: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x + IL_0079: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x IL_007e: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0083: ldarg.0 - IL_0084: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y + IL_0084: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y IL_0089: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_008e: add IL_008f: stloc.0 IL_0090: ldarg.0 IL_0091: ldc.i4.2 - IL_0092: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc + IL_0092: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc .line 11,11 : 15,22 '' IL_0097: ldarg.0 IL_0098: ldloc.0 - IL_0099: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current + IL_0099: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current IL_009e: ldc.i4.1 IL_009f: ret .line 7,7 : 19,20 '' IL_00a0: ldarg.0 IL_00a1: ldnull - IL_00a2: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::y + IL_00a2: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::y IL_00a7: ldarg.0 IL_00a8: ldnull - IL_00a9: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::x + IL_00a9: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::x IL_00ae: ldarg.0 IL_00af: ldc.i4.3 - IL_00b0: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc + IL_00b0: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc IL_00b5: ldarg.0 IL_00b6: ldc.i4.0 - IL_00b7: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current + IL_00b7: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current IL_00bc: ldc.i4.0 IL_00bd: ret - } // end of method 'f3@5-3'::GenerateNext + } // end of method f3@5::GenerateNext .method public strict virtual instance void Close() cil managed @@ -215,9 +215,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.3 - IL_0002: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc + IL_0002: stfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc IL_0007: ret - } // end of method 'f3@5-3'::Close + } // end of method f3@5::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -226,7 +226,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::pc IL_0006: switch ( IL_001d, IL_001f, @@ -268,7 +268,7 @@ IL_0036: ldc.i4.0 IL_0037: ret - } // end of method 'f3@5-3'::get_CheckClose + } // end of method f3@5::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -278,9 +278,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::current + IL_0001: ldfld int32 SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::current IL_0006: ret - } // end of method 'f3@5-3'::get_LastGenerated + } // end of method f3@5::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -293,14 +293,14 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + int32) IL_0009: ret - } // end of method 'f3@5-3'::GetFreshEnumerator + } // end of method f3@5::GetFreshEnumerator - } // end of class 'f3@5-3' + } // end of class f3@5 .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1 f3() cil managed @@ -312,10 +312,10 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/'f3@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest4/SeqExpressionSteppingTest4/f3@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + int32) IL_0009: ret } // end of method SeqExpressionSteppingTest4::f3 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl index e19cdaddb31..e2e39952483 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest5.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000338 Length: 0x00000000 } .module SeqExpressionSteppingTest5.exe -// MVID: {5BF2D3C6-2432-9401-A745-0383C6D3F25B} +// MVID: {5C6C932B-1582-094B-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00B50000 +// Image base: 0x015E0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f4@5-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname f4@5 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -87,20 +87,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x + IL_0002: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y + IL_0009: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_0010: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current + IL_0018: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'f4@5-3'::.ctor + } // end of method f4@5::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -111,7 +111,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest5.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -151,60 +151,60 @@ IL_003a: ldarg.0 IL_003b: ldc.i4.0 IL_003c: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) - IL_0041: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x + IL_0041: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x IL_0046: ldarg.0 IL_0047: ldc.i4.1 - IL_0048: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_0048: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc .line 7,7 : 19,32 '' IL_004d: ldarg.0 IL_004e: ldc.i4.0 IL_004f: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) - IL_0054: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y + IL_0054: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y .line 8,8 : 19,25 '' IL_0059: ldarg.0 - IL_005a: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y + IL_005a: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y IL_005f: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0064: nop IL_0065: ldarg.0 IL_0066: ldc.i4.2 - IL_0067: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_0067: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc .line 9,9 : 19,27 '' IL_006c: ldarg.0 IL_006d: ldarg.0 - IL_006e: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x + IL_006e: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x IL_0073: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) - IL_0078: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current + IL_0078: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current IL_007d: ldc.i4.1 IL_007e: ret .line 10,10 : 19,34 '' IL_007f: ldarg.0 - IL_0080: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x + IL_0080: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x IL_0085: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_008a: ldarg.0 - IL_008b: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y + IL_008b: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y IL_0090: call !!0 [FSharp.Core]Microsoft.FSharp.Core.Operators::op_Dereference(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_0095: add IL_0096: stloc.0 IL_0097: ldarg.0 IL_0098: ldc.i4.3 - IL_0099: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_0099: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc .line 11,11 : 19,26 '' IL_009e: ldarg.0 IL_009f: ldloc.0 - IL_00a0: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current + IL_00a0: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current IL_00a5: ldc.i4.1 IL_00a6: ret IL_00a7: ldarg.0 IL_00a8: ldnull - IL_00a9: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::y + IL_00a9: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::y IL_00ae: ldarg.0 IL_00af: ldc.i4.4 - IL_00b0: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_00b0: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc .line 13,13 : 18,24 '' IL_00b5: ldarg.0 - IL_00b6: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x + IL_00b6: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x IL_00bb: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_00c0: nop .line 14,14 : 18,32 '' @@ -214,16 +214,16 @@ IL_00d0: pop IL_00d1: ldarg.0 IL_00d2: ldnull - IL_00d3: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x + IL_00d3: stfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x IL_00d8: ldarg.0 IL_00d9: ldc.i4.4 - IL_00da: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_00da: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc IL_00df: ldarg.0 IL_00e0: ldc.i4.0 - IL_00e1: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current + IL_00e1: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current IL_00e6: ldc.i4.0 IL_00e7: ret - } // end of method 'f4@5-3'::GenerateNext + } // end of method f4@5::GenerateNext .method public strict virtual instance void Close() cil managed @@ -235,7 +235,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc IL_0006: ldc.i4.4 IL_0007: sub IL_0008: switch ( @@ -251,7 +251,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_001b: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc IL_0020: switch ( IL_003b, IL_003d, @@ -300,10 +300,10 @@ IL_0058: nop IL_0059: ldarg.0 IL_005a: ldc.i4.4 - IL_005b: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_005b: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc .line 13,13 : 18,24 '' IL_0060: ldarg.0 - IL_0061: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::x + IL_0061: ldfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::x IL_0066: call void [FSharp.Core]Microsoft.FSharp.Core.Operators::Increment(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1) IL_006b: nop .line 14,14 : 18,32 '' @@ -315,10 +315,10 @@ IL_007c: nop IL_007d: ldarg.0 IL_007e: ldc.i4.4 - IL_007f: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_007f: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc IL_0084: ldarg.0 IL_0085: ldc.i4.0 - IL_0086: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current + IL_0086: stfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current IL_008b: ldnull IL_008c: stloc.1 IL_008d: leave.s IL_009b @@ -358,7 +358,7 @@ .line 100001,100001 : 0,0 '' IL_00af: ret - } // end of method 'f4@5-3'::Close + } // end of method f4@5::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -367,7 +367,7 @@ .maxstack 5 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::pc IL_0006: switch ( IL_0021, IL_0023, @@ -419,7 +419,7 @@ IL_0041: ldc.i4.0 IL_0042: ret - } // end of method 'f4@5-3'::get_CheckClose + } // end of method f4@5::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -429,9 +429,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::current + IL_0001: ldfld int32 SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::current IL_0006: ret - } // end of method 'f4@5-3'::get_LastGenerated + } // end of method f4@5::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -444,14 +444,14 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + int32) IL_0009: ret - } // end of method 'f4@5-3'::GetFreshEnumerator + } // end of method f4@5::GetFreshEnumerator - } // end of class 'f4@5-3' + } // end of class f4@5 .method public static class [mscorlib]System.Collections.Generic.IEnumerable`1 f4() cil managed @@ -463,10 +463,10 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/'f4@5-3'::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest5/SeqExpressionSteppingTest5/f4@5::.ctor(class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1, + int32, + int32) IL_0009: ret } // end of method SeqExpressionSteppingTest5::f4 diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl index db58fbe634b..25b1be9efa7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest6.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000378 Length: 0x00000000 } .module SeqExpressionSteppingTest6.exe -// MVID: {5BF2D3C6-2432-94A2-A745-0383C6D3F25B} +// MVID: {5C6C932B-F25D-FA4A-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02480000 +// Image base: 0x01260000 // =============== CLASS MEMBERS DECLARATION =================== @@ -63,7 +63,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f7@6-3' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname f7@6 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -93,20 +93,20 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' + IL_0002: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 + IL_0009: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 IL_000e: ldarg.0 IL_000f: ldarg.3 - IL_0010: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0010: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_0015: ldarg.0 IL_0016: ldarg.s current - IL_0018: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current + IL_0018: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current IL_001d: ldarg.0 IL_001e: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0023: ret - } // end of method 'f7@6-3'::.ctor + } // end of method f7@6::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -118,7 +118,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest6.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -165,18 +165,18 @@ IL_0046: ldarg.0 IL_0047: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6::get_es() IL_004c: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_0051: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' + IL_0051: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' IL_0056: ldarg.0 IL_0057: ldc.i4.1 - IL_0058: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0058: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc .line 6,8 : 15,25 '' IL_005d: ldarg.0 - IL_005e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' + IL_005e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' IL_0063: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_0068: brfalse.s IL_0099 IL_006a: ldarg.0 - IL_006b: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' + IL_006b: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' IL_0070: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_0075: stloc.0 .line 7,7 : 18,33 '' @@ -186,11 +186,11 @@ IL_0085: pop IL_0086: ldarg.0 IL_0087: ldc.i4.2 - IL_0088: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0088: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc .line 8,8 : 18,25 '' IL_008d: ldarg.0 IL_008e: ldloc.0 - IL_008f: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current + IL_008f: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current IL_0094: ldc.i4.1 IL_0095: ret @@ -200,31 +200,31 @@ IL_0099: ldarg.0 IL_009a: ldc.i4.5 - IL_009b: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_009b: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc .line 6,8 : 15,25 '' IL_00a0: ldarg.0 - IL_00a1: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' + IL_00a1: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' IL_00a6: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_00ab: nop IL_00ac: ldarg.0 IL_00ad: ldnull - IL_00ae: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' + IL_00ae: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' .line 9,11 : 15,25 '' IL_00b3: ldarg.0 IL_00b4: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6::get_es() IL_00b9: callvirt instance class [mscorlib]System.Collections.Generic.IEnumerator`1 class [mscorlib]System.Collections.Generic.IEnumerable`1::GetEnumerator() - IL_00be: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 + IL_00be: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 IL_00c3: ldarg.0 IL_00c4: ldc.i4.3 - IL_00c5: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_00c5: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc .line 9,11 : 15,25 '' IL_00ca: ldarg.0 - IL_00cb: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 + IL_00cb: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 IL_00d0: callvirt instance bool [mscorlib]System.Collections.IEnumerator::MoveNext() IL_00d5: brfalse.s IL_0106 IL_00d7: ldarg.0 - IL_00d8: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 + IL_00d8: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 IL_00dd: callvirt instance !0 class [mscorlib]System.Collections.Generic.IEnumerator`1::get_Current() IL_00e2: stloc.1 .line 10,10 : 18,35 '' @@ -234,11 +234,11 @@ IL_00f2: pop IL_00f3: ldarg.0 IL_00f4: ldc.i4.4 - IL_00f5: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_00f5: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc .line 11,11 : 18,25 '' IL_00fa: ldarg.0 IL_00fb: ldloc.1 - IL_00fc: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current + IL_00fc: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current IL_0101: ldc.i4.1 IL_0102: ret @@ -248,24 +248,24 @@ IL_0106: ldarg.0 IL_0107: ldc.i4.5 - IL_0108: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0108: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc .line 9,11 : 15,25 '' IL_010d: ldarg.0 - IL_010e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 + IL_010e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 IL_0113: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0118: nop IL_0119: ldarg.0 IL_011a: ldnull - IL_011b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 + IL_011b: stfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 IL_0120: ldarg.0 IL_0121: ldc.i4.5 - IL_0122: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0122: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_0127: ldarg.0 IL_0128: ldc.i4.0 - IL_0129: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current + IL_0129: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current IL_012e: ldc.i4.0 IL_012f: ret - } // end of method 'f7@6-3'::GenerateNext + } // end of method f7@6::GenerateNext .method public strict virtual instance void Close() cil managed @@ -277,7 +277,7 @@ [2] class [mscorlib]System.Exception e) .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_0006: ldc.i4.5 IL_0007: sub IL_0008: switch ( @@ -293,7 +293,7 @@ .try { IL_001a: ldarg.0 - IL_001b: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_001b: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_0020: switch ( IL_003f, IL_0041, @@ -345,9 +345,9 @@ IL_005e: nop IL_005f: ldarg.0 IL_0060: ldc.i4.5 - IL_0061: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0061: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_0066: ldarg.0 - IL_0067: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::enum0 + IL_0067: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::enum0 IL_006c: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0071: nop .line 100001,100001 : 0,0 '' @@ -358,19 +358,19 @@ IL_0075: nop IL_0076: ldarg.0 IL_0077: ldc.i4.5 - IL_0078: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0078: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_007d: ldarg.0 - IL_007e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::'enum' + IL_007e: ldfld class [mscorlib]System.Collections.Generic.IEnumerator`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::'enum' IL_0083: call void [FSharp.Core]Microsoft.FSharp.Core.LanguagePrimitives/IntrinsicFunctions::Dispose>(!!0) IL_0088: nop .line 100001,100001 : 0,0 '' IL_0089: nop IL_008a: ldarg.0 IL_008b: ldc.i4.5 - IL_008c: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_008c: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_0091: ldarg.0 IL_0092: ldc.i4.0 - IL_0093: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current + IL_0093: stfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current IL_0098: ldnull IL_0099: stloc.1 IL_009a: leave.s IL_00a8 @@ -410,7 +410,7 @@ .line 100001,100001 : 0,0 '' IL_00bc: ret - } // end of method 'f7@6-3'::Close + } // end of method f7@6::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -419,7 +419,7 @@ .maxstack 5 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::pc + IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::pc IL_0006: switch ( IL_0025, IL_0027, @@ -481,7 +481,7 @@ IL_004c: ldc.i4.0 IL_004d: ret - } // end of method 'f7@6-3'::get_CheckClose + } // end of method f7@6::get_CheckClose .method public strict virtual instance int32 get_LastGenerated() cil managed @@ -491,9 +491,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::current + IL_0001: ldfld int32 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::current IL_0006: ret - } // end of method 'f7@6-3'::get_LastGenerated + } // end of method f7@6::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -506,21 +506,21 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0009: ret - } // end of method 'f7@6-3'::GetFreshEnumerator + } // end of method f7@6::GetFreshEnumerator - } // end of class 'f7@6-3' + } // end of class f7@6 .method public specialname static class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 get_es() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$SeqExpressionSteppingTest6::'es@4-6' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$SeqExpressionSteppingTest6::es@4 IL_0005: ret } // end of method SeqExpressionSteppingTest6::get_es @@ -534,10 +534,10 @@ IL_0001: ldnull IL_0002: ldc.i4.0 IL_0003: ldc.i4.0 - IL_0004: newobj instance void SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/'f7@6-3'::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, - class [mscorlib]System.Collections.Generic.IEnumerator`1, - int32, - int32) + IL_0004: newobj instance void SeqExpressionSteppingTest6/SeqExpressionSteppingTest6/f7@6::.ctor(class [mscorlib]System.Collections.Generic.IEnumerator`1, + class [mscorlib]System.Collections.Generic.IEnumerator`1, + int32, + int32) IL_0009: ret } // end of method SeqExpressionSteppingTest6::f7 @@ -554,7 +554,7 @@ .class private abstract auto ansi sealed ''.$SeqExpressionSteppingTest6 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 'es@4-6' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 es@4 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -578,7 +578,7 @@ IL_0012: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1::Cons(!0, class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1) IL_0017: dup - IL_0018: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$SeqExpressionSteppingTest6::'es@4-6' + IL_0018: stsfld class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 ''.$SeqExpressionSteppingTest6::es@4 IL_001d: stloc.0 .line 13,13 : 13,31 '' IL_001e: call class [mscorlib]System.Collections.Generic.IEnumerable`1 SeqExpressionSteppingTest6/SeqExpressionSteppingTest6::f7() diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl index 1088c1b7fca..6f0f52b1d05 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionStepping/SeqExpressionSteppingTest7.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.SeqExpressionSteppingTest7 { - // Offset: 0x00000278 Length: 0x00000006 + // Offset: 0x00000278 Length: 0x00000007 } .mresource public FSharpOptimizationData.SeqExpressionSteppingTest7 { @@ -44,13 +44,13 @@ // Offset: 0x00000328 Length: 0x00000000 } .module SeqExpressionSteppingTest7.exe -// MVID: {5BF2D3C6-2432-93C3-A745-0383C6D3F25B} +// MVID: {5C6C932B-21B8-A8FD-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x03150000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto autochar serializable sealed nested assembly beforefieldinit specialname 'f@5-11' + .class auto autochar serializable sealed nested assembly beforefieldinit specialname f@5 extends class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1 { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 06 00 00 00 00 00 ) @@ -79,14 +79,14 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldarg.1 - IL_0002: stfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc + IL_0002: stfld int32 class SeqExpressionSteppingTest7/f@5::pc IL_0007: ldarg.0 IL_0008: ldarg.2 - IL_0009: stfld !0 class SeqExpressionSteppingTest7/'f@5-11'::current + IL_0009: stfld !0 class SeqExpressionSteppingTest7/f@5::current IL_000e: ldarg.0 IL_000f: call instance void class [FSharp.Core]Microsoft.FSharp.Core.CompilerServices.GeneratedSequenceBase`1::.ctor() IL_0014: ret - } // end of method 'f@5-11'::.ctor + } // end of method f@5::.ctor .method public strict virtual instance int32 GenerateNext(class [mscorlib]System.Collections.Generic.IEnumerable`1& next) cil managed @@ -98,7 +98,7 @@ .language '{AB4F38C9-B6E6-43BA-BE3B-58080B2CCCE3}', '{994B45C4-E6E9-11D2-903F-00C04FA302A1}', '{5A869D0B-6611-11D3-BD2A-0000F80849BD}' .line 100001,100001 : 0,0 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\SeqExpressionStepping\\SeqExpressionSteppingTest7.fs' IL_0000: ldarg.0 - IL_0001: ldfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc + IL_0001: ldfld int32 class SeqExpressionSteppingTest7/f@5::pc IL_0006: ldc.i4.1 IL_0007: sub IL_0008: switch ( @@ -139,7 +139,7 @@ IL_003a: stloc.0 IL_003b: ldarg.0 IL_003c: ldc.i4.1 - IL_003d: stfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc + IL_003d: stfld int32 class SeqExpressionSteppingTest7/f@5::pc .line 5,5 : 44,55 '' IL_0042: ldarg.1 IL_0043: ldc.i4.0 @@ -167,13 +167,13 @@ IL_0060: nop IL_0061: ldarg.0 IL_0062: ldc.i4.2 - IL_0063: stfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc + IL_0063: stfld int32 class SeqExpressionSteppingTest7/f@5::pc IL_0068: ldarg.0 IL_0069: ldloc.1 - IL_006a: stfld !0 class SeqExpressionSteppingTest7/'f@5-11'::current + IL_006a: stfld !0 class SeqExpressionSteppingTest7/f@5::current IL_006f: ldc.i4.0 IL_0070: ret - } // end of method 'f@5-11'::GenerateNext + } // end of method f@5::GenerateNext .method public strict virtual instance void Close() cil managed @@ -182,9 +182,9 @@ .maxstack 8 IL_0000: ldarg.0 IL_0001: ldc.i4.2 - IL_0002: stfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc + IL_0002: stfld int32 class SeqExpressionSteppingTest7/f@5::pc IL_0007: ret - } // end of method 'f@5-11'::Close + } // end of method f@5::Close .method public strict virtual instance bool get_CheckClose() cil managed @@ -193,7 +193,7 @@ .maxstack 8 .line 100001,100001 : 0,0 '' IL_0000: ldarg.0 - IL_0001: ldfld int32 class SeqExpressionSteppingTest7/'f@5-11'::pc + IL_0001: ldfld int32 class SeqExpressionSteppingTest7/f@5::pc IL_0006: switch ( IL_0019, IL_001b, @@ -227,7 +227,7 @@ IL_002b: nop IL_002c: ldc.i4.0 IL_002d: ret - } // end of method 'f@5-11'::get_CheckClose + } // end of method f@5::get_CheckClose .method public strict virtual instance !a get_LastGenerated() cil managed @@ -237,9 +237,9 @@ // Code size 7 (0x7) .maxstack 8 IL_0000: ldarg.0 - IL_0001: ldfld !0 class SeqExpressionSteppingTest7/'f@5-11'::current + IL_0001: ldfld !0 class SeqExpressionSteppingTest7/f@5::current IL_0006: ret - } // end of method 'f@5-11'::get_LastGenerated + } // end of method f@5::get_LastGenerated .method public strict virtual instance class [mscorlib]System.Collections.Generic.IEnumerator`1 GetFreshEnumerator() cil managed @@ -251,19 +251,19 @@ .locals init (!a V_0) IL_0000: ldc.i4.0 IL_0001: ldloc.0 - IL_0002: newobj instance void class SeqExpressionSteppingTest7/'f@5-11'::.ctor(int32, - !0) + IL_0002: newobj instance void class SeqExpressionSteppingTest7/f@5::.ctor(int32, + !0) IL_0007: ret - } // end of method 'f@5-11'::GetFreshEnumerator + } // end of method f@5::GetFreshEnumerator - } // end of class 'f@5-11' + } // end of class f@5 .method public specialname static class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 get_r() cil managed { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ''.$SeqExpressionSteppingTest7::'r@4-32' + IL_0000: ldsfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ''.$SeqExpressionSteppingTest7::r@4 IL_0005: ret } // end of method SeqExpressionSteppingTest7::get_r @@ -276,8 +276,8 @@ .line 5,5 : 12,57 '' IL_0000: ldc.i4.0 IL_0001: ldloc.0 - IL_0002: newobj instance void class SeqExpressionSteppingTest7/'f@5-11'::.ctor(int32, - !0) + IL_0002: newobj instance void class SeqExpressionSteppingTest7/f@5::.ctor(int32, + !0) IL_0007: tail. IL_0009: call class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 [FSharp.Core]Microsoft.FSharp.Collections.SeqModule::ToList(class [mscorlib]System.Collections.Generic.IEnumerable`1) IL_000e: ret @@ -294,7 +294,7 @@ .class private abstract auto ansi sealed ''.$SeqExpressionSteppingTest7 extends [mscorlib]System.Object { - .field static assembly class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 'r@4-32' + .field static assembly class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 r@4 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -315,7 +315,7 @@ IL_0000: ldc.i4.0 IL_0001: call class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 [FSharp.Core]Microsoft.FSharp.Core.Operators::Ref(!!0) IL_0006: dup - IL_0007: stsfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ''.$SeqExpressionSteppingTest7::'r@4-32' + IL_0007: stsfld class [FSharp.Core]Microsoft.FSharp.Core.FSharpRef`1 ''.$SeqExpressionSteppingTest7::r@4 IL_000c: stloc.0 .line 6,6 : 1,19 '' IL_000d: ldstr "res = %A" diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl index 84d76337574..f8f309e3456 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002C8 Length: 0x00000000 } .module SeqExpressionTailCalls01.exe -// MVID: {5BF2DEA9-093A-A6BE-A745-0383A9DEF25B} +// MVID: {5C6C932B-78CB-49A7-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012E0000 +// Image base: 0x00310000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl index 5c8cea931f7..1bc34c3aa9a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SeqExpressionTailCalls/SeqExpressionTailCalls02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000320 Length: 0x00000000 } .module SeqExpressionTailCalls02.exe -// MVID: {5BF2DEA9-093A-EC43-A745-0383A9DEF25B} +// MVID: {5C6C932B-3D3A-FB43-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x030C0000 +// Image base: 0x01300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl index f504445fa01..9942ef5ef74 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/LetBinding01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000240 Length: 0x00000000 } .module LetBinding01.exe -// MVID: {5BF2D3CD-269D-BEEF-A745-0383CDD3F25B} +// MVID: {5C6C932B-5C17-B285-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x010B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl index fad636a18e4..76e9baec9e7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Class01.il.bsl @@ -29,7 +29,7 @@ } .mresource public FSharpSignatureData.StaticInit_Class01 { - // Offset: 0x00000000 Length: 0x0000033E + // Offset: 0x00000000 Length: 0x0000033D } .mresource public FSharpSignatureDataB.StaticInit_Class01 { @@ -44,13 +44,13 @@ // Offset: 0x00000418 Length: 0x00000003 } .module StaticInit_Class01.dll -// MVID: {5BF2D3CD-EC34-E66E-A745-0383CDD3F25B} +// MVID: {5C6C932B-A030-4E6D-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C90000 +// Image base: 0x00690000 // =============== CLASS MEMBERS DECLARATION =================== @@ -64,7 +64,7 @@ { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 03 00 00 00 00 00 ) .field static assembly int32 x - .field static assembly int32 'init@4-17' + .field static assembly int32 'init@4-1' .method public specialname rtspecialname instance void .ctor(valuetype [mscorlib]System.DateTime s) cil managed { @@ -87,7 +87,7 @@ .maxstack 8 .line 7,7 : 23,37 '' IL_0000: volatile. - IL_0002: ldsfld int32 StaticInit_ClassS01/C::'init@4-17' + IL_0002: ldsfld int32 StaticInit_ClassS01/C::'init@4-1' IL_0007: ldc.i4.1 IL_0008: bge.s IL_000c @@ -146,7 +146,7 @@ IL_000a: stsfld int32 StaticInit_ClassS01/C::x IL_000f: ldc.i4.1 IL_0010: volatile. - IL_0012: stsfld int32 StaticInit_ClassS01/C::'init@4-17' + IL_0012: stsfld int32 StaticInit_ClassS01/C::'init@4-1' .line 4,4 : 6,7 '' IL_0017: ret } // end of method $StaticInit_ClassS01::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl index 5c44ab5a27d..0f31c26c331 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000003A8 Length: 0x00000000 } .module StaticInit_Module01.dll -// MVID: {5BF2D3CD-705F-DF4F-A745-0383CDD3F25B} +// MVID: {5C6C932B-6B9E-F72A-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00310000 +// Image base: 0x01000000 // =============== CLASS MEMBERS DECLARATION =================== @@ -72,7 +72,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$StaticInit_Module01::'y@7-93' + IL_0000: ldsfld int32 ''.$StaticInit_Module01::y@7 IL_0005: ret } // end of method N::get_y @@ -81,7 +81,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$StaticInit_Module01::'z@8-17' + IL_0000: ldsfld int32 ''.$StaticInit_Module01::z@8 IL_0005: ret } // end of method N::get_z @@ -102,7 +102,7 @@ { // Code size 6 (0x6) .maxstack 8 - IL_0000: ldsfld int32 ''.$StaticInit_Module01::'x@5-121' + IL_0000: ldsfld int32 ''.$StaticInit_Module01::'x@5-1' IL_0005: ret } // end of method M::get_x @@ -118,11 +118,11 @@ .class private abstract auto ansi sealed ''.$StaticInit_Module01 extends [mscorlib]System.Object { - .field static assembly initonly int32 'x@5-121' + .field static assembly initonly int32 'x@5-1' .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly initonly int32 'y@7-93' + .field static assembly initonly int32 y@7 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) - .field static assembly initonly int32 'z@8-17' + .field static assembly initonly int32 z@8 .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) .field static assembly int32 init@ .custom instance void [mscorlib]System.Diagnostics.DebuggerBrowsableAttribute::.ctor(valuetype [mscorlib]System.Diagnostics.DebuggerBrowsableState) = ( 01 00 00 00 00 00 00 00 ) @@ -141,7 +141,7 @@ IL_0000: ldstr "1" IL_0005: callvirt instance int32 [mscorlib]System.String::get_Length() IL_000a: dup - IL_000b: stsfld int32 ''.$StaticInit_Module01::'x@5-121' + IL_000b: stsfld int32 ''.$StaticInit_Module01::'x@5-1' IL_0010: stloc.0 .line 7,7 : 5,27 '' IL_0011: call int32 StaticInit_Module01/M::get_x() @@ -149,7 +149,7 @@ IL_001b: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0020: add IL_0021: dup - IL_0022: stsfld int32 ''.$StaticInit_Module01::'y@7-93' + IL_0022: stsfld int32 ''.$StaticInit_Module01::y@7 IL_0027: stloc.1 .line 8,8 : 5,27 '' IL_0028: call int32 StaticInit_Module01/M/N::get_y() @@ -157,7 +157,7 @@ IL_0032: callvirt instance int32 [mscorlib]System.String::get_Length() IL_0037: add IL_0038: dup - IL_0039: stsfld int32 ''.$StaticInit_Module01::'z@8-17' + IL_0039: stsfld int32 ''.$StaticInit_Module01::z@8 IL_003e: stloc.2 IL_003f: ret } // end of method $StaticInit_Module01::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl index b9c82dce033..80df9fbe194 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Struct01.il.bsl @@ -29,11 +29,11 @@ } .mresource public FSharpSignatureData.StaticInit_Struct01 { - // Offset: 0x00000000 Length: 0x000007A8 + // Offset: 0x00000000 Length: 0x000007A5 } .mresource public FSharpSignatureDataB.StaticInit_Struct01 { - // Offset: 0x000007B0 Length: 0x00000099 + // Offset: 0x000007B0 Length: 0x0000009B } .mresource public FSharpOptimizationData.StaticInit_Struct01 { @@ -44,13 +44,13 @@ // Offset: 0x00000A78 Length: 0x00000035 } .module StaticInit_Struct01.dll -// MVID: {5BF2D3CD-05F6-D6CB-A745-0383CDD3F25B} +// MVID: {5C6C932B-B529-9BEA-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01020000 +// Image base: 0x00AD0000 // =============== CLASS MEMBERS DECLARATION =================== @@ -69,7 +69,7 @@ { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 03 00 00 00 00 00 ) .field static assembly int32 x - .field static assembly int32 'init@4-16' + .field static assembly int32 init@4 .field assembly valuetype [mscorlib]System.DateTime s .method public hidebysig virtual final instance int32 CompareTo(valuetype StaticInit_Struct01/C obj) cil managed @@ -236,7 +236,7 @@ .maxstack 8 .line 7,7 : 23,37 '' IL_0000: volatile. - IL_0002: ldsfld int32 StaticInit_Struct01/C::'init@4-16' + IL_0002: ldsfld int32 StaticInit_Struct01/C::init@4 IL_0007: ldc.i4.1 IL_0008: bge.s IL_000c @@ -343,7 +343,7 @@ IL_000a: stsfld int32 StaticInit_Struct01/C::x IL_000f: ldc.i4.1 IL_0010: volatile. - IL_0012: stsfld int32 StaticInit_Struct01/C::'init@4-16' + IL_0012: stsfld int32 StaticInit_Struct01/C::init@4 .line 4,4 : 6,7 '' IL_0017: ret } // end of method $StaticInit_Struct01::.cctor diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl index adc1126dea5..11205700317 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.SteppingMatch01 { - // Offset: 0x00000220 Length: 0x00000005 + // Offset: 0x00000220 Length: 0x00000007 } .mresource public FSharpOptimizationData.SteppingMatch01 { @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module SteppingMatch01.dll -// MVID: {5BF2D3CD-ABFD-13F6-A745-0383CDD3F25B} +// MVID: {5C6C932B-8800-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02AE0000 +// Image base: 0x01250000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl index 6e2e3b05b18..cb7426bc48b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch02.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.SteppingMatch02 { - // Offset: 0x00000220 Length: 0x00000005 + // Offset: 0x00000220 Length: 0x00000007 } .mresource public FSharpOptimizationData.SteppingMatch02 { @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module SteppingMatch02.dll -// MVID: {5BF2D3CD-CAC2-C63D-A745-0383CDD3F25B} +// MVID: {5C6C932B-8401-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01710000 +// Image base: 0x012B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl index 720bc8d58cf..e7e10ca8faa 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch03.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.SteppingMatch03 { - // Offset: 0x00000238 Length: 0x00000006 + // Offset: 0x00000238 Length: 0x00000009 } .mresource public FSharpOptimizationData.SteppingMatch03 { @@ -44,13 +44,13 @@ // Offset: 0x000002C8 Length: 0x00000000 } .module SteppingMatch03.dll -// MVID: {5BF2D3CD-4E87-D110-A745-0383CDD3F25B} +// MVID: {5C6C932B-8002-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01410000 +// Image base: 0x00C20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl index 70b329c46d4..d0566b1659f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch04.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.SteppingMatch04 { - // Offset: 0x00000238 Length: 0x00000006 + // Offset: 0x00000238 Length: 0x00000009 } .mresource public FSharpOptimizationData.SteppingMatch04 { @@ -44,13 +44,13 @@ // Offset: 0x000002C8 Length: 0x00000000 } .module SteppingMatch04.dll -// MVID: {5BF2D3CD-6D4C-8357-A745-0383CDD3F25B} +// MVID: {5C6C932B-7BFB-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x03190000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl index 6a1e4f65a48..6950472a441 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch05.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.SteppingMatch05 { - // Offset: 0x00000238 Length: 0x00000006 + // Offset: 0x00000238 Length: 0x00000009 } .mresource public FSharpOptimizationData.SteppingMatch05 { @@ -44,13 +44,13 @@ // Offset: 0x000002C8 Length: 0x00000000 } .module SteppingMatch05.dll -// MVID: {5BF2D3CD-30E9-4ADA-A745-0383CDD3F25B} +// MVID: {5C6C932B-77FC-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03160000 +// Image base: 0x00680000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl index b0f6385be28..b72644640fe 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch06.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.SteppingMatch06 { - // Offset: 0x00000680 Length: 0x0000007B + // Offset: 0x00000680 Length: 0x0000007D } .mresource public FSharpOptimizationData.SteppingMatch06 { - // Offset: 0x00000700 Length: 0x000001D9 + // Offset: 0x00000708 Length: 0x000001D9 } .mresource public FSharpOptimizationDataB.SteppingMatch06 { - // Offset: 0x000008E0 Length: 0x0000002A + // Offset: 0x000008E8 Length: 0x0000002A } .module SteppingMatch06.dll -// MVID: {5BF2D3CD-4FAE-FD21-A745-0383CDD3F25B} +// MVID: {5C6C932B-73FD-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017A0000 +// Image base: 0x02FC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl index 20710e6eff9..4c4283a36de 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch07.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.SteppingMatch07 { - // Offset: 0x00000680 Length: 0x0000007B + // Offset: 0x00000680 Length: 0x0000007D } .mresource public FSharpOptimizationData.SteppingMatch07 { - // Offset: 0x00000700 Length: 0x000001D9 + // Offset: 0x00000708 Length: 0x000001D9 } .mresource public FSharpOptimizationDataB.SteppingMatch07 { - // Offset: 0x000008E0 Length: 0x0000002A + // Offset: 0x000008E8 Length: 0x0000002A } .module SteppingMatch07.dll -// MVID: {5BF2D3CD-D373-07F3-A745-0383CDD3F25B} +// MVID: {5C6C932B-6FFE-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CD0000 +// Image base: 0x01090000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl index 16fb299ec9a..00f2d8bfb9d 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch08.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module SteppingMatch08.dll -// MVID: {5BF2D3CD-F238-BA3A-A745-0383CDD3F25B} +// MVID: {5C6C932B-6A07-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02B80000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl index cd681a9e7dd..88f9aee3aa8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/SteppingMatch/SteppingMatch09.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.SteppingMatch09 { - // Offset: 0x00000320 Length: 0x00000012 + // Offset: 0x00000320 Length: 0x00000013 } .mresource public FSharpOptimizationData.SteppingMatch09 { @@ -44,13 +44,13 @@ // Offset: 0x00000428 Length: 0x00000000 } .module SteppingMatch09.dll -// MVID: {5BF32B72-4935-D6AC-A745-0383722BF35B} +// MVID: {5C6C932B-6608-E210-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007A0000 +// Image base: 0x00F20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl index dbae376dec4..5056cdd1ef9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall01.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TailCall01 { - // Offset: 0x00000228 Length: 0x00000007 + // Offset: 0x00000228 Length: 0x00000008 } .mresource public FSharpOptimizationData.TailCall01 { @@ -44,13 +44,13 @@ // Offset: 0x000002B8 Length: 0x00000000 } .module TailCall01.exe -// MVID: {5BF2DEA9-7D8F-CF4A-A745-0383A9DEF25B} +// MVID: {5C6C932B-B1B5-7213-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x00FF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl index db117ac1675..f93602c9f7c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A0 Length: 0x00000000 } .module TailCall02.exe -// MVID: {5BF2DEA9-7D8F-CE9D-A745-0383A9DEF25B} +// MVID: {5C6C932B-0C24-612C-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00730000 +// Image base: 0x01100000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl index e3a79ae4c66..5ce0ef5f583 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall03.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.TailCall03 { - // Offset: 0x00000248 Length: 0x0000000C + // Offset: 0x00000248 Length: 0x0000000D } .mresource public FSharpOptimizationData.TailCall03 { - // Offset: 0x00000258 Length: 0x0000007C + // Offset: 0x00000260 Length: 0x0000007C } .mresource public FSharpOptimizationDataB.TailCall03 { - // Offset: 0x000002D8 Length: 0x00000000 + // Offset: 0x000002E0 Length: 0x00000000 } .module TailCall03.exe -// MVID: {5BF2DEA9-7D8F-CE88-A745-0383A9DEF25B} +// MVID: {5C6C932B-A07F-6869-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x018A0000 +// Image base: 0x012F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl index e726e81367d..5e4c87c0aff 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall04.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TailCall04 { - // Offset: 0x00000238 Length: 0x00000008 + // Offset: 0x00000238 Length: 0x00000009 } .mresource public FSharpOptimizationData.TailCall04 { @@ -44,13 +44,13 @@ // Offset: 0x000002C8 Length: 0x00000000 } .module TailCall04.exe -// MVID: {5BF2DEA9-7D8F-CFE3-A745-0383A9DEF25B} +// MVID: {5C6C932B-9FC6-6CBD-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00EC0000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl index b6eb07a466b..56436fc9ea2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TailCalls/TailCall05.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TailCall05 { - // Offset: 0x00000248 Length: 0x0000000A + // Offset: 0x00000248 Length: 0x0000000B } .mresource public FSharpOptimizationData.TailCall05 { @@ -44,13 +44,13 @@ // Offset: 0x000002D8 Length: 0x00000000 } .module TailCall05.exe -// MVID: {5BF2DEA9-7D8F-CFC6-A745-0383A9DEF25B} +// MVID: {5C6C932B-3421-73FB-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00700000 +// Image base: 0x00D70000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl index 6c6431d7a0d..f4586814ea1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction1.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction1.exe -// MVID: {5BF2DEA9-65FC-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-173F-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00690000 +// Image base: 0x017B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl index 7af93d05cf7..14fd24131c8 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction10.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction10.exe -// MVID: {5BF2DEA9-A624-44FB-A745-0383A9DEF25B} +// MVID: {5C6C932B-9C9F-8748-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00730000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl index 3ad21b14aa7..2f0793edb26 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction13.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TestFunction13 { - // Offset: 0x00000218 Length: 0x00000006 + // Offset: 0x00000218 Length: 0x00000007 } .mresource public FSharpOptimizationData.TestFunction13 { @@ -44,13 +44,13 @@ // Offset: 0x000002A0 Length: 0x00000000 } .module TestFunction13.exe -// MVID: {5BF2DEA9-A624-451C-A745-0383A9DEF25B} +// MVID: {5C6C932B-BAC4-2C50-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02F00000 +// Image base: 0x012F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl index dfed6a61615..d3e69113061 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction14.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction14.exe -// MVID: {5BF2DEA9-A624-4587-A745-0383A9DEF25B} +// MVID: {5C6C932B-1F0B-8930-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FF0000 +// Image base: 0x00BF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl index f6b03567c69..75841c86509 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction16.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TestFunction16 { - // Offset: 0x00000690 Length: 0x0000007D + // Offset: 0x00000690 Length: 0x0000007F } .mresource public FSharpOptimizationData.TestFunction16 { @@ -44,13 +44,13 @@ // Offset: 0x000008F0 Length: 0x0000002A } .module TestFunction16.exe -// MVID: {5BF2DEA9-A624-45C5-A745-0383A9DEF25B} +// MVID: {5C6C932B-12D5-E97E-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F60000 +// Image base: 0x02D40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl index 8e4ad71535a..fb52b0564b5 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction17.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.TestFunction17 { - // Offset: 0x00000678 Length: 0x0000007C + // Offset: 0x00000678 Length: 0x0000007E } .mresource public FSharpOptimizationData.TestFunction17 { - // Offset: 0x000006F8 Length: 0x000001CD + // Offset: 0x00000700 Length: 0x000001CD } .mresource public FSharpOptimizationDataB.TestFunction17 { - // Offset: 0x000008D0 Length: 0x0000002A + // Offset: 0x000008D8 Length: 0x0000002A } .module TestFunction17.exe -// MVID: {5BF2DEA9-A624-45A8-A745-0383A9DEF25B} +// MVID: {5C6C932B-3D30-2E38-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CE0000 +// Image base: 0x00690000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl index fb9b9e9bb11..105c12d0958 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction19.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000490 Length: 0x0000000E } .module TestFunction19.exe -// MVID: {5BF2DEA9-A624-46AE-A745-0383A9DEF25B} +// MVID: {5C6C932B-9122-E342-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03080000 +// Image base: 0x010A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl index 8c2714d7ece..dcc15efc219 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction20.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000004D8 Length: 0x0000000E } .module TestFunction20.exe -// MVID: {5BF2DEA9-A643-44FB-A745-0383A9DEF25B} +// MVID: {5C6C932B-A09E-8748-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02DB0000 +// Image base: 0x00950000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl index 0d88f9b8b84..52814a3ee24 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction21.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.TestFunction21 { - // Offset: 0x00000680 Length: 0x0000007C + // Offset: 0x00000680 Length: 0x0000007E } .mresource public FSharpOptimizationData.TestFunction21 { - // Offset: 0x00000700 Length: 0x000001CD + // Offset: 0x00000708 Length: 0x000001CD } .mresource public FSharpOptimizationDataB.TestFunction21 { - // Offset: 0x000008D8 Length: 0x0000002A + // Offset: 0x000008E0 Length: 0x0000002A } .module TestFunction21.exe -// MVID: {5BF2DEA9-A643-45E6-A745-0383A9DEF25B} +// MVID: {5C6C932B-CFF9-35FA-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CA0000 +// Image base: 0x012E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl index 2888e614bd0..525e1ac0966 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction23.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TestFunction23 { - // Offset: 0x00000350 Length: 0x0000001B + // Offset: 0x00000350 Length: 0x0000001C } .mresource public FSharpOptimizationData.TestFunction23 { @@ -44,13 +44,13 @@ // Offset: 0x00000458 Length: 0x00000008 } .module TestFunction23.exe -// MVID: {5BF2DEA9-A643-451C-A745-0383A9DEF25B} +// MVID: {5C6C932B-BEC3-2C50-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x019E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl index 6b546ebc079..2e61558adb0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction24.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TestFunction24 { - // Offset: 0x00000758 Length: 0x00000088 + // Offset: 0x00000758 Length: 0x0000008A } .mresource public FSharpOptimizationData.TestFunction24 { @@ -44,13 +44,13 @@ // Offset: 0x00000A18 Length: 0x0000002A } .module TestFunction24.exe -// MVID: {5BF2DEA9-A643-4587-A745-0383A9DEF25B} +// MVID: {5C6C932B-230A-8930-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C10000 +// Image base: 0x01290000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl index 6b451c24795..d4e461227fb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3b.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3b.exe -// MVID: {5BF2DEA9-A662-4FC9-A745-0383A9DEF25B} +// MVID: {5C6C932B-8257-1603-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01220000 +// Image base: 0x01260000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl index 496a1071871..c569e9b4ab1 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction3c.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3c.exe -// MVID: {5BF2DEA9-A662-4FAC-A745-0383A9DEF25B} +// MVID: {5C6C932B-16B2-1D41-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01490000 +// Image base: 0x00300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl index 22cfee2b531..445880758cb 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/TestFunction9b4.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TestFunction9b4 { - // Offset: 0x00000250 Length: 0x00000005 + // Offset: 0x00000250 Length: 0x00000006 } .mresource public FSharpOptimizationData.TestFunction9b4 { @@ -44,13 +44,13 @@ // Offset: 0x000002F0 Length: 0x00000000 } .module TestFunction9b4.exe -// MVID: {5BF2DEA9-A091-56C1-A745-0383A9DEF25B} +// MVID: {5C6C932B-9FB1-31E1-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x014A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl index 2d512adb9aa..f2bebe1eab2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction11.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction11.exe -// MVID: {5BF2DEA9-A624-45E6-A745-0383A9DEF25B} +// MVID: {5C6C932B-CBFA-35FA-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C90000 +// Image base: 0x012D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl index 7c253aeb76d..67e94ff8670 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction12.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000268 Length: 0x00000000 } .module TestFunction12.exe -// MVID: {5BF2DEA9-A624-4539-A745-0383A9DEF25B} +// MVID: {5C6C932B-9069-E796-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CF0000 +// Image base: 0x015F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl index a64a8ca5634..31f26bea8b2 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction15.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction15.exe -// MVID: {5BF2DEA9-A624-4662-A745-0383A9DEF25B} +// MVID: {5C6C932B-4E66-37E2-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x011B0000 +// Image base: 0x007A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl index 522516812e5..8a7cdf987bd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction18.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.TestFunction18 { - // Offset: 0x000001F8 Length: 0x00000003 + // Offset: 0x000001F8 Length: 0x00000004 } .mresource public FSharpOptimizationData.TestFunction18 { @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module TestFunction18.exe -// MVID: {5BF2DEA9-A624-4603-A745-0383A9DEF25B} +// MVID: {5C6C932B-61C7-3490-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00730000 +// Image base: 0x01290000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl index 9b437414e76..14e2f6fc156 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction2.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction2.exe -// MVID: {5BF2DEA9-661D-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-0A82-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CA0000 +// Image base: 0x012E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl index 58173306300..a62aa7f5859 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D0 Length: 0x00000000 } .module Testfunction22.exe -// MVID: {5BF2DEA9-5AA3-4518-A745-0383A9DEF25B} +// MVID: {5C6C932B-35C8-D937-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00640000 +// Image base: 0x017B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl index c6da2a4f3a5..e3aba46a08e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22b.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22b.exe -// MVID: {5BF2DEA9-8504-18B7-A745-0383A9DEF25B} +// MVID: {5C6C932B-5346-F08B-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00400000 +// Image base: 0x010F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl index d4de1d510f0..11b11c6e381 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22c.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22c.exe -// MVID: {5BF2DEA9-459D-3DF8-A745-0383A9DEF25B} +// MVID: {5C6C932B-5705-F08B-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CB0000 +// Image base: 0x01A50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl index d969cec6fc1..2609a7349fd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22d.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22d.exe -// MVID: {5BF2DEA9-FDCA-89B1-A745-0383A9DEF25B} +// MVID: {5C6C932B-7C4C-F08B-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00700000 +// Image base: 0x01880000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl index d9779a59000..aee0d95317c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22e.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22e.exe -// MVID: {5BF2DEA9-C83B-1CB9-A745-0383A9DEF25B} +// MVID: {5C6C932B-5F0B-F08B-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01590000 +// Image base: 0x01A90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl index 582fad73ff8..9caf6169c11 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22f.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22f.exe -// MVID: {5BF2DEA9-C040-2523-A745-0383A9DEF25B} +// MVID: {5C6C932B-634A-F08B-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00F20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl index 9799785f034..06cf6cce796 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22g.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22g.exe -// MVID: {5BF2DEA9-CA89-74DB-A745-0383A9DEF25B} +// MVID: {5C6C932B-6709-F08B-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CB0000 +// Image base: 0x03080000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl index 8623b16d23a..7b684c59319 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction22h.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001D8 Length: 0x00000000 } .module Testfunction22h.exe -// MVID: {5BF2DEA9-0266-39F6-A745-0383A9DEF25B} +// MVID: {5C6C932B-8E50-F08B-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01910000 +// Image base: 0x00C50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl index 1831f844a6c..38e98f5b839 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction3.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction3.exe -// MVID: {5BF2DEA9-663A-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-0F41-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x00D60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl index 50b68d36e7e..d53c9ba8136 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction4.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction4.exe -// MVID: {5BF2DEA9-665B-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-2284-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x003F0000 +// Image base: 0x001F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl index 14815c7127e..b4d71120e1c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction5.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction5.exe -// MVID: {5BF2DEA9-6570-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-2743-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03050000 +// Image base: 0x00E90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl index 5ba964e1264..cc0f946bf94 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction6.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002B0 Length: 0x00000000 } .module TestFunction6.exe -// MVID: {5BF2DEA9-6591-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-1A86-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00D00000 +// Image base: 0x02900000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl index f6081237e9d..210bd1a88a9 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction7.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000250 Length: 0x00000000 } .module TestFunction7.exe -// MVID: {5BF2DEA9-65AE-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-1F45-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00D50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl index 7e68e2ae488..3e17c515386 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction8.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000258 Length: 0x00000000 } .module TestFunction8.exe -// MVID: {5BF2DEA9-65CF-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-3488-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03040000 +// Image base: 0x00D60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl index 79e5b351ca7..cf33cbc97dd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000268 Length: 0x00000000 } .module TestFunction9.exe -// MVID: {5BF2DEA9-64F4-8929-A745-0383A9DEF25B} +// MVID: {5C6C932B-3947-9F02-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00560000 +// Image base: 0x00CF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl index 8d13cc7b5d6..8621c96373a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000288 Length: 0x00000000 } .module TestFunction9b.exe -// MVID: {5BF2DEA9-A52C-4FC9-A745-0383A9DEF25B} +// MVID: {5C6C932B-9A61-1603-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01830000 +// Image base: 0x00FB0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl index 08f2e0aeccc..bbf9ba2ed2f 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b1.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b1.exe -// MVID: {5BF2DEA9-A406-DAF4-A745-0383A9DEF25B} +// MVID: {5C6C932B-8BEE-31E1-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00490000 +// Image base: 0x012E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl index 95d4b2f1ea2..8a17783e4dd 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b2.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b2.exe -// MVID: {5BF2DEA9-9C0B-E35E-A745-0383A9DEF25B} +// MVID: {5C6C932B-87AF-31E1-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BF0000 +// Image base: 0x006F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl index 78362473f67..d7c5ca747d7 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/TestFunctions/Testfunction9b3.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002A8 Length: 0x00000000 } .module TestFunction9b3.exe -// MVID: {5BF2DEA9-C1A4-612A-A745-0383A9DEF25B} +// MVID: {5C6C932B-A4F0-31E1-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FD0000 +// Image base: 0x015C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl index 03b44500fed..95aa3aa920b 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple01.exe -// MVID: {5BF2DEAA-6FDB-3E0B-A745-0383AADEF25B} +// MVID: {5C6C932B-E0B7-6D31-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00200000 +// Image base: 0x01860000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl index 553c9d7ffa3..74b9baa5502 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple02.exe -// MVID: {5BF2DEAA-ECCC-7D58-A745-0383AADEF25B} +// MVID: {5C6C932B-FD78-6D31-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x011E0000 +// Image base: 0x00410000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl index aaabc19aa36..45647ab8c5e 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple03.exe -// MVID: {5BF2DEAA-AD65-A299-A745-0383AADEF25B} +// MVID: {5C6C932B-F9B9-6D31-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01890000 +// Image base: 0x01BA0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl index 82d2e9b1f07..3f908dfdb64 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple04.exe -// MVID: {5BF2DEAA-6A2E-9E97-A745-0383AADEF25B} +// MVID: {5C6C932B-D472-6D31-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00540000 +// Image base: 0x00EE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl index 065bc7ccc06..41a9f547bd0 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple05.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple05.exe -// MVID: {5BF2DEAA-349F-319F-A745-0383AADEF25B} +// MVID: {5C6C932B-D0B3-6D31-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00970000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl index 645ed3c1308..55c69e8b262 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple06.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple06.exe -// MVID: {5BF2DEAA-67E0-4675-A745-0383AADEF25B} +// MVID: {5C6C932B-ED74-6D31-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CC0000 +// Image base: 0x011F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl index 53c71c27def..49bc4eb9b4c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple07.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple07.exe -// MVID: {5BF2DEAA-7229-962D-A745-0383AADEF25B} +// MVID: {5C6C932B-E9B5-6D31-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01250000 +// Image base: 0x01300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl index 2f067b4e028..27689a5ea43 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/Tuple08.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B0 Length: 0x00000000 } .module Tuple08.exe -// MVID: {5BF2DEAA-E542-67B3-A745-0383AADEF25B} +// MVID: {5C6C932B-067E-6D32-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00C70000 +// Image base: 0x01760000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl index 00b5cac3cbe..2e3f26381d4 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleElimination.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002D0 Length: 0x00000000 } .module TupleElimination.exe -// MVID: {5BF2DEAA-DFDD-92DF-A745-0383AADEF25B} +// MVID: {5C6C932B-5561-FAE7-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03070000 +// Image base: 0x012C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl index 329a466ea00..85a676b482c 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/TupleMonster.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000001B8 Length: 0x00000000 } .module TupleMonster.exe -// MVID: {5BF2DEAA-1552-41D8-A745-0383AADEF25B} +// MVID: {5C6C932B-36C8-CAB4-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BA0000 +// Image base: 0x00710000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl index c126f7b1c68..a4e92adba0a 100644 --- a/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl +++ b/tests/fsharpqa/Source/CodeGen/EmittedIL/Tuples/ValueTupleAliasConstructor.il.bsl @@ -15,11 +15,6 @@ .publickeytoken = (B0 3F 5F 7F 11 D5 0A 3A ) // .?_....: .ver 4:5:0:0 } -.assembly extern System.ValueTuple -{ - .publickeytoken = (CC 7B 13 FF CD 2D DD 51 ) // .{...-.Q - .ver 4:0:1:0 -} .assembly ValueTupleAliasConstructor { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.FSharpInterfaceDataVersionAttribute::.ctor(int32, @@ -49,13 +44,13 @@ // Offset: 0x00000260 Length: 0x00000000 } .module ValueTupleAliasConstructor.exe -// MVID: {5BF2DEAA-A8CF-BB34-A745-0383AADEF25B} +// MVID: {5C6C932B-E59F-7FAD-A745-03832B936C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02E70000 +// Image base: 0x01150000 // =============== CLASS MEMBERS DECLARATION =================== @@ -82,8 +77,8 @@ .line 3,3 : 9,22 'C:\\GitHub\\dsyme\\visualfsharp\\tests\\fsharpqa\\Source\\CodeGen\\EmittedIL\\Tuples\\ValueTupleAliasConstructor.fs' IL_0000: ldc.i4.2 IL_0001: ldc.i4.2 - IL_0002: newobj instance void valuetype [System.ValueTuple]System.ValueTuple`2::.ctor(!0, - !1) + IL_0002: newobj instance void valuetype [mscorlib]System.ValueTuple`2::.ctor(!0, + !1) IL_0007: pop IL_0008: ret } // end of method $ValueTupleAliasConstructor::main@ diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl index bb4dd86c6b4..696bb911472 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/help/help40.437.1033.bsl @@ -91,7 +91,8 @@ Copyright (c) Microsoft Corporation. All Rights Reserved. --nowarn: Disable specific warning messages --warnon: Enable specific warnings that may be off by default ---checknulls[+|-] Enable nullness declarations and checks +--checknulls[+|-] Enable nullness declarations and + checks --langversion: Specify the language version --consolecolors[+|-] Output warning and error messages in color diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl index 3aa2145418b..b2e9dfc6ec4 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/exename/help40.437.1033.bsl @@ -3,27 +3,36 @@ Usage: fsharpi [script.fsx []] - INPUT FILES - ---use: Use the given file on startup as initial input +--use: Use the given file on startup as + initial input --load: #load the given file on startup ---reference: Reference an assembly (Short form: -r) --- ... Treat remaining arguments as command line - arguments, accessed using fsi.CommandLineArgs +--reference: Reference an assembly (Short form: + -r) +-- ... Treat remaining arguments as command + line arguments, accessed using + fsi.CommandLineArgs - CODE GENERATION - ---debug[+|-] Emit debug information (Short form: -g) ---debug:{full|pdbonly|portable|embedded} Specify debugging type: full, portable, - embedded, pdbonly. ('pdbonly' is the default if - no debuggging type specified and enables - attaching a debugger to a running program, - 'portable' is a cross-platform format, - 'embedded' is a cross-platform format embedded +--debug[+|-] Emit debug information (Short form: + -g) +--debug:{full|pdbonly|portable|embedded} Specify debugging type: full, + portable, embedded, pdbonly. + ('pdbonly' is the default if no + debuggging type specified and + enables attaching a debugger to a + running program, 'portable' is a + cross-platform format, 'embedded' is + a cross-platform format embedded into the output file). ---optimize[+|-] Enable optimizations (Short form: -O) +--optimize[+|-] Enable optimizations (Short form: + -O) --tailcalls[+|-] Enable or disable tailcalls ---deterministic[+|-] Produce a deterministic assembly (including - module version GUID and timestamp) ---crossoptimize[+|-] Enable or disable cross-module optimizations +--deterministic[+|-] Produce a deterministic assembly + (including module version GUID and + timestamp) +--crossoptimize[+|-] Enable or disable cross-module + optimizations - ERRORS AND WARNINGS - @@ -31,49 +40,58 @@ Usage: fsharpi [script.fsx []] --warnaserror[+|-]: Report specific warnings as errors --warn: Set a warning level (0-5) --nowarn: Disable specific warning messages ---warnon: Enable specific warnings that may be off by - default ---checknulls[+|-] Enable nullness declarations and checks +--warnon: Enable specific warnings that may be + off by default +--checknulls[+|-] Enable nullness declarations and + checks --langversion: Specify the language version ---consolecolors[+|-] Output warning and error messages in color +--consolecolors[+|-] Output warning and error messages in + color - LANGUAGE - --checked[+|-] Generate overflow checks ---define: Define conditional compilation symbols (Short - form: -d) +--define: Define conditional compilation + symbols (Short form: -d) --mlcompatibility Ignore ML compatibility warnings - MISCELLANEOUS - --nologo Suppress compiler copyright message ---help Display this usage message (Short form: -?) +--help Display this usage message (Short + form: -?) - ADVANCED - ---codepage: Specify the codepage used to read source files +--codepage: Specify the codepage used to read + source files --utf8output Output messages in UTF-8 encoding ---preferreduilang: Specify the preferred output language culture - name (e.g. es-ES, ja-JP) ---fullpaths Output messages with fully qualified paths ---lib: Specify a directory for the include path which - is used to resolve source files and assemblies - (Short form: -I) +--preferreduilang: Specify the preferred output + language culture name (e.g. es-ES, + ja-JP) +--fullpaths Output messages with fully qualified + paths +--lib: Specify a directory for the include + path which is used to resolve source + files and assemblies (Short form: + -I) --simpleresolution Resolve assembly references using - directory-based rules rather than MSBuild - resolution ---targetprofile: Specify target framework profile of this - assembly. Valid values are mscorlib, netcore or - netstandard. Default - mscorlib ---noframework Do not reference the default CLI assemblies by - default ---exec Exit fsi after loading the files or running the - .fsx script given on the command line ---gui[+|-] Execute interactions on a Windows Forms event - loop (on by default) + directory-based rules rather than + MSBuild resolution +--targetprofile: Specify target framework profile of + this assembly. Valid values are + mscorlib, netcore or netstandard. + Default - mscorlib +--noframework Do not reference the default CLI + assemblies by default +--exec Exit fsi after loading the files or + running the .fsx script given on the + command line +--gui[+|-] Execute interactions on a Windows + Forms event loop (on by default) --quiet Suppress fsi writing to stdout ---readline[+|-] Support TAB completion in console (on by - default) +--readline[+|-] Support TAB completion in console + (on by default) --quotations-debug[+|-] Emit debug information in quotations ---shadowcopyreferences[+|-] Prevents references from being locked by the F# - Interactive process +--shadowcopyreferences[+|-] Prevents references from being + locked by the F# Interactive process diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl index 7d9e394c024..5d394c4969c 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40-nologo.437.1033.bsl @@ -42,7 +42,8 @@ Usage: fsiAnyCpu.exe [script.fsx []] --nowarn: Disable specific warning messages --warnon: Enable specific warnings that may be off by default ---checknulls[+|-] Enable nullness declarations and checks +--checknulls[+|-] Enable nullness declarations and + checks --langversion: Specify the language version --consolecolors[+|-] Output warning and error messages in color diff --git a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl index 45dedf873fc..9ec791251ba 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl +++ b/tests/fsharpqa/Source/CompilerOptions/fsi/help/help40.437.1033.bsl @@ -44,7 +44,8 @@ Usage: fsiAnyCpu.exe [script.fsx []] --nowarn: Disable specific warning messages --warnon: Enable specific warnings that may be off by default ---checknulls[+|-] Enable nullness declarations and checks +--checknulls[+|-] Enable nullness declarations and + checks --langversion: Specify the language version --consolecolors[+|-] Output warning and error messages in color From 462600315b6697258e69cd06e9b2982b538690f4 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 19 Feb 2019 23:44:41 +0000 Subject: [PATCH 056/137] update baselines --- .../ForLoop/ForEachOnArray01.il.bsl | 4 ++-- .../ForLoop/ForEachOnList01.il.bsl | 24 +++++++++---------- .../ForLoop/ForEachOnString01.il.bsl | 24 +++++++++---------- .../ForLoop/NoAllocationOfTuple01.il.bsl | 4 ++-- .../ForLoop/NoIEnumerable01.il.bsl | 4 ++-- .../ForLoop/NoIEnumerable02.il.bsl | 4 ++-- .../ForLoop/NoIEnumerable03.il.bsl | 4 ++-- .../ForLoop/ZeroToArrLength01.il.bsl | 4 ++-- .../ForLoop/ZeroToArrLength02.il.bsl | 4 ++-- .../GenericComparison/Compare01.il.bsl | 4 ++-- .../GenericComparison/Compare02.il.bsl | 4 ++-- .../GenericComparison/Compare03.il.bsl | 4 ++-- .../GenericComparison/Compare04.il.bsl | 4 ++-- .../GenericComparison/Compare05.il.bsl | 10 ++++---- .../GenericComparison/Compare06.il.bsl | 10 ++++---- .../GenericComparison/Compare07.il.bsl | 10 ++++---- .../GenericComparison/Compare08.il.bsl | 4 ++-- .../GenericComparison/Compare09.il.bsl | 4 ++-- .../GenericComparison/Compare10.il.bsl | 6 ++--- .../GenericComparison/Compare11.il.bsl | 4 ++-- .../GenericComparison/Equals01.il.bsl | 4 ++-- .../GenericComparison/Equals02.il.bsl | 4 ++-- .../GenericComparison/Equals03.il.bsl | 4 ++-- .../GenericComparison/Equals04.il.bsl | 10 ++++---- .../GenericComparison/Equals05.il.bsl | 10 ++++---- .../GenericComparison/Equals06.il.bsl | 10 ++++---- .../GenericComparison/Equals07.il.bsl | 4 ++-- .../GenericComparison/Equals08.il.bsl | 4 ++-- .../GenericComparison/Equals09.il.bsl | 6 ++--- .../GenericComparison/Hash01.il.bsl | 4 ++-- .../GenericComparison/Hash02.il.bsl | 4 ++-- .../GenericComparison/Hash03.il.bsl | 4 ++-- .../GenericComparison/Hash04.il.bsl | 4 ++-- .../GenericComparison/Hash05.il.bsl | 10 ++++---- .../GenericComparison/Hash06.il.bsl | 10 ++++---- .../GenericComparison/Hash07.il.bsl | 4 ++-- .../GenericComparison/Hash08.il.bsl | 8 +++---- .../GenericComparison/Hash09.il.bsl | 10 ++++---- .../GenericComparison/Hash10.il.bsl | 4 ++-- .../GenericComparison/Hash11.il.bsl | 4 ++-- .../GenericComparison/Hash12.il.bsl | 6 ++--- .../Optimizations/Inlining/Match01.il.bsl | 10 ++++---- .../Optimizations/Inlining/Match02.il.bsl | 10 ++++---- .../Inlining/StructUnion01.il.bsl | 6 ++--- 44 files changed, 147 insertions(+), 147 deletions(-) diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl index d4905c1a468..af596ec9fd0 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnArray01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module ForEachOnArray01.dll -// MVID: {5BF2D394-7E2E-D3AE-A745-038394D3F25B} +// MVID: {5C6C9457-50A7-149A-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FA0000 +// Image base: 0x03050000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl index 1d395be7bac..d8d232df889 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnList01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000400 Length: 0x00000000 } .module ForEachOnList01.dll -// MVID: {5BF2D394-56DF-F74F-A745-038394D3F25B} +// MVID: {5C6C9457-0E98-FFDA-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01760000 +// Image base: 0x01A80000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'test6@38-2' + .class auto ansi serializable sealed nested assembly beforefieldinit test6@38 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'test6@38-2'::.ctor + } // end of method test6@38::.ctor .method public strict virtual instance int32 Invoke(int32 x) cil managed @@ -85,11 +85,11 @@ IL_0001: ldc.i4.1 IL_0002: add IL_0003: ret - } // end of method 'test6@38-2'::Invoke + } // end of method test6@38::Invoke - } // end of class 'test6@38-2' + } // end of class test6@38 - .class auto ansi serializable sealed nested assembly beforefieldinit 'test7@47-1' + .class auto ansi serializable sealed nested assembly beforefieldinit test7@47 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -102,7 +102,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'test7@47-1'::.ctor + } // end of method test7@47::.ctor .method public strict virtual instance int32 Invoke(int32 x) cil managed @@ -114,9 +114,9 @@ IL_0001: ldc.i4.1 IL_0002: add IL_0003: ret - } // end of method 'test7@47-1'::Invoke + } // end of method test7@47::Invoke - } // end of class 'test7@47-1' + } // end of class test7@47 .method public static void test1(class [FSharp.Core]Microsoft.FSharp.Collections.FSharpList`1 lst) cil managed { @@ -398,7 +398,7 @@ [2] int32 i, [3] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_3) .line 36,40 : 5,21 '' - IL_0000: newobj instance void ForEachOnList01/'test6@38-2'::.ctor() + IL_0000: newobj instance void ForEachOnList01/test6@38::.ctor() IL_0005: ldc.i4.1 IL_0006: ldc.i4.2 IL_0007: ldc.i4.3 @@ -461,7 +461,7 @@ [3] int32 tmp, [4] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_4) .line 45,49 : 5,21 '' - IL_0000: newobj instance void ForEachOnList01/'test7@47-1'::.ctor() + IL_0000: newobj instance void ForEachOnList01/test7@47::.ctor() IL_0005: ldc.i4.1 IL_0006: ldc.i4.2 IL_0007: ldc.i4.3 diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl index 45fab30bb75..0e41dfff845 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ForEachOnString01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000488 Length: 0x00000000 } .module ForEachOnString01.dll -// MVID: {5BF2D394-105C-852B-A745-038394D3F25B} +// MVID: {5C6C9457-3AEB-B9F2-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00480000 +// Image base: 0x00720000 // =============== CLASS MEMBERS DECLARATION =================== @@ -59,7 +59,7 @@ extends [mscorlib]System.Object { .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) - .class auto ansi serializable sealed nested assembly beforefieldinit 'test8@54-1' + .class auto ansi serializable sealed nested assembly beforefieldinit test8@54 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -72,7 +72,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'test8@54-1'::.ctor + } // end of method test8@54::.ctor .method public strict virtual instance char Invoke(char x) cil managed @@ -87,11 +87,11 @@ IL_0003: add IL_0004: conv.u2 IL_0005: ret - } // end of method 'test8@54-1'::Invoke + } // end of method test8@54::Invoke - } // end of class 'test8@54-1' + } // end of class test8@54 - .class auto ansi serializable sealed nested assembly beforefieldinit 'test9@63-1' + .class auto ansi serializable sealed nested assembly beforefieldinit test9@63 extends class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2 { .method assembly specialname rtspecialname @@ -104,7 +104,7 @@ IL_0000: ldarg.0 IL_0001: call instance void class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2::.ctor() IL_0006: ret - } // end of method 'test9@63-1'::.ctor + } // end of method test9@63::.ctor .method public strict virtual instance char Invoke(char x) cil managed @@ -118,9 +118,9 @@ IL_0003: add IL_0004: conv.u2 IL_0005: ret - } // end of method 'test9@63-1'::Invoke + } // end of method test9@63::Invoke - } // end of class 'test9@63-1' + } // end of class test9@63 .method public static void test1(string str) cil managed { @@ -463,7 +463,7 @@ [3] char i, [4] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_4) .line 53,55 : 17,40 '' - IL_0000: newobj instance void ForEachOnString01/'test8@54-1'::.ctor() + IL_0000: newobj instance void ForEachOnString01/test8@54::.ctor() IL_0005: ldstr "1234" IL_000a: call string [FSharp.Core]Microsoft.FSharp.Core.StringModule::Map(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string) @@ -520,7 +520,7 @@ [4] string tmp, [5] class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`4,class [mscorlib]System.IO.TextWriter,class [FSharp.Core]Microsoft.FSharp.Core.Unit,class [FSharp.Core]Microsoft.FSharp.Core.Unit> V_5) .line 62,64 : 17,40 '' - IL_0000: newobj instance void ForEachOnString01/'test9@63-1'::.ctor() + IL_0000: newobj instance void ForEachOnString01/test9@63::.ctor() IL_0005: ldstr "1234" IL_000a: call string [FSharp.Core]Microsoft.FSharp.Core.StringModule::Map(class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2, string) diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl index 98464726608..947de419665 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/NoAllocationOfTuple01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000288 Length: 0x00000000 } .module NoAllocationOfTuple01.dll -// MVID: {5BF2D394-13B5-F699-A745-038394D3F25B} +// MVID: {5C6C9457-98F3-D7D7-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02F40000 +// Image base: 0x00980000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl index 1d88da72e80..4b9d179a30d 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000258 Length: 0x00000000 } .module NoIEnumerable01.dll -// MVID: {5BF2D394-31A1-8DCB-A745-038394D3F25B} +// MVID: {5C6C9457-5ACD-81FC-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CF0000 +// Image base: 0x00E20000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl index 64d7760eda9..3f851eb66cf 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000258 Length: 0x00000000 } .module NoIEnumerable02.dll -// MVID: {5BF2D394-5066-4012-A745-038394D3F25B} +// MVID: {5C6C9457-56CE-81FC-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02440000 +// Image base: 0x02DF0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl index 93893704952..c925618a60d 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/NoIEnumerable03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000270 Length: 0x00000000 } .module NoIEnumerable03.dll -// MVID: {5BF2D394-7903-6020-A745-038394D3F25B} +// MVID: {5C6C9457-52CF-81FC-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013C0000 +// Image base: 0x00B40000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl index 89e6ab2c46a..c26749d3b08 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module ZeroToArrLength01.dll -// MVID: {5BF2D394-A3D0-03A7-A745-038394D3F25B} +// MVID: {5C6C9457-61C7-F28D-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02520000 +// Image base: 0x01260000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl index bbefe56a379..eae2652a618 100644 --- a/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/ForLoop/ZeroToArrLength02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000278 Length: 0x00000000 } .module ZeroToArrLength02.dll -// MVID: {5BF2D394-A36B-03A7-A745-038394D3F25B} +// MVID: {5C6C9457-5DC8-F28D-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x010A0000 +// Image base: 0x00360000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare01.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare01.il.bsl index 4c869f6be84..b668effe41a 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002F8 Length: 0x00000000 } .module Compare01.dll -// MVID: {5BF2E04A-04A0-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-E518-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00CC0000 +// Image base: 0x015C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare02.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare02.il.bsl index 4c0ea027cdc..d5725e2c683 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000300 Length: 0x00000000 } .module Compare02.dll -// MVID: {5BF2E04A-0481-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-E917-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01420000 +// Image base: 0x01230000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare03.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare03.il.bsl index 569d23c8977..be38ae1e682 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare03.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000310 Length: 0x00000000 } .module Compare03.dll -// MVID: {5BF2E04A-0562-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-CC16-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01890000 +// Image base: 0x00F30000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare04.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare04.il.bsl index 29f69cc9fa9..3ab46cbea0c 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare04.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000310 Length: 0x00000000 } .module Compare04.dll -// MVID: {5BF2E04A-053B-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-D115-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00740000 +// Image base: 0x00A60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare05.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare05.il.bsl index 89686b11a59..db51cf273a9 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare05.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare05.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Compare05 { - // Offset: 0x000006E8 Length: 0x0000007C + // Offset: 0x000006E8 Length: 0x0000007E } .mresource public FSharpOptimizationData.Compare05 { - // Offset: 0x00000768 Length: 0x000003BA + // Offset: 0x00000770 Length: 0x000003BA } .mresource public FSharpOptimizationDataB.Compare05 { - // Offset: 0x00000B28 Length: 0x00000057 + // Offset: 0x00000B30 Length: 0x00000057 } .module Compare05.dll -// MVID: {5BF2E04A-051C-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-D514-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x012F0000 +// Image base: 0x01770000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.bsl index 4b5f25e2f08..b49f71fa591 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare06.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Compare06 { - // Offset: 0x000006D8 Length: 0x0000007B + // Offset: 0x000006D8 Length: 0x0000007D } .mresource public FSharpOptimizationData.Compare06 { - // Offset: 0x00000758 Length: 0x000003BC + // Offset: 0x00000760 Length: 0x000003BC } .mresource public FSharpOptimizationDataB.Compare06 { - // Offset: 0x00000B18 Length: 0x00000057 + // Offset: 0x00000B20 Length: 0x00000057 } .module Compare06.dll -// MVID: {5BF2E04A-04FD-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-D913-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00300000 +// Image base: 0x007C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.bsl index 0e802e3eb8a..05862d29f75 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare07.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Compare07 { - // Offset: 0x00000898 Length: 0x00000095 + // Offset: 0x00000898 Length: 0x000000A8 } .mresource public FSharpOptimizationData.Compare07 { - // Offset: 0x00000938 Length: 0x00000692 + // Offset: 0x00000948 Length: 0x00000692 } .mresource public FSharpOptimizationDataB.Compare07 { - // Offset: 0x00000FD0 Length: 0x000000A4 + // Offset: 0x00000FE0 Length: 0x000000B8 } .module Compare07.dll -// MVID: {5BF2E04A-05DE-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-BC12-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01920000 +// Image base: 0x01740000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare08.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare08.il.bsl index 455270eb12f..92ccc2b792d 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare08.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare08.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000300 Length: 0x00000000 } .module Compare08.dll -// MVID: {5BF2E04A-03E7-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-BF21-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00BE0000 +// Image base: 0x01550000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare09.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare09.il.bsl index 1403a98ec68..5e0bc411704 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare09.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare09.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000300 Length: 0x00000000 } .module Compare09.dll -// MVID: {5BF2E04A-03C8-F88E-A745-03834AE0F25B} +// MVID: {5C6C9457-C320-27BF-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02E00000 +// Image base: 0x00700000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.bsl index 06025077306..5af9d8d0353 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare10.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.Compare10 { - // Offset: 0x00000AA0 Length: 0x000000F6 + // Offset: 0x00000AA0 Length: 0x000000FA } .mresource public FSharpOptimizationData.Compare10 { @@ -44,13 +44,13 @@ // Offset: 0x00001138 Length: 0x000000AE } .module Compare10.dll -// MVID: {5BF2E04A-04BF-1753-A745-03834AE0F25B} +// MVID: {5C6C9457-DAFE-57E6-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01930000 +// Image base: 0x007B0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare11.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare11.il.bsl index abc36af0576..f6ae4589600 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare11.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Compare11.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000300 Length: 0x00000000 } .module Compare11.dll -// MVID: {5BF2E04A-04A0-1753-A745-03834AE0F25B} +// MVID: {5C6C9457-DEFD-57E6-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002F0000 +// Image base: 0x007A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals01.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals01.il.bsl index 23bcb08f957..3e3f99af507 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000308 Length: 0x00000000 } .module Equals01.dll -// MVID: {5BF2E04A-0759-50B1-A745-03834AE0F25B} +// MVID: {5C6C9457-0E46-E867-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00680000 +// Image base: 0x012D0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals02.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals02.il.bsl index 20b1724916a..21a9bee882d 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000308 Length: 0x00000000 } .module Equals02.dll -// MVID: {5BF2E04A-0759-B6D8-A745-03834AE0F25B} +// MVID: {5C6C9457-2317-8CEE-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x012C0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals03.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals03.il.bsl index 79e03eb97c0..47587c74657 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals03.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000308 Length: 0x00000000 } .module Equals03.dll -// MVID: {5BF2E04A-0759-3313-A745-03834AE0F25B} +// MVID: {5C6C9457-1A7C-8819-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03160000 +// Image base: 0x00EC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals04.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals04.il.bsl index c615c847962..88208c84cb9 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals04.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals04.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Equals04 { - // Offset: 0x000006E0 Length: 0x0000007C + // Offset: 0x000006E0 Length: 0x0000007E } .mresource public FSharpOptimizationData.Equals04 { - // Offset: 0x00000760 Length: 0x000003B7 + // Offset: 0x00000768 Length: 0x000003B7 } .mresource public FSharpOptimizationDataB.Equals04 { - // Offset: 0x00000B20 Length: 0x00000057 + // Offset: 0x00000B28 Length: 0x00000057 } .module Equals04.dll -// MVID: {5BF2E04A-0759-EA8A-A745-03834AE0F25B} +// MVID: {5C6C9457-994D-EF23-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00A40000 +// Image base: 0x001F0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals05.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals05.il.bsl index 3ae1f9cda83..6ae166b4375 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals05.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals05.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Equals05 { - // Offset: 0x000006D8 Length: 0x0000007B + // Offset: 0x000006D8 Length: 0x0000007D } .mresource public FSharpOptimizationData.Equals05 { - // Offset: 0x00000758 Length: 0x000003B9 + // Offset: 0x00000760 Length: 0x000003B9 } .mresource public FSharpOptimizationDataB.Equals05 { - // Offset: 0x00000B18 Length: 0x00000057 + // Offset: 0x00000B20 Length: 0x00000057 } .module Equals05.dll -// MVID: {5BF2E04A-0759-CBC5-A745-03834AE0F25B} +// MVID: {5C6C9457-90B2-EA4E-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02BD0000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.bsl index 73d037b7378..b73361b489f 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals06.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Equals06 { - // Offset: 0x00000890 Length: 0x00000095 + // Offset: 0x00000890 Length: 0x000000A8 } .mresource public FSharpOptimizationData.Equals06 { - // Offset: 0x00000930 Length: 0x0000068E + // Offset: 0x00000940 Length: 0x0000068E } .mresource public FSharpOptimizationDataB.Equals06 { - // Offset: 0x00000FC8 Length: 0x000000A4 + // Offset: 0x00000FD8 Length: 0x000000B8 } .module Equals06.dll -// MVID: {5BF2E04A-0759-31EC-A745-03834AE0F25B} +// MVID: {5C6C9457-A583-8ED5-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x002E0000 +// Image base: 0x00C60000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals07.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals07.il.bsl index 5f5828990c7..5d3de51dd7b 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals07.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals07.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000300 Length: 0x00000000 } .module Equals07.dll -// MVID: {5BF2E04A-0759-AE27-A745-03834AE0F25B} +// MVID: {5C6C9457-9CE8-8A00-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x003D0000 +// Image base: 0x01510000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals08.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals08.il.bsl index 5bc72199db1..6e5b2aa5044 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals08.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals08.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000300 Length: 0x00000000 } .module Equals08.dll -// MVID: {5BF2E04A-0759-659E-A745-03834AE0F25B} +// MVID: {5C6C9457-25B9-C4FB-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00FB0000 +// Image base: 0x02AC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.bsl index c0043ebdca8..8323f0cc60a 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Equals09.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.Equals09 { - // Offset: 0x00000A98 Length: 0x000000F6 + // Offset: 0x00000A98 Length: 0x000000FA } .mresource public FSharpOptimizationData.Equals09 { @@ -44,13 +44,13 @@ // Offset: 0x00001128 Length: 0x000000AE } .module Equals09.dll -// MVID: {5BF2E04A-0759-46D9-A745-03834AE0F25B} +// MVID: {5C6C9457-1D1E-C026-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00940000 +// Image base: 0x03080000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash01.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash01.il.bsl index 7f0a1092d67..793c6f599a0 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash01.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002E0 Length: 0x00000000 } .module Hash01.dll -// MVID: {5BF2E04A-9642-78D3-A745-03834AE0F25B} +// MVID: {5C6C9457-1A55-AA80-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x013C0000 +// Image base: 0x00BE0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash02.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash02.il.bsl index 6a48fd549ba..f85561bf210 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash02.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x00000348 Length: 0x00000006 } .module Hash02.dll -// MVID: {5BF2E04A-9642-796E-A745-03834AE0F25B} +// MVID: {5C6C9457-11BA-A5AB-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01A70000 +// Image base: 0x00570000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl index a1f421d8a83..faa4de70d4c 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash03.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002F0 Length: 0x00000000 } .module Hash03.dll -// MVID: {5BF2E04A-9642-788D-A745-03834AE0F25B} +// MVID: {5C6C9457-091F-A0D6-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01670000 +// Image base: 0x01270000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl index 3342bcfdd0d..593cbdd873c 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash04.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002F0 Length: 0x00000000 } .module Hash04.dll -// MVID: {5BF2E04A-9642-7838-A745-03834AE0F25B} +// MVID: {5C6C9457-A55C-B13C-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01370000 +// Image base: 0x01300000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash05.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash05.il.bsl index ea290977b63..13d254c45c7 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash05.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash05.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Hash05 { - // Offset: 0x000006D8 Length: 0x0000007C + // Offset: 0x000006D8 Length: 0x0000007E } .mresource public FSharpOptimizationData.Hash05 { - // Offset: 0x00000758 Length: 0x000003B1 + // Offset: 0x00000760 Length: 0x000003B1 } .mresource public FSharpOptimizationDataB.Hash05 { - // Offset: 0x00000B10 Length: 0x00000057 + // Offset: 0x00000B18 Length: 0x00000057 } .module Hash05.dll -// MVID: {5BF2E04A-9642-7857-A745-03834AE0F25B} +// MVID: {5C6C9457-9CC1-AC67-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02BA0000 +// Image base: 0x00AC0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash06.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash06.il.bsl index 98440fb3a2a..1b3ca194185 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash06.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash06.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Hash06 { - // Offset: 0x000006E0 Length: 0x0000007C + // Offset: 0x000006E0 Length: 0x0000007E } .mresource public FSharpOptimizationData.Hash06 { - // Offset: 0x00000760 Length: 0x000003B2 + // Offset: 0x00000768 Length: 0x000003B2 } .mresource public FSharpOptimizationDataB.Hash06 { - // Offset: 0x00000B18 Length: 0x00000057 + // Offset: 0x00000B20 Length: 0x00000057 } .module Hash06.dll -// MVID: {5BF2E04A-9642-78F2-A745-03834AE0F25B} +// MVID: {5C6C9457-9426-A792-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01400000 +// Image base: 0x007A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash07.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash07.il.bsl index 0f9f614d8a0..4906fa2c377 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash07.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash07.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002E0 Length: 0x00000000 } .module Hash07.dll -// MVID: {5BF2E04A-9642-7811-A745-03834AE0F25B} +// MVID: {5C6C9457-8B8B-A2BD-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x03140000 +// Image base: 0x011A0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash08.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash08.il.bsl index f0c714e211d..94595e55f6b 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash08.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash08.il.bsl @@ -33,18 +33,18 @@ } .mresource public FSharpSignatureDataB.Hash08 { - // Offset: 0x000006D0 Length: 0x0000007B + // Offset: 0x000006D0 Length: 0x0000007D } .mresource public FSharpOptimizationData.Hash08 { - // Offset: 0x00000750 Length: 0x000003B3 + // Offset: 0x00000758 Length: 0x000003B3 } .mresource public FSharpOptimizationDataB.Hash08 { - // Offset: 0x00000B08 Length: 0x00000057 + // Offset: 0x00000B10 Length: 0x00000057 } .module Hash08.dll -// MVID: {5BF2E04A-9642-77BC-A745-03834AE0F25B} +// MVID: {5C6C9457-1418-D796-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash09.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash09.il.bsl index dee0ecc3738..954be19449f 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash09.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash09.il.bsl @@ -33,24 +33,24 @@ } .mresource public FSharpSignatureDataB.Hash09 { - // Offset: 0x00000888 Length: 0x00000095 + // Offset: 0x00000888 Length: 0x000000A8 } .mresource public FSharpOptimizationData.Hash09 { - // Offset: 0x00000928 Length: 0x00000686 + // Offset: 0x00000938 Length: 0x00000686 } .mresource public FSharpOptimizationDataB.Hash09 { - // Offset: 0x00000FB8 Length: 0x000000A4 + // Offset: 0x00000FC8 Length: 0x000000B8 } .module Hash09.dll -// MVID: {5BF2E04A-9642-77DB-A745-03834AE0F25B} +// MVID: {5C6C9457-0B7D-D2C1-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01A50000 +// Image base: 0x002E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash10.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash10.il.bsl index bf750198abd..fce5a66aa34 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash10.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash10.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002E0 Length: 0x00000000 } .module Hash10.dll -// MVID: {5BF2E04A-9661-78B4-A745-03834AE0F25B} +// MVID: {5C6C9457-1EF1-AF55-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x01920000 +// Image base: 0x011E0000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash11.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash11.il.bsl index 9b4ab66023f..c7d25bf6c6c 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash11.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash11.il.bsl @@ -44,13 +44,13 @@ // Offset: 0x000002E0 Length: 0x00000000 } .module Hash11.dll -// MVID: {5BF2E04A-9661-78D3-A745-03834AE0F25B} +// MVID: {5C6C9457-1656-AA80-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x030C0000 +// Image base: 0x00A90000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash12.il.bsl b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash12.il.bsl index 8a328febf3d..c96839307a9 100644 --- a/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash12.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/GenericComparison/Hash12.il.bsl @@ -33,7 +33,7 @@ } .mresource public FSharpSignatureDataB.Hash12 { - // Offset: 0x00000A90 Length: 0x000000F6 + // Offset: 0x00000A90 Length: 0x000000FA } .mresource public FSharpOptimizationData.Hash12 { @@ -44,13 +44,13 @@ // Offset: 0x00001120 Length: 0x000000AE } .module Hash12.dll -// MVID: {5BF2E04A-9661-796E-A745-03834AE0F25B} +// MVID: {5C6C9457-0DBB-A5AB-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x007C0000 +// Image base: 0x00C80000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl b/tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl index f1f1af084fd..c360fcb7025 100644 --- a/tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl @@ -29,24 +29,24 @@ } .mresource public FSharpSignatureDataB.Match01 { - // Offset: 0x000006F0 Length: 0x00000084 + // Offset: 0x000006F0 Length: 0x00000086 } .mresource public FSharpOptimizationData.Match01 { - // Offset: 0x00000778 Length: 0x000003B7 + // Offset: 0x00000780 Length: 0x000003B7 } .mresource public FSharpOptimizationDataB.Match01 { - // Offset: 0x00000B38 Length: 0x0000005F + // Offset: 0x00000B40 Length: 0x0000005F } .module Match01.dll -// MVID: {5BF2E04A-FAFE-C8E4-A745-03834AE0F25B} +// MVID: {5C6C9457-6E36-2371-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x02CF0000 +// Image base: 0x00360000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/Inlining/Match02.il.bsl b/tests/fsharpqa/Source/Optimizations/Inlining/Match02.il.bsl index 5d37190b9ed..94d5cb1c033 100644 --- a/tests/fsharpqa/Source/Optimizations/Inlining/Match02.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/Inlining/Match02.il.bsl @@ -29,24 +29,24 @@ } .mresource public FSharpSignatureDataB.Match02 { - // Offset: 0x00000498 Length: 0x0000002D + // Offset: 0x00000498 Length: 0x00000035 } .mresource public FSharpOptimizationData.Match02 { - // Offset: 0x000004D0 Length: 0x000002EE + // Offset: 0x000004D8 Length: 0x000002EE } .mresource public FSharpOptimizationDataB.Match02 { - // Offset: 0x000007C8 Length: 0x00000040 + // Offset: 0x000007D0 Length: 0x0000004C } .module Match02.dll -// MVID: {5BF2E04A-6125-4D81-A745-03834AE0F25B} +// MVID: {5C6C9457-8B37-2371-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x017D0000 +// Image base: 0x00C50000 // =============== CLASS MEMBERS DECLARATION =================== diff --git a/tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl b/tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl index 404cddb7c36..01c75d6eaa4 100644 --- a/tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl +++ b/tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl @@ -29,7 +29,7 @@ } .mresource public FSharpSignatureDataB.StructUnion01 { - // Offset: 0x00000888 Length: 0x000000AE + // Offset: 0x00000888 Length: 0x000000B0 } .mresource public FSharpOptimizationData.StructUnion01 { @@ -40,13 +40,13 @@ // Offset: 0x00000D68 Length: 0x00000067 } .module StructUnion01.dll -// MVID: {5BF2E04A-D3E9-6B24-A745-03834AE0F25B} +// MVID: {5C6C9457-997B-102F-A745-038357946C5C} .imagebase 0x00400000 .file alignment 0x00000200 .stackreserve 0x00100000 .subsystem 0x0003 // WINDOWS_CUI .corflags 0x00000001 // ILONLY -// Image base: 0x00F80000 +// Image base: 0x002F0000 // =============== CLASS MEMBERS DECLARATION =================== From 2623b8b8fb2aa30adea46fa7375f73ac442f1b71 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Feb 2019 01:16:54 +0000 Subject: [PATCH 057/137] use runsettings --- build.cmd | 4 ++-- vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.cmd b/build.cmd index a0f755aacaf..4d93fe0ac20 100644 --- a/build.cmd +++ b/build.cmd @@ -1052,8 +1052,8 @@ if "%TEST_VS_IDEUNIT_SUITE%" == "1" ( ) set LOGFILE=%TESTLOGDIR%\VisualFSharp.UnitTests_net46.trx - echo "%_dotnetexe%" test "%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" - "%_dotnetexe%" test "%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" + echo "%_dotnetexe%" test "%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" -s "%~dp0vsintegration\tests\UnitTests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" + "%_dotnetexe%" test "%~dp0vsintegration\tests\UnitTests\VisualFSharp.UnitTests.fsproj" -s "%~dp0vsintegration\tests\UnitTests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" if errorlevel 1 ( echo ------------------------------------------------------------ echo Error: Running tests vs-ideunit failed, see file `!LOGFILE!` diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj index 398eab56a43..402fc1adb08 100644 --- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj +++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj @@ -162,7 +162,9 @@ Roslyn\DocumentHighlightsServiceTests.fs - + + PreserveNewest + From ba2ad87728655956ebad5d6cf810045363ec9447 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Feb 2019 01:21:02 +0000 Subject: [PATCH 058/137] fix build --- src/fsharp/ExtensionTyping.fs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs index f42c5bfcbc0..43f2a595ea5 100755 --- a/src/fsharp/ExtensionTyping.fs +++ b/src/fsharp/ExtensionTyping.fs @@ -940,6 +940,9 @@ module internal ExtensionTyping = override __.GetHashCode() = x.GetHashCode() [] +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + [] +#endif type ProvidedVar (x:Quotations.Var, ctxt) = member __.Type = x.Type |> ProvidedType.Create ctxt member __.Name = x.Name From e427511e47bf52326fdf9a2b73e4b5c0d3031df7 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Feb 2019 10:33:39 +0000 Subject: [PATCH 059/137] same fix for FCS tests2 --- build.cmd | 4 ++-- fcs/FSharp.Compiler.Service.Tests/app.runsettings | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 fcs/FSharp.Compiler.Service.Tests/app.runsettings diff --git a/build.cmd b/build.cmd index 4d93fe0ac20..738f8365cc4 100644 --- a/build.cmd +++ b/build.cmd @@ -812,8 +812,8 @@ REM ---------------- test-fcs ----------------------- if "%TEST_FCS%" == "1" ( set LOGFILE=%TESTLOGDIR%\FSharp.Compiler.Service.Tests_net46.trx - echo "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" - "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" + echo "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -s "%~dp0dp0fcs\FSharp.Compiler.Service.Tests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" + "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -s "%~dp0dp0fcs\FSharp.Compiler.Service.Tests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" if errorlevel 1 ( echo -------------------------------------------------------------- diff --git a/fcs/FSharp.Compiler.Service.Tests/app.runsettings b/fcs/FSharp.Compiler.Service.Tests/app.runsettings new file mode 100644 index 00000000000..009d9b69776 --- /dev/null +++ b/fcs/FSharp.Compiler.Service.Tests/app.runsettings @@ -0,0 +1,8 @@ + + + + + 1 + + + From c9aebe0649573d739aea5dd0080f68745db1989a Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Feb 2019 15:14:02 +0100 Subject: [PATCH 060/137] fix build --- build.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cmd b/build.cmd index 738f8365cc4..d42f71e3568 100644 --- a/build.cmd +++ b/build.cmd @@ -812,8 +812,8 @@ REM ---------------- test-fcs ----------------------- if "%TEST_FCS%" == "1" ( set LOGFILE=%TESTLOGDIR%\FSharp.Compiler.Service.Tests_net46.trx - echo "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -s "%~dp0dp0fcs\FSharp.Compiler.Service.Tests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" - "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -s "%~dp0dp0fcs\FSharp.Compiler.Service.Tests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" + echo "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -s "%~dp0fcs\FSharp.Compiler.Service.Tests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" + "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -s "%~dp0fcs\FSharp.Compiler.Service.Tests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f net46 -l "trx;LogFileName=!LOGFILE!" if errorlevel 1 ( echo -------------------------------------------------------------- From 734000f499844c8aac518f5ad5b68f4124a51521 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Feb 2019 16:36:19 +0100 Subject: [PATCH 061/137] add diagnostics --- tests/service/PerfTests.fs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tests/service/PerfTests.fs b/tests/service/PerfTests.fs index 7e9c9912e62..758213e66fe 100644 --- a/tests/service/PerfTests.fs +++ b/tests/service/PerfTests.fs @@ -42,6 +42,7 @@ module internal Project1 = [] let ``Test request for parse and check doesn't check whole project`` () = + printfn "starting test..." let backgroundParseCount = ref 0 let backgroundCheckCount = ref 0 checker.FileChecked.Add (fun x -> incr backgroundCheckCount) @@ -49,32 +50,52 @@ let ``Test request for parse and check doesn't check whole project`` () = checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients() let pB, tB = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic + + printfn "ParseFile()..." let parseResults1 = checker.ParseFile(Project1.fileNames.[5], Project1.fileSources2.[5], Project1.parsingOptions) |> Async.RunSynchronously let pC, tC = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic (pC - pB) |> shouldEqual 1 (tC - tB) |> shouldEqual 0 + printfn "checking backgroundParseCount.Value = %d" backgroundParseCount.Value backgroundParseCount.Value |> shouldEqual 0 + printfn "checking backgroundCheckCount.Value = %d" backgroundCheckCount.Value backgroundCheckCount.Value |> shouldEqual 0 + + printfn "CheckFileInProject()..." let checkResults1 = checker.CheckFileInProject(parseResults1, Project1.fileNames.[5], 0, Project1.fileSources2.[5], Project1.options) |> Async.RunSynchronously let pD, tD = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic + printfn "checking backgroundParseCount.Value = %d" backgroundParseCount.Value backgroundParseCount.Value |> shouldEqual 5 + printfn "checking backgroundCheckCount.Value = %d" backgroundCheckCount.Value backgroundCheckCount.Value |> shouldEqual 5 + printfn "checking (pD - pC) = %d" (pD - pC) (pD - pC) |> shouldEqual 0 + printfn "checking (tD - tC) = %d" (tD - tC) (tD - tC) |> shouldEqual 1 + printfn "CheckFileInProject()..." let checkResults2 = checker.CheckFileInProject(parseResults1, Project1.fileNames.[7], 0, Project1.fileSources2.[7], Project1.options) |> Async.RunSynchronously let pE, tE = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic + printfn "checking no extra foreground parsing...., (pE - pD) = %d" (pE - pD) (pE - pD) |> shouldEqual 0 + printfn "checking one foreground typecheck...., tE - tD = %d" (tE - tD) (tE - tD) |> shouldEqual 1 + printfn "checking no extra background parsing...., backgroundParseCount.Value = %d" backgroundParseCount.Value (backgroundParseCount.Value <= 9) |> shouldEqual true // but note, the project does not get reparsed + printfn "checking no extra background typechecks...., backgroundCheckCount.Value = %d" backgroundCheckCount.Value (backgroundCheckCount.Value <= 9) |> shouldEqual true // only two extra typechecks of files + printfn "ParseAndCheckFileInProject()..." // A subsequent ParseAndCheck of identical source code doesn't do any more anything let checkResults2 = checker.ParseAndCheckFileInProject(Project1.fileNames.[7], 0, Project1.fileSources2.[7], Project1.options) |> Async.RunSynchronously let pF, tF = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic + printfn "checking no extra foreground parsing...." (pF - pE) |> shouldEqual 0 // note, no new parse of the file + printfn "checking no extra foreground typechecks...." (tF - tE) |> shouldEqual 0 // note, no new typecheck of the file + printfn "checking no extra background parsing...., backgroundParseCount.Value = %d" backgroundParseCount.Value (backgroundParseCount.Value <= 9) |> shouldEqual true // but note, the project does not get reparsed + printfn "checking no extra background typechecks...., backgroundCheckCount.Value = %d" backgroundCheckCount.Value (backgroundCheckCount.Value <= 9) |> shouldEqual true // only two extra typechecks of files () From e867dc338d755c426e06cf195cbcc72a61d4a7db Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Feb 2019 17:11:53 +0100 Subject: [PATCH 062/137] fix final parallel case --- build.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cmd b/build.cmd index d42f71e3568..c0d23b5305d 100644 --- a/build.cmd +++ b/build.cmd @@ -830,8 +830,8 @@ if "%TEST_FCS%" == "1" ( ) set LOGFILE=%TESTLOGDIR%\FSharp.Compiler.Service.Tests_netcoreapp2.0.trx - echo "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!" - "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!" + echo "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -s "%~dp0fcs\FSharp.Compiler.Service.Tests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!" + "%_dotnetexe%" test "%~dp0fcs\FSharp.Compiler.Service.Tests\FSharp.Compiler.Service.Tests.fsproj" -s "%~dp0fcs\FSharp.Compiler.Service.Tests\app.runsettings" --no-restore --no-build -c %BUILD_CONFIG% -f netcoreapp2.0 -l "trx;LogFileName=!LOGFILE!" if errorlevel 1 ( echo -------------------------------------------------------------- From 167b0ca15cf569365675f3f887cc7614c8f8438c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Feb 2019 21:47:52 +0100 Subject: [PATCH 063/137] try again to fix test --- tests/service/PerfTests.fs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/service/PerfTests.fs b/tests/service/PerfTests.fs index 4a55c47ed13..d6ddaf0aafb 100644 --- a/tests/service/PerfTests.fs +++ b/tests/service/PerfTests.fs @@ -81,9 +81,9 @@ let ``Test request for parse and check doesn't check whole project`` () = printfn "checking one foreground typecheck...., tE - tD = %d" (tE - tD) (tE - tD) |> shouldEqual 1 printfn "checking no extra background parsing...., backgroundParseCount.Value = %d" backgroundParseCount.Value - (backgroundParseCount.Value <= 9) |> shouldEqual true // but note, the project does not get reparsed + (backgroundParseCount.Value <= 10) |> shouldEqual true // but note, the project does not get reparsed printfn "checking no extra background typechecks...., backgroundCheckCount.Value = %d" backgroundCheckCount.Value - (backgroundCheckCount.Value <= 9) |> shouldEqual true // only two extra typechecks of files + (backgroundCheckCount.Value <= 10) |> shouldEqual true // only two extra typechecks of files printfn "ParseAndCheckFileInProject()..." // A subsequent ParseAndCheck of identical source code doesn't do any more anything @@ -94,8 +94,8 @@ let ``Test request for parse and check doesn't check whole project`` () = printfn "checking no extra foreground typechecks...." (tF - tE) |> shouldEqual 0 // note, no new typecheck of the file printfn "checking no extra background parsing...., backgroundParseCount.Value = %d" backgroundParseCount.Value - (backgroundParseCount.Value <= 9) |> shouldEqual true // but note, the project does not get reparsed + (backgroundParseCount.Value <= 10) |> shouldEqual true // but note, the project does not get reparsed printfn "checking no extra background typechecks...., backgroundCheckCount.Value = %d" backgroundCheckCount.Value - (backgroundCheckCount.Value <= 9) |> shouldEqual true // only two extra typechecks of files + (backgroundCheckCount.Value <= 10) |> shouldEqual true // only two extra typechecks of files () From e5d48e55f5b33d17bf2a017c4aae5d74b2235abf Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Feb 2019 21:54:01 +0100 Subject: [PATCH 064/137] update test fixes --- tests/service/PerfTests.fs | 15 ++++++++--- tests/service/ProjectAnalysisTests.fs | 39 --------------------------- 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/tests/service/PerfTests.fs b/tests/service/PerfTests.fs index d6ddaf0aafb..ec71b1cae7b 100644 --- a/tests/service/PerfTests.fs +++ b/tests/service/PerfTests.fs @@ -64,10 +64,17 @@ let ``Test request for parse and check doesn't check whole project`` () = printfn "CheckFileInProject()..." let checkResults1 = checker.CheckFileInProject(parseResults1, Project1.fileNames.[5], 0, Project1.fileSources2.[5], Project1.options) |> Async.RunSynchronously let pD, tD = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic - printfn "checking backgroundParseCount.Value = %d" backgroundParseCount.Value - backgroundParseCount.Value |> shouldEqual 5 - printfn "checking backgroundCheckCount.Value = %d" backgroundCheckCount.Value - backgroundCheckCount.Value |> shouldEqual 5 + + printfn "checking background parsing happened...., backgroundParseCount.Value = %d" backgroundParseCount.Value + (backgroundParseCount.Value >= 5) |> shouldEqual true // but note, the project does not get reparsed + printfn "checking background typechecks happened...., backgroundCheckCount.Value = %d" backgroundCheckCount.Value + (backgroundCheckCount.Value >= 5) |> shouldEqual true // only two extra typechecks of files + + printfn "checking no extra background parsing...., backgroundParseCount.Value = %d" backgroundParseCount.Value + (backgroundParseCount.Value <= 10) |> shouldEqual true // but note, the project does not get reparsed + printfn "checking no extra background typechecks...., backgroundCheckCount.Value = %d" backgroundCheckCount.Value + (backgroundCheckCount.Value <= 10) |> shouldEqual true // only two extra typechecks of files + printfn "checking (pD - pC) = %d" (pD - pC) (pD - pC) |> shouldEqual 0 printfn "checking (tD - tC) = %d" (tD - tC) diff --git a/tests/service/ProjectAnalysisTests.fs b/tests/service/ProjectAnalysisTests.fs index ee3884bb59d..c2a5b26e5a9 100644 --- a/tests/service/ProjectAnalysisTests.fs +++ b/tests/service/ProjectAnalysisTests.fs @@ -5161,45 +5161,6 @@ module internal ProjectBig = let parsingOptions, _ = checker.GetParsingOptionsFromCommandLineArgs(List.ofArray args) -[] -let ``Test request for parse and check doesn't check whole project`` () = - - let backgroundParseCount = ref 0 - let backgroundCheckCount = ref 0 - checker.FileChecked.Add (fun x -> incr backgroundCheckCount) - checker.FileParsed.Add (fun x -> incr backgroundParseCount) - - checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients() - let pB, tB = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic - let parseResults1 = checker.ParseFile(ProjectBig.fileNames.[5], ProjectBig.fileSources2.[5], ProjectBig.parsingOptions) |> Async.RunSynchronously - let pC, tC = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic - (pC - pB) |> shouldEqual 1 - (tC - tB) |> shouldEqual 0 - backgroundParseCount.Value |> shouldEqual 0 - backgroundCheckCount.Value |> shouldEqual 0 - let checkResults1 = checker.CheckFileInProject(parseResults1, ProjectBig.fileNames.[5], 0, ProjectBig.fileSources2.[5], ProjectBig.options) |> Async.RunSynchronously - let pD, tD = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic - backgroundParseCount.Value |> shouldEqual 5 - backgroundCheckCount.Value |> shouldEqual 5 - (pD - pC) |> shouldEqual 0 - (tD - tC) |> shouldEqual 1 - - let checkResults2 = checker.CheckFileInProject(parseResults1, ProjectBig.fileNames.[7], 0, ProjectBig.fileSources2.[7], ProjectBig.options) |> Async.RunSynchronously - let pE, tE = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic - (pE - pD) |> shouldEqual 0 - (tE - tD) |> shouldEqual 1 - (backgroundParseCount.Value <= 8) |> shouldEqual true // but note, the project does not get reparsed - (backgroundCheckCount.Value <= 8) |> shouldEqual true // only two extra typechecks of files - - // A subsequent ParseAndCheck of identical source code doesn't do any more anything - let checkResults2 = checker.ParseAndCheckFileInProject(ProjectBig.fileNames.[7], 0, ProjectBig.fileSources2.[7], ProjectBig.options) |> Async.RunSynchronously - let pF, tF = FSharpChecker.GlobalForegroundParseCountStatistic, FSharpChecker.GlobalForegroundTypeCheckCountStatistic - (pF - pE) |> shouldEqual 0 // note, no new parse of the file - (tF - tE) |> shouldEqual 0 // note, no new typecheck of the file - (backgroundParseCount.Value <= 8) |> shouldEqual true // but note, the project does not get reparsed - (backgroundCheckCount.Value <= 8) |> shouldEqual true // only two extra typechecks of files - - () [] // Simplified repro for https://github.com/Microsoft/visualfsharp/issues/2679 From 46be777d6f29f8211c5aaa9e311e8f8c084b0958 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Feb 2019 03:17:24 +0000 Subject: [PATCH 065/137] update baselines --- tests/service/ExprTests.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/service/ExprTests.fs b/tests/service/ExprTests.fs index d130ec2f994..7043d3c5759 100644 --- a/tests/service/ExprTests.fs +++ b/tests/service/ExprTests.fs @@ -2636,8 +2636,8 @@ let ``Test Operator Declarations for String`` () = "let testStringToUInt32Operator(e1) = LanguagePrimitives.ParseUInt32 (e1) @ (47,47--47,56)"; "let testStringToInt64Operator(e1) = LanguagePrimitives.ParseInt64 (e1) @ (48,47--48,55)"; "let testStringToUInt64Operator(e1) = LanguagePrimitives.ParseUInt64 (e1) @ (49,47--49,56)"; - "let testStringToSingleOperator(e1) = Single.Parse ((if Operators.op_Equality (e1,dflt) then dflt else e1.Replace(\"_\",\"\")),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider) @ (52,47--52,57)"; - "let testStringToDoubleOperator(e1) = Double.Parse ((if Operators.op_Equality (e1,dflt) then dflt else e1.Replace(\"_\",\"\")),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider) @ (53,47--53,55)"; + "let testStringToSingleOperator(e1) = ((if Object.ReferenceEquals (e1 :> Microsoft.FSharp.Core.obj,dflt) then Operators.Raise (new ArgumentNullException("s") :> Microsoft.FSharp.Core.exn) else ()); Single.Parse (e1.Replace("_",""),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider)) @ (52,47--52,57)"; + "let testStringToDoubleOperator(e1) = ((if Object.ReferenceEquals (e1 :> Microsoft.FSharp.Core.obj,dflt) then Operators.Raise (new ArgumentNullException("s") :> Microsoft.FSharp.Core.exn) else ()); Double.Parse (e1.Replace("_",""),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider)) @ (53,47--53,55)"; "let testStringToDecimalOperator(e1) = Decimal.Parse (e1,167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider) @ (54,47--54,57)"; "let testStringToCharOperator(e1) = Char.Parse (e1) @ (55,47--55,54)"; "let testStringToStringOperator(e1) = let matchValue: Microsoft.FSharp.Core.obj = Operators.Box (e1) in match (if Operators.op_Equality (matchValue,dflt) then $0 else (if matchValue :? System.IFormattable then $1 else $2)) targets ... @ (56,47--56,56)"; From 11d2e2d0d518badd57ef54a165cae42e9241c2f7 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Feb 2019 13:04:10 +0000 Subject: [PATCH 066/137] fix test --- tests/service/ExprTests.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/service/ExprTests.fs b/tests/service/ExprTests.fs index 7043d3c5759..25e632d072b 100644 --- a/tests/service/ExprTests.fs +++ b/tests/service/ExprTests.fs @@ -2636,8 +2636,8 @@ let ``Test Operator Declarations for String`` () = "let testStringToUInt32Operator(e1) = LanguagePrimitives.ParseUInt32 (e1) @ (47,47--47,56)"; "let testStringToInt64Operator(e1) = LanguagePrimitives.ParseInt64 (e1) @ (48,47--48,55)"; "let testStringToUInt64Operator(e1) = LanguagePrimitives.ParseUInt64 (e1) @ (49,47--49,56)"; - "let testStringToSingleOperator(e1) = ((if Object.ReferenceEquals (e1 :> Microsoft.FSharp.Core.obj,dflt) then Operators.Raise (new ArgumentNullException("s") :> Microsoft.FSharp.Core.exn) else ()); Single.Parse (e1.Replace("_",""),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider)) @ (52,47--52,57)"; - "let testStringToDoubleOperator(e1) = ((if Object.ReferenceEquals (e1 :> Microsoft.FSharp.Core.obj,dflt) then Operators.Raise (new ArgumentNullException("s") :> Microsoft.FSharp.Core.exn) else ()); Double.Parse (e1.Replace("_",""),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider)) @ (53,47--53,55)"; + "let testStringToSingleOperator(e1) = ((if Object.ReferenceEquals (e1 :> Microsoft.FSharp.Core.obj,dflt) then Operators.Raise (new ArgumentNullException(\"s\") :> Microsoft.FSharp.Core.exn) else ()); Single.Parse (e1.Replace(\"_\",\"\"),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider)) @ (52,47--52,57)"; + "let testStringToDoubleOperator(e1) = ((if Object.ReferenceEquals (e1 :> Microsoft.FSharp.Core.obj,dflt) then Operators.Raise (new ArgumentNullException(\"s\") :> Microsoft.FSharp.Core.exn) else ()); Double.Parse (e1.Replace(\"_\",\"\"),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider)) @ (53,47--53,55)"; "let testStringToDecimalOperator(e1) = Decimal.Parse (e1,167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider) @ (54,47--54,57)"; "let testStringToCharOperator(e1) = Char.Parse (e1) @ (55,47--55,54)"; "let testStringToStringOperator(e1) = let matchValue: Microsoft.FSharp.Core.obj = Operators.Box (e1) in match (if Operators.op_Equality (matchValue,dflt) then $0 else (if matchValue :? System.IFormattable then $1 else $2)) targets ... @ (56,47--56,56)"; From 99974d13d83e5a1b8d98cc72f9c9c7f0a6148fd2 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Feb 2019 20:26:47 +0000 Subject: [PATCH 067/137] fix test --- .../FSharp.Compiler.Service.Tests.fsproj | 1 + tests/service/ExprTests.fs | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj index 9c3eb687c20..be80fb0ef31 100644 --- a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -12,6 +12,7 @@ true false true + $(DefineConstants);USES_FSHARP_CORE_45_PACKAGE $(DefineConstants);FX_NO_RUNTIMEENVIRONMENT diff --git a/tests/service/ExprTests.fs b/tests/service/ExprTests.fs index 25e632d072b..84cf6d4306d 100644 --- a/tests/service/ExprTests.fs +++ b/tests/service/ExprTests.fs @@ -2636,8 +2636,14 @@ let ``Test Operator Declarations for String`` () = "let testStringToUInt32Operator(e1) = LanguagePrimitives.ParseUInt32 (e1) @ (47,47--47,56)"; "let testStringToInt64Operator(e1) = LanguagePrimitives.ParseInt64 (e1) @ (48,47--48,55)"; "let testStringToUInt64Operator(e1) = LanguagePrimitives.ParseUInt64 (e1) @ (49,47--49,56)"; +#if USES_FSHARP_CORE_45_PACKAGE + // the definition of these operators has changed slightly in latest FSharp.Core + "let testStringToSingleOperator(e1) = Single.Parse ((if Operators.op_Equality (e1,dflt) then dflt else e1.Replace(\"_\",\"\")),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider) @ (52,47--52,57)"; + "let testStringToDoubleOperator(e1) = Double.Parse ((if Operators.op_Equality (e1,dflt) then dflt else e1.Replace(\"_\",\"\")),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider) @ (53,47--53,55)"; +#else "let testStringToSingleOperator(e1) = ((if Object.ReferenceEquals (e1 :> Microsoft.FSharp.Core.obj,dflt) then Operators.Raise (new ArgumentNullException(\"s\") :> Microsoft.FSharp.Core.exn) else ()); Single.Parse (e1.Replace(\"_\",\"\"),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider)) @ (52,47--52,57)"; "let testStringToDoubleOperator(e1) = ((if Object.ReferenceEquals (e1 :> Microsoft.FSharp.Core.obj,dflt) then Operators.Raise (new ArgumentNullException(\"s\") :> Microsoft.FSharp.Core.exn) else ()); Double.Parse (e1.Replace(\"_\",\"\"),167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider)) @ (53,47--53,55)"; +#endif "let testStringToDecimalOperator(e1) = Decimal.Parse (e1,167,CultureInfo.get_InvariantCulture () :> System.IFormatProvider) @ (54,47--54,57)"; "let testStringToCharOperator(e1) = Char.Parse (e1) @ (55,47--55,54)"; "let testStringToStringOperator(e1) = let matchValue: Microsoft.FSharp.Core.obj = Operators.Box (e1) in match (if Operators.op_Equality (matchValue,dflt) then $0 else (if matchValue :? System.IFormattable then $1 else $2)) targets ... @ (56,47--56,56)"; From 522c26e37b8bb9ca1eb2b74efc2d67200344cdf2 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Sat, 2 Mar 2019 04:22:10 -0800 Subject: [PATCH 068/137] Compat fix for 6258 and fix deterministic flag (#6295) (#6303) * Make .NET Desktop fsi.exe 32-bit again and make Desktop fsiAnyCpu.exe (64-bit) the default to launch in VS #6223 * make fsc.exe 32-bit for compat * make fsc.exe 32-bit for compat * improve diagnostics * fix tests * fix determinism --- build/targets/NGenOrCrossGen.targets | 4 ++-- src/absil/ilwrite.fs | 5 ++--- src/fsharp/fsc/fsc.fsproj | 4 ++++ src/fsharp/fsi/fsi.fsproj | 1 + .../CompilerOptions/fsc/determinism/binaryCompare.fsx | 6 ++++-- tests/fsharpqa/Source/run.pl | 4 +++- .../src/HostedCompilerServer/HostedCompilerServer.fsproj | 2 ++ vsintegration/src/FSharp.VS.FSI/sessions.fs | 2 +- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/build/targets/NGenOrCrossGen.targets b/build/targets/NGenOrCrossGen.targets index 33dcaa3a63a..3dba4fc5b2d 100644 --- a/build/targets/NGenOrCrossGen.targets +++ b/build/targets/NGenOrCrossGen.targets @@ -16,9 +16,9 @@ NGen for both 32 and 64 bit product. If compiling use the app config file, if present. --> - + - + diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs index ccc40c69d74..cac9ccbcefe 100644 --- a/src/absil/ilwrite.fs +++ b/src/absil/ilwrite.fs @@ -2857,9 +2857,8 @@ and newGuid (modul: ILModuleDef) = and deterministicGuid (modul: ILModuleDef) = let n = 16909060 - let m = hash n - let m2 = hash modul.Name - [| b0 m; b1 m; b2 m; b3 m; b0 m2; b1 m2; b2 m2; b3 m2; 0xa7uy; 0x45uy; 0x03uy; 0x83uy; b0 n; b1 n; b2 n; b3 n |] + let m2 = Seq.sum (Seq.mapi (fun i x -> i + int x) modul.Name) // use a stable hash + [| b0 n; b1 n; b2 n; b3 n; b0 m2; b1 m2; b2 m2; b3 m2; 0xa7uy; 0x45uy; 0x03uy; 0x83uy; b0 n; b1 n; b2 n; b3 n |] and GetModuleAsRow (cenv:cenv) (modul: ILModuleDef) = // Store the generated MVID in the environment (needed for generating debug information) diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj index 40f56a0627e..a2e5127b61a 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -15,6 +15,10 @@ true + + x86 + + fscmain.fs diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index 6987a35c3cd..5224ac73c67 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -18,6 +18,7 @@ + x86 $(DefineConstants);FSI_SHADOW_COPY_REFERENCES;FSI_SERVER diff --git a/tests/fsharpqa/Source/CompilerOptions/fsc/determinism/binaryCompare.fsx b/tests/fsharpqa/Source/CompilerOptions/fsc/determinism/binaryCompare.fsx index 2147b88cb83..c70512bb866 100644 --- a/tests/fsharpqa/Source/CompilerOptions/fsc/determinism/binaryCompare.fsx +++ b/tests/fsharpqa/Source/CompilerOptions/fsc/determinism/binaryCompare.fsx @@ -13,8 +13,10 @@ let filePairsToCheck = |> Seq.map (fun f -> f, f.Replace("dummy","dummy2")) let compareFiles pair = - let correct = areSame pair = shouldBeSame - if not correct then + let correct = (areSame pair = shouldBeSame) + if correct then + printfn "Good, %s and %s were %s" (fst pair) (snd pair) (if shouldBeSame then "same" else "different") + else printfn "Expected %s and %s to be %s" (fst pair) (snd pair) (if shouldBeSame then "same" else "different") correct diff --git a/tests/fsharpqa/Source/run.pl b/tests/fsharpqa/Source/run.pl index d9c3de8c3de..e9363e6aea6 100644 --- a/tests/fsharpqa/Source/run.pl +++ b/tests/fsharpqa/Source/run.pl @@ -424,7 +424,9 @@ sub RunCompilerCommand { @CommandOutput = <$remote>; print "--------------------------------------------------------\n"; - print "Error from hosted compiler\n"; + print "Results from hosted compiler\n"; + print "msg: $msg\n"; + print "cmd: $cmd\n"; print "Exit code: $ExitCode\n"; print "Error: $Type\n"; print @CommandOutput; diff --git a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj index 994b9060c14..915c0c9e106 100644 --- a/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj +++ b/tests/fsharpqa/testenv/src/HostedCompilerServer/HostedCompilerServer.fsproj @@ -8,6 +8,8 @@ true false $(RepoRoot)tests\fsharpqa\testenv\bin + AnyCPU + true diff --git a/vsintegration/src/FSharp.VS.FSI/sessions.fs b/vsintegration/src/FSharp.VS.FSI/sessions.fs index 63f87507fd2..39174d5ac5b 100644 --- a/vsintegration/src/FSharp.VS.FSI/sessions.fs +++ b/vsintegration/src/FSharp.VS.FSI/sessions.fs @@ -66,7 +66,7 @@ let timeoutApp descr timeoutMS (f : 'a -> 'b) (arg:'a) = !r module SessionsProperties = - let mutable useAnyCpuVersion = false + let mutable useAnyCpuVersion = true // 64-bit by default let mutable fsiArgs = "--optimize" let mutable fsiShadowCopy = true let mutable fsiDebugMode = false From d1b13890945a95cfc691ab94e70f74bbc5c015a7 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sat, 9 Mar 2019 16:54:17 -0800 Subject: [PATCH 069/137] add diagnostics --- tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs b/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs index 45974519909..e7a924bcfaa 100644 --- a/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs +++ b/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs @@ -4026,7 +4026,7 @@ namespace ProviderImplementation.ProvidedTypes.AssemblyReader // Emit compressed untagged integer member buf.EmitZUntaggedIndex big idx = if big then buf.EmitInt32 idx - elif idx > 0xffff then failwith "EmitZUntaggedIndex: too big for small address or simple index" + elif idx > 0xffff then failwithf "EmitZUntaggedIndex: too big for small address or simple index, idx = %d, big = %A, stack = %s" idx big ((new System.Diagnostics.StackTrace()).ToString()) else buf.EmitInt32AsUInt16 idx // Emit compressed tagged integer From 0f897111104f50dc93f2495c5f2c214de87e96ba Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sat, 9 Mar 2019 16:54:17 -0800 Subject: [PATCH 070/137] add diagnostics From 7da6aff62f0c5f68453579b0747feb8cedf8d984 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 11 Mar 2019 14:42:08 +0000 Subject: [PATCH 071/137] diagnostics --- src/absil/ilwrite.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs index cac9ccbcefe..8cd58c957a1 100644 --- a/src/absil/ilwrite.fs +++ b/src/absil/ilwrite.fs @@ -89,7 +89,7 @@ type ByteBuffer with // Emit compressed untagged integer member buf.EmitZUntaggedIndex big idx = if big then buf.EmitInt32 idx - elif idx > 0xffff then failwith "EmitZUntaggedIndex: too big for small address or simple index" + elif idx > 0xffff then failwithf "EmitZUntaggedIndex: too big for small address or simple index, idx = %d, big = %A, stack = %s" idx big ((new System.Diagnostics.StackTrace()).ToString()) else buf.EmitInt32AsUInt16 idx // Emit compressed tagged integer From 871489bd13e9eb55cef3d212b0f4211a5a877c6c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 11 Mar 2019 14:51:43 +0000 Subject: [PATCH 072/137] diagnostics --- src/absil/ilwrite.fs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs index 8cd58c957a1..6e13993d7f8 100644 --- a/src/absil/ilwrite.fs +++ b/src/absil/ilwrite.fs @@ -87,9 +87,9 @@ type ByteBuffer with buf.EmitByte 0x0uy // Emit compressed untagged integer - member buf.EmitZUntaggedIndex big idx = + member buf.EmitZUntaggedIndex nm sz big idx = if big then buf.EmitInt32 idx - elif idx > 0xffff then failwithf "EmitZUntaggedIndex: too big for small address or simple index, idx = %d, big = %A, stack = %s" idx big ((new System.Diagnostics.StackTrace()).ToString()) + elif idx > 0xffff then failwithf "EmitZUntaggedIndex: index into table '%d' is too big for small address or simple index, idx = %d, big = %A, size of table = %d, stack = %s" nm idx big sz ((new System.Diagnostics.StackTrace()).ToString()) else buf.EmitInt32AsUInt16 idx // Emit compressed tagged integer @@ -3198,8 +3198,10 @@ let writeILMetadataAndCode (generatePdb, desiredMetadataVersion, ilg, emitTailca let codedTables = + let sizesTable = Array.map Array.length sortedTables let bignessTable = Array.map (fun rows -> Array.length rows >= 0x10000) sortedTables let bigness (tab:int32) = bignessTable.[tab] + let size (tab:int32) = sizesTable.[tab] let codedBigness nbits tab = (tableSize tab) >= (0x10000 >>> nbits) @@ -3323,10 +3325,12 @@ let writeILMetadataAndCode (generatePdb, desiredMetadataVersion, ilg, emitTailca | _ when t = RowElementTags.ULong -> tablesBuf.EmitInt32 n | _ when t = RowElementTags.Data -> recordRequiredDataFixup requiredDataFixups tablesBuf (tablesStreamStart + tablesBuf.Position) (n, false) | _ when t = RowElementTags.DataResources -> recordRequiredDataFixup requiredDataFixups tablesBuf (tablesStreamStart + tablesBuf.Position) (n, true) - | _ when t = RowElementTags.Guid -> tablesBuf.EmitZUntaggedIndex guidsBig (guidAddress n) - | _ when t = RowElementTags.Blob -> tablesBuf.EmitZUntaggedIndex blobsBig (blobAddress n) - | _ when t = RowElementTags.String -> tablesBuf.EmitZUntaggedIndex stringsBig (stringAddress n) - | _ when t <= RowElementTags.SimpleIndexMax -> tablesBuf.EmitZUntaggedIndex (bigness (t - RowElementTags.SimpleIndexMin)) n + | _ when t = RowElementTags.Guid -> tablesBuf.EmitZUntaggedIndex -3 guidsStreamPaddedSize guidsBig (guidAddress n) + | _ when t = RowElementTags.Blob -> tablesBuf.EmitZUntaggedIndex -2 blobsStreamPaddedSize blobsBig (blobAddress n) + | _ when t = RowElementTags.String -> tablesBuf.EmitZUntaggedIndex -1 stringsStreamPaddedSize stringsBig (stringAddress n) + | _ when t <= RowElementTags.SimpleIndexMax -> + let tnum = t - RowElementTags.SimpleIndexMin + tablesBuf.EmitZUntaggedIndex tnum (size tnum) (bigness tnum) n | _ when t <= RowElementTags.TypeDefOrRefOrSpecMax -> tablesBuf.EmitZTaggedIndex (t - RowElementTags.TypeDefOrRefOrSpecMin) 2 tdorBigness n | _ when t <= RowElementTags.TypeOrMethodDefMax -> tablesBuf.EmitZTaggedIndex (t - RowElementTags.TypeOrMethodDefMin) 1 tomdBigness n | _ when t <= RowElementTags.HasConstantMax -> tablesBuf.EmitZTaggedIndex (t - RowElementTags.HasConstantMin) 2 hcBigness n From 27d00a09c829d9d3086bd056c81b880a5c7c970f Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 11 Mar 2019 14:53:57 +0000 Subject: [PATCH 073/137] diagnostics --- tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs b/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs index e7a924bcfaa..45974519909 100644 --- a/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs +++ b/tests/EndToEndBuildTests/ProvidedTypes/ProvidedTypes.fs @@ -4026,7 +4026,7 @@ namespace ProviderImplementation.ProvidedTypes.AssemblyReader // Emit compressed untagged integer member buf.EmitZUntaggedIndex big idx = if big then buf.EmitInt32 idx - elif idx > 0xffff then failwithf "EmitZUntaggedIndex: too big for small address or simple index, idx = %d, big = %A, stack = %s" idx big ((new System.Diagnostics.StackTrace()).ToString()) + elif idx > 0xffff then failwith "EmitZUntaggedIndex: too big for small address or simple index" else buf.EmitInt32AsUInt16 idx // Emit compressed tagged integer From 7d98d16f6a55a9877089a9ec144d2699d2c589e5 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 11 Mar 2019 15:03:22 +0000 Subject: [PATCH 074/137] add diagnostics and possible fix for tp smoke tests --- .../DummyProviderForLanguageServiceTesting.fs | 27 ++++++++++--------- .../Tests.LanguageService.Script.fs | 6 +++-- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fs b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fs index 1e17fda491f..697ba4a2d7a 100644 --- a/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fs +++ b/vsintegration/tests/MockTypeProviders/DummyProviderForLanguageServiceTesting/DummyProviderForLanguageServiceTesting.fs @@ -113,33 +113,36 @@ module internal TPModule = // Used by unit testing to check that Dispose is being called on the type provider module GlobalCounters = - let mutable creations = 0 - let mutable disposals = 0 - let mutable configs = ([]: TypeProviderConfig list) - let GetTotalCreations() = creations - let GetTotalDisposals() = disposals + let counterLock = obj() + let mutable private creations = 0 + let mutable private disposals = 0 + let mutable private configs = ([]: TypeProviderConfig list) + let GetTotalCreations() = lock counterLock (fun () -> creations) + let GetTotalDisposals() = lock counterLock (fun () -> disposals) + let IncrementCreations() = lock counterLock (fun () -> creations <- creations + 1) + let IncrementDisposals() = lock counterLock (fun () -> disposals <- disposals + 1) + let AddConfig c = lock counterLock (fun () -> configs <- c :: configs) + let GetConfigs() = lock counterLock (fun () -> configs) let CheckAllConfigsDisposed() = - for c in configs do + for c in GetConfigs() do try c.SystemRuntimeContainsType("System.Object") |> ignore failwith "expected configuration object to be disposed" with :? System.ObjectDisposedException -> () - - [] type HelloWorldProvider(config: TypeProviderConfig) = inherit TypeProviderForNamespaces(TPModule.namespaceName,TPModule.types) - do GlobalCounters.creations <- GlobalCounters.creations + 1 + do GlobalCounters.IncrementCreations() let mutable disposed = false - do GlobalCounters.configs <- config :: GlobalCounters.configs + do GlobalCounters.AddConfig config interface System.IDisposable with member x.Dispose() = System.Diagnostics.Debug.Assert(not disposed) disposed <- true - GlobalCounters.disposals <- GlobalCounters.disposals + 1 - if GlobalCounters.disposals % 5 = 0 then failwith "simulate random error during disposal" + do GlobalCounters.IncrementDisposals() + if GlobalCounters.GetTotalDisposals() % 5 = 0 then failwith "simulate random error during disposal" // implementation of a poorly behaving TP that sleeps for various numbers of seconds when traversing into members. diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs index cbe55e9baf9..9255acf3436 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.Script.fs @@ -1624,8 +1624,10 @@ type UsingMSBuild() as this = // The disposals should be at least one less Assert.IsTrue(countDisposals() < i, "Check1, countDisposals() < i, iteration " + string i) - Assert.IsTrue(countCreations() >= countDisposals(), "Check2, countCreations() >= countDisposals(), iteration " + string i) - Assert.IsTrue(countCreations() = i, "Check3, countCreations() = i, iteration " + string i) + let c = countCreations() + let d = countDisposals() + Assert.IsTrue(c >= countDisposals(), "Check2, countCreations() >= countDisposals(), iteration " + string i + ", countCreations() = " + string c + ", countDisposals() = " + string d) + Assert.IsTrue((c = i), "Check3, countCreations() = i, iteration " + string i + ", countCreations() = " + string c) if not clearing then // By default we hold 3 build incrementalBuilderCache entries and 5 typeCheckInfo entries, so if we're not clearing // there should be some roots to project builds still present From cc6e992c0600f51da712bad6012333238d8bf2fa Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 11 Mar 2019 15:30:09 +0000 Subject: [PATCH 075/137] fix build --- src/absil/ilwrite.fs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs index 6e13993d7f8..4ef18af0069 100644 --- a/src/absil/ilwrite.fs +++ b/src/absil/ilwrite.fs @@ -89,7 +89,13 @@ type ByteBuffer with // Emit compressed untagged integer member buf.EmitZUntaggedIndex nm sz big idx = if big then buf.EmitInt32 idx - elif idx > 0xffff then failwithf "EmitZUntaggedIndex: index into table '%d' is too big for small address or simple index, idx = %d, big = %A, size of table = %d, stack = %s" nm idx big sz ((new System.Diagnostics.StackTrace()).ToString()) + elif idx > 0xffff then +#if NETSTANDARD1_6 + let trace = "no stack trace on.NET Standard 1.6" +#else + let trace = (new Diagnostics.StackTrace()).ToString() +#endif + failwithf "EmitZUntaggedIndex: index into table '%d' is too big for small address or simple index, idx = %d, big = %A, size of table = %d, stack = %s" nm idx big sz trace else buf.EmitInt32AsUInt16 idx // Emit compressed tagged integer From e13b385554fac0903a9079123ef238c56d87148c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 11 Mar 2019 16:47:00 +0000 Subject: [PATCH 076/137] fix build --- src/absil/ilwrite.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/absil/ilwrite.fs b/src/absil/ilwrite.fs index 4ef18af0069..62628eb0162 100644 --- a/src/absil/ilwrite.fs +++ b/src/absil/ilwrite.fs @@ -93,7 +93,7 @@ type ByteBuffer with #if NETSTANDARD1_6 let trace = "no stack trace on.NET Standard 1.6" #else - let trace = (new Diagnostics.StackTrace()).ToString() + let trace = (new System.Diagnostics.StackTrace()).ToString() #endif failwithf "EmitZUntaggedIndex: index into table '%d' is too big for small address or simple index, idx = %d, big = %A, size of table = %d, stack = %s" nm idx big sz trace else buf.EmitInt32AsUInt16 idx From a2b033801ad86411bc4d2faa32e1afb45b8127d1 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 12 Mar 2019 09:21:45 +0000 Subject: [PATCH 077/137] fix build --- src/fsharp/FSharp.Build/Fsi.fs | 39 ++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/src/fsharp/FSharp.Build/Fsi.fs b/src/fsharp/FSharp.Build/Fsi.fs index 18975b9746a..1be1a8ec9ee 100644 --- a/src/fsharp/FSharp.Build/Fsi.fs +++ b/src/fsharp/FSharp.Build/Fsi.fs @@ -29,27 +29,19 @@ type public Fsi () as this = let mutable capturedArguments : string list = [] // list of individual args, to pass to HostObject Compile() let mutable capturedFilenames : string list = [] // list of individual source filenames, to pass to HostObject Compile() - let mutable codePage : string? = null let mutable commandLineArgs : ITaskItem list = [] let mutable defineConstants : ITaskItem[] = [||] - let mutable disabledWarnings : string? = null - let mutable dotnetFsiCompilerPath : string? = null let mutable fsiExec = false let mutable noFramework = false let mutable optimize = true - let mutable otherFlags : string? = null - let mutable preferredUILang : string? = null let mutable provideCommandLineArgs = false let mutable references : ITaskItem[] = [||] - let mutable referencePath : string? = null let mutable resources : ITaskItem[] = [||] let mutable skipCompilerExecution = false let mutable sources : ITaskItem[] = [||] let mutable loadSources : ITaskItem[] = [||] let mutable useSources : ITaskItem[] = [||] let mutable tailcalls : bool = true - let mutable targetProfile : string? = null - let mutable targetType : string? = null let mutable toolExe : string = "fsi.exe" let mutable toolPath : string = let locationOfThisDll = @@ -59,11 +51,35 @@ type public Fsi () as this = | Some s -> s | None -> "" let mutable treatWarningsAsErrors : bool = false + let mutable utf8output : bool = false + +#if BUILDING_WITH_LKG || BUILD_FROM_SOURCE + let mutable codePage : string = null + let mutable disabledWarnings : string = null + let mutable dotnetFsiCompilerPath : string = null + let mutable otherFlags : string = null + let mutable preferredUILang : string = null + let mutable targetProfile : string = null + let mutable targetType : string = null + let mutable referencePath : string = null + let mutable warningsAsErrors : string = null + let mutable warningsNotAsErrors : string = null + let mutable warningLevel : string = null + let mutable vslcid : string = null +#else + let mutable codePage : string? = null + let mutable disabledWarnings : string? = null + let mutable dotnetFsiCompilerPath : string? = null + let mutable otherFlags : string? = null + let mutable preferredUILang : string? = null + let mutable targetProfile : string? = null + let mutable targetType : string? = null + let mutable referencePath : string? = null let mutable warningsAsErrors : string? = null let mutable warningsNotAsErrors : string? = null let mutable warningLevel : string? = null let mutable vslcid : string? = null - let mutable utf8output : bool = false +#endif // See bug 6483; this makes parallel build faster, and is fine to set unconditionally do this.YieldDuringToolExecution <- true @@ -262,15 +278,20 @@ type public Fsi () as this = // ToolTask methods override fsi.ToolName = "fsi.exe" + override fsi.StandardErrorEncoding = if utf8output then System.Text.Encoding.UTF8 else base.StandardErrorEncoding + override fsi.StandardOutputEncoding = if utf8output then System.Text.Encoding.UTF8 else base.StandardOutputEncoding + override fsi.GenerateFullPathToTool() = if toolPath = "" then raise (new System.InvalidOperationException(FSBuild.SR.toolpathUnknown())) System.IO.Path.Combine(toolPath, fsi.ToolExe) + override fsi.LogToolCommand (message:string) = fsi.Log.LogMessageFromText(message, MessageImportance.Normal) |>ignore member internal fsi.InternalGenerateFullPathToTool() = fsi.GenerateFullPathToTool() // expose for unit testing + member internal fsi.BaseExecuteTool(pathToTool, responseFileCommands, commandLineCommands) = // F# does not allow protected members to be captured by lambdas, this is the standard workaround base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands) From a9bce21e13a8dc047ae988bbe1d9d3a85e62e85d Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 20 Mar 2019 18:14:02 +0000 Subject: [PATCH 078/137] finish integration --- src/absil/illib.fs | 27 +-- src/absil/ilread.fs | 6 - src/absil/ilreflect.fs | 58 +----- src/absil/ilsupp.fs | 123 +----------- src/fsharp/CompileOps.fs | 95 ++------- src/fsharp/ConstraintSolver.fs | 14 -- src/fsharp/ExtensionTyping.fs | 136 ++----------- src/fsharp/FindUnsolved.fs | 8 +- src/fsharp/NameResolution.fs | 18 +- src/fsharp/Optimizer.fs | 6 +- src/fsharp/TastPickle.fs | 67 +------ src/fsharp/TypeChecker.fs | 189 ++++-------------- src/fsharp/TypeRelations.fs | 45 +---- src/fsharp/ast.fs | 18 +- src/fsharp/import.fs | 14 +- src/fsharp/lib.fs | 15 +- src/fsharp/service/ServiceDeclarationLists.fs | 9 +- src/fsharp/symbols/Exprs.fs | 12 +- src/fsharp/tast.fs | 4 - 19 files changed, 111 insertions(+), 753 deletions(-) diff --git a/src/absil/illib.fs b/src/absil/illib.fs index e1eee098cd5..a1008c6ed95 100644 --- a/src/absil/illib.fs +++ b/src/absil/illib.fs @@ -557,11 +557,7 @@ module String = /// Splits a string into substrings based on the strings in the array separators let split options (separator: string []) (value: string) = -<<<<<<< HEAD value.Split(separator, options) -======= - if isNull value then null else value.Split(separator, options) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let (|StartsWith|_|) pattern value = if String.IsNullOrWhiteSpace value then @@ -1344,43 +1340,32 @@ module Shim = member __.IsPathRootedShim (path: string) = Path.IsPathRooted path member __.IsInvalidPathShim(path: string) = -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let isInvalidPath(p:string) = + let isInvalidPath(p: string) = #else - let isInvalidPath(p:string?) = + let isInvalidPath(p: string?) = #endif match p with | null | "" -> true | NonNull p -> p.IndexOfAny(Path.GetInvalidPathChars()) <> -1 #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let isInvalidFilename(p:string) = + let isInvalidFilename(p: string) = #else - let isInvalidFilename(p:string?) = + let isInvalidFilename(p: string?) = #endif match p with | null | "" -> true | NonNull p -> p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1 #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let isInvalidDirectory(d:string) = + let isInvalidDirectory(d: string) = #else - let isInvalidDirectory(d:string?) = + let isInvalidDirectory(d: string?) = #endif match d with | null -> true | NonNull d -> d.IndexOfAny(Path.GetInvalidPathChars()) <> -1 -======= - let isInvalidPath(p: string) = - String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidPathChars()) <> -1 - - let isInvalidFilename(p: string) = - String.IsNullOrEmpty(p) || p.IndexOfAny(Path.GetInvalidFileNameChars()) <> -1 - - let isInvalidDirectory(d: string) = - d=null || d.IndexOfAny(Path.GetInvalidPathChars()) <> -1 ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb isInvalidPath (path) || let directory = Path.GetDirectoryName(path) diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index 8cfab68e79c..2f28b813de2 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -936,18 +936,12 @@ let mkCacheGeneric lowMem _inbase _nm _sz = fun f (idx :'T) -> let cache = match !cache with -<<<<<<< HEAD | null -> let c = new Dictionary<_, _>(11) cache := c c | NonNull c -> c -======= - | null -> cache := new Dictionary<_, _>(11 (* sz: int *) ) - | _ -> () - !cache ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb match cache.TryGetValue(idx) with | true, v -> incr count diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs index b7de33cc81d..3e7ef2d65d2 100644 --- a/src/absil/ilreflect.fs +++ b/src/absil/ilreflect.fs @@ -390,15 +390,11 @@ let emEnv0 = emEntryPts = [] delayedFieldInits = [] } -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE -let envBindTypeRef emEnv (tref:ILTypeRef) (typT: System.Type, typB, typeDef)= +let envBindTypeRef emEnv (tref: ILTypeRef) (typT: System.Type, typB, typeDef)= #else -let envBindTypeRef emEnv (tref:ILTypeRef) (typT: System.Type?, typB, typeDef)= +let envBindTypeRef emEnv (tref: ILTypeRef) (typT: System.Type?, typB, typeDef)= #endif -======= -let envBindTypeRef emEnv (tref: ILTypeRef) (typT, typB, typeDef) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb match typT with | null -> failwithf "binding null type in envBindTypeRef: %s\n" tref.Name | NonNull typT -> @@ -430,23 +426,11 @@ let envUpdateCreatedTypeRef emEnv (tref: ILTypeRef) = #endif emEnv -<<<<<<< HEAD -let convTypeRef cenv emEnv preferCreated (tref:ILTypeRef) = +let convTypeRef cenv emEnv preferCreated (tref: ILTypeRef) = match Zmap.tryFind tref emEnv.emTypMap with | Some (_typT, _typB, _typeDef, Some createdTy) when preferCreated -> createdTy | Some (typT, _typB, _typeDef, _) -> typT | None -> convTypeRefAux cenv tref -======= -let convTypeRef cenv emEnv preferCreated (tref: ILTypeRef) = - let res = - match Zmap.tryFind tref emEnv.emTypMap with - | Some (_typT, _typB, _typeDef, Some createdTy) when preferCreated -> createdTy - | Some (typT, _typB, _typeDef, _) -> typT - | None -> convTypeRefAux cenv tref - match res with - | null -> error(Error(FSComp.SR.itemNotFoundDuringDynamicCodeGen ("type", tref.QualifiedName, tref.Scope.QualifiedName), range0)) - | _ -> res ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let envBindConsRef emEnv (mref: ILMethodRef) consB = {emEnv with emConsMap = Zmap.add mref consB emEnv.emConsMap} @@ -784,11 +768,7 @@ let queryableTypeGetMethodBySearch cenv emEnv parentT (mref: ILMethodRef) = failwithf "convMethodRef: could not bind to method '%A' of type '%s'" (System.String.Join(", ", methNames)) parentT.AssemblyQualifiedName | Some methInfo -> methInfo (* return MethodInfo for (generic) type's (generic) method *) -<<<<<<< HEAD -let queryableTypeGetMethod cenv emEnv parentT (mref:ILMethodRef) : MethodInfo = -======= -let queryableTypeGetMethod cenv emEnv parentT (mref: ILMethodRef) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb +let queryableTypeGetMethod cenv emEnv parentT (mref: ILMethodRef) : MethodInfo = assert(not (typeIsNotQueryable(parentT))) if mref.GenericArity = 0 then let tyargTs = getGenericArgumentsOfType parentT @@ -826,25 +806,17 @@ let queryableTypeGetMethod cenv emEnv parentT (mref: ILMethodRef) = else queryableTypeGetMethodBySearch cenv emEnv parentT mref -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let nonQueryableTypeGetMethod (parentTI:Type) (methInfo : MethodInfo) : MethodInfo = #else let nonQueryableTypeGetMethod (parentTI:Type) (methInfo : MethodInfo) : MethodInfo? = #endif -======= -let nonQueryableTypeGetMethod (parentTI: Type) (methInfo: MethodInfo) : MethodInfo = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb if (parentTI.IsGenericType && not (equalTypes parentTI (getTypeConstructor parentTI))) then TypeBuilder.GetMethod(parentTI, methInfo ) else methInfo -<<<<<<< HEAD -let convMethodRef cenv emEnv (parentTI:Type) (mref:ILMethodRef) : MethodInfo = -======= -let convMethodRef cenv emEnv (parentTI: Type) (mref: ILMethodRef) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb +let convMethodRef cenv emEnv (parentTI: Type) (mref: ILMethodRef) : MethodInfo = let parent = mref.DeclaringTypeRef let res = if isEmittedTypeRef emEnv parent then @@ -884,11 +856,7 @@ let convMethodSpec cenv emEnv (mspec: ILMethodSpec) = // - QueryableTypeGetConstructors: get a constructor on a non-TypeBuilder type //---------------------------------------------------------------------------- -<<<<<<< HEAD -let queryableTypeGetConstructor cenv emEnv (parentT:Type) (mref:ILMethodRef) : ConstructorInfo = -======= -let queryableTypeGetConstructor cenv emEnv (parentT: Type) (mref: ILMethodRef) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb +let queryableTypeGetConstructor cenv emEnv (parentT: Type) (mref: ILMethodRef) : ConstructorInfo = let tyargTs = getGenericArgumentsOfType parentT let reqArgTs = let emEnv = envPushTyvars emEnv tyargTs @@ -899,15 +867,11 @@ let queryableTypeGetConstructor cenv emEnv (parentT: Type) (mref: ILMethodRef) | NonNull res -> res -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let nonQueryableTypeGetConstructor (parentTI:Type) (consInfo : ConstructorInfo) : ConstructorInfo = #else let nonQueryableTypeGetConstructor (parentTI:Type) (consInfo : ConstructorInfo) : ConstructorInfo? = #endif -======= -let nonQueryableTypeGetConstructor (parentTI: Type) (consInfo: ConstructorInfo) : ConstructorInfo = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb if parentTI.IsGenericType then TypeBuilder.GetConstructor(parentTI, consInfo) else consInfo //---------------------------------------------------------------------------- @@ -1328,11 +1292,7 @@ let rec emitInstr cenv (modB: ModuleBuilder) emEnv (ilG: ILGenerator) instr = setArrayMethInfo shape.Rank ety else #endif -<<<<<<< HEAD - modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, null, Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) -======= - modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, (null: Type), Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + modB.GetArrayMethodAndLog(aty, "Set", System.Reflection.CallingConventions.HasThis, null, Array.append (Array.create shape.Rank (typeof)) (Array.ofList [ ety ])) ilG.EmitAndLog(OpCodes.Call, meth) | I_newarr (shape, ty) -> @@ -1340,11 +1300,7 @@ let rec emitInstr cenv (modB: ModuleBuilder) emEnv (ilG: ILGenerator) instr = then ilG.EmitAndLog(OpCodes.Newarr, convType cenv emEnv ty) else let aty = convType cenv emEnv (ILType.Array(shape, ty)) -<<<<<<< HEAD let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, null, Array.create shape.Rank (typeof)) -======= - let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, (null: Type), Array.create shape.Rank (typeof)) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb ilG.EmitAndLog(OpCodes.Newobj, meth) | I_ldlen -> ilG.EmitAndLog(OpCodes.Ldlen) diff --git a/src/absil/ilsupp.fs b/src/absil/ilsupp.fs index 0b57f1a901a..5f54a134631 100644 --- a/src/absil/ilsupp.fs +++ b/src/absil/ilsupp.fs @@ -894,12 +894,11 @@ type ImageDebugDirectory = [] [] type ISymUnmanagedWriter2 = -<<<<<<< HEAD - abstract DefineDocument : [] url : string * - language : System.Guid byref * - languageVendor : System.Guid byref * - documentType : System.Guid byref * - [] RetVal : ISymUnmanagedDocumentWriter byref -> unit + abstract DefineDocument: [] url: string * + language: System.Guid byref * + languageVendor: System.Guid byref * + documentType: System.Guid byref * + [] RetVal: ISymUnmanagedDocumentWriter byref -> unit abstract SetUserEntryPoint : entryMethod : uint32 -> unit abstract OpenMethod : meth : int -> unit abstract CloseMethod : unit -> unit @@ -1009,118 +1008,6 @@ type ISymUnmanagedWriter2 = type PdbWriter = { symWriter : ISymUnmanagedWriter2 } type PdbDocumentWriter = { symDocWriter : ISymUnmanagedDocumentWriter } (* pointer to pDocumentWriter COM object *) -======= - abstract DefineDocument: [] url: string * - language: System.Guid byref * - languageVendor: System.Guid byref * - documentType: System.Guid byref * - [] RetVal: ISymUnmanagedDocumentWriter byref -> unit - abstract SetUserEntryPoint: entryMethod: uint32 -> unit - abstract OpenMethod: meth: int -> unit - abstract CloseMethod: unit -> unit - abstract OpenScope: startOffset: int * pRetVal: int byref -> unit - abstract CloseScope: endOffset: int -> unit - abstract SetScopeRange: scopeID: int * startOffset: int * endOffset: int -> unit - abstract DefineLocalVariable: [] varname: string * - attributes: int * - cSig: int * - []signature: byte[] * - addressKind: int * - addr1: int * - addr2: int * - addr3: int * - startOffset: int * - endOffset: int -> unit - abstract DefineParameter: [] paramname: string * - attributes: int * - sequence: int * - addressKind: int * - addr1: int * - addr2: int * - addr3: int -> unit - abstract DefineField: parent: int * - [] fieldname: string * - attributes: int * - cSig: int * - []signature: byte[] * - addressKind: int * - addr1: int * - addr2: int * - addr3: int -> unit - abstract DefineGlobalVariable: [] globalvarname: string * - attributes: int * - cSig: int * - []signature: byte[] * - addressKind: int * - addr1: int * - addr2: int * - addr3: int -> unit - abstract Close: unit -> unit - abstract SetSymAttribute: parent: int * - [] attname: string * - cData: int * - []data: byte[] -> unit - abstract OpenNamespace: [] nsname: string -> unit - abstract CloseNamespace: unit -> unit - abstract UsingNamespace: [] fullName: string -> unit - abstract SetMethodSourceRange: startDoc: ISymUnmanagedDocumentWriter * - startLine: int * - startColumn: int * - endDoc: ISymUnmanagedDocumentWriter * - endLine: int * - endColumn: int -> unit - abstract Initialize: emitter: nativeint * - [] filename: string * - stream: IStream * - fullBuild: bool -> unit - abstract GetDebugInfo: iDD: ImageDebugDirectory byref * - cData: int * - pcData: int byref * - []data: byte[] -> unit - abstract DefineSequencePoints: document: ISymUnmanagedDocumentWriter * - spCount: int * - []offsets: int [] * - []lines: int [] * - []columns: int [] * - []endLines: int [] * - []endColumns: int [] -> unit - abstract RemapToken: oldToken: int * newToken: int -> unit - abstract Initialize2: emitter: nativeint * - [] tempfilename: string * - stream: IStream * - fullBuild: bool * - [] finalfilename: string -> unit - abstract DefineConstant: [] constname: string * - value: Object * - cSig: int * - []signature: byte[] -> unit - abstract Abort: unit -> unit - abstract DefineLocalVariable2: [] localvarname2: string * - attributes: int * - sigToken: int * - addressKind: int * - addr1: int * - addr2: int * - addr3: int * - startOffset: int * - endOffset: int -> unit - abstract DefineGlobalVariable2: [] globalvarname2: string * - attributes: int * - sigToken: int * - addressKind: int * - addr1: int * - addr2: int * - addr3: int -> unit - abstract DefineConstant2: [] constantname2: string * - value: Object * - sigToken: int -> unit - abstract OpenMethod2: method2: int * - isect: int * - offset: int -> unit - -type PdbWriter = { symWriter: ISymUnmanagedWriter2 } -type PdbDocumentWriter = { symDocWriter: ISymUnmanagedDocumentWriter } (* pointer to pDocumentWriter COM object *) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb type idd = { iddCharacteristics: int32 iddMajorVersion: int32; (* actually u16 in IMAGE_DEBUG_DIRECTORY *) diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index b4f9ca80361..45592131849 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -2137,55 +2137,34 @@ type VersionFlag = type IRawFSharpAssemblyData = /// The raw list AutoOpenAttribute attributes in the assembly -<<<<<<< HEAD - abstract GetAutoOpenAttributes : ILGlobals -> string list + abstract GetAutoOpenAttributes: ILGlobals -> string list /// The raw list InternalsVisibleToAttribute attributes in the assembly - abstract GetInternalsVisibleToAttributes : ILGlobals -> string list + abstract GetInternalsVisibleToAttributes: ILGlobals -> string list /// The raw IL module definition in the assembly, if any. This is not present for cross-project references /// in the language service - abstract TryGetILModuleDef : unit -> ILModuleDef option + abstract TryGetILModuleDef: unit -> ILModuleDef option /// The raw F# signature data in the assembly, if any - abstract GetRawFSharpSignatureData : range * ilShortAssemName: string * fileName: string -> (string * ((unit -> byte[]) * (unit -> byte[]) option)) list + abstract GetRawFSharpSignatureData: range * ilShortAssemName: string * fileName: string -> (string * ((unit -> byte[]) * (unit -> byte[]) option)) list /// The raw F# optimization data in the assembly, if any - abstract GetRawFSharpOptimizationData : range * ilShortAssemName: string * fileName: string -> (string * ((unit -> byte[]) * (unit -> byte[]) option)) list + abstract GetRawFSharpOptimizationData: range * ilShortAssemName: string * fileName: string -> (string * ((unit -> byte[]) * (unit -> byte[]) option)) list - /// The table of type forwarders in the assembly - abstract GetRawTypeForwarders : unit -> ILExportedTypesAndForwarders - - /// The identity of the module - abstract ILScopeRef : ILScopeRef - - abstract ILAssemblyRefs : ILAssemblyRef list - - abstract ShortAssemblyName : string - - abstract HasAnyFSharpSignatureDataAttribute : bool - - abstract HasMatchingFSharpSignatureDataAttribute : ILGlobals -> bool -======= - abstract GetAutoOpenAttributes: ILGlobals -> string list - /// The raw list InternalsVisibleToAttribute attributes in the assembly - abstract GetInternalsVisibleToAttributes: ILGlobals -> string list - /// The raw IL module definition in the assembly, if any. This is not present for cross-project references - /// in the language service - abstract TryGetILModuleDef: unit -> ILModuleDef option - /// The raw F# signature data in the assembly, if any - abstract GetRawFSharpSignatureData: range * ilShortAssemName: string * fileName: string -> (string * (unit -> byte[])) list - /// The raw F# optimization data in the assembly, if any - abstract GetRawFSharpOptimizationData: range * ilShortAssemName: string * fileName: string -> (string * (unit -> byte[])) list /// The table of type forwarders in the assembly abstract GetRawTypeForwarders: unit -> ILExportedTypesAndForwarders + /// The identity of the module abstract ILScopeRef: ILScopeRef + abstract ILAssemblyRefs: ILAssemblyRef list + abstract ShortAssemblyName: string + abstract HasAnyFSharpSignatureDataAttribute: bool + abstract HasMatchingFSharpSignatureDataAttribute: ILGlobals -> bool ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb /// Cache of time stamps as we traverse a project description type TimeStampCache(defaultTimeStamp: DateTime) = @@ -2323,50 +2302,6 @@ type TcConfigBuilder = mutable dumpDebugInfo: bool mutable debugSymbolFile: string option (* Backend configuration *) -<<<<<<< HEAD - mutable typeCheckOnly : bool - mutable parseOnly : bool - mutable importAllReferencesOnly : bool - mutable simulateException : string option - mutable printAst : bool - mutable tokenizeOnly : bool - mutable testInteractionParser : bool - mutable reportNumDecls : bool - mutable printSignature : bool - mutable printSignatureFile : string - mutable xmlDocOutputFile : string option - mutable stats : bool - mutable generateFilterBlocks : bool (* don't generate filter blocks due to bugs on Mono *) - - mutable signer : string option - mutable container : string option - - mutable delaysign : bool - mutable publicsign : bool - mutable version : VersionFlag - mutable metadataVersion : string option - mutable standalone : bool - mutable extraStaticLinkRoots : string list - mutable noSignatureData : bool - mutable onlyEssentialOptimizationData : bool - mutable useOptimizationDataFile : bool - mutable jitTracking : bool - mutable portablePDB : bool - mutable embeddedPDB : bool - mutable embedAllSource : bool - mutable embedSourceList : string list - mutable sourceLink : string - - mutable ignoreSymbolStoreSequencePoints : bool - mutable internConstantStrings : bool - mutable extraOptimizationIterations : int - - mutable win32res : string - mutable win32manifest : string - mutable includewin32manifest : bool - mutable linkResources : string list - mutable legacyReferenceResolver: ReferenceResolver.Resolver -======= mutable typeCheckOnly: bool mutable parseOnly: bool mutable importAllReferencesOnly: bool @@ -2408,8 +2343,7 @@ type TcConfigBuilder = mutable win32manifest: string mutable includewin32manifest: bool mutable linkResources: string list - mutable legacyReferenceResolver: ReferenceResolver.Resolver ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + mutable legacyReferenceResolver: ReferenceResolver.Resolver mutable showFullPaths: bool mutable errorStyle: ErrorStyle @@ -4482,13 +4416,8 @@ type TcImports(tcConfigP: TcConfigProvider, initialResolutions: TcAssemblyResolu | _ -> failwith "Unexpected representation in namespace entity referred to by a type provider" member tcImports.ImportTypeProviderExtensions -<<<<<<< HEAD - (ctok, tcConfig:TcConfig, - fileNameOfRuntimeAssembly:string, -======= (ctok, tcConfig: TcConfig, - fileNameOfRuntimeAssembly, ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + fileNameOfRuntimeAssembly: string, ilScopeRefOfRuntimeAssembly, runtimeAssemblyAttributes: ILAttribute list, entityToInjectInto, invalidateCcu: Event<_>, m) = diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 4240c15bfe5..b8ad357e88c 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -887,13 +887,7 @@ and SolveAnonInfoEqualsAnonInfo (csenv: ConstraintSolverEnv) m2 (anonInfo1: Anon /// Add the constraint "ty1 = ty2" to the constraint problem. /// Propagate all effects of adding this constraint, e.g. to solve type variables -<<<<<<< HEAD -// ty1: actual -// ty2: expected and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) (cxsln:(TraitConstraintInfo * TraitConstraintSln) option) ty1 ty2 = -======= -and SolveTypeEqualsType (csenv: ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) (cxsln:(TraitConstraintInfo * TraitConstraintSln) option) ty1 ty2 = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let ndeep = ndeep + 1 let aenv = csenv.EquivEnv let g = csenv.g @@ -1184,12 +1178,8 @@ and SolveTypeSubsumesTypeKeepAbbrevs csenv ndeep m2 trace cxsln ty1 ty2 = //------------------------------------------------------------------------- -<<<<<<< HEAD // 'T :> ty and SolveTyparSubtypeOfType (csenv:ConstraintSolverEnv) ndeep m2 trace tp ty1 = -======= -and SolveTyparSubtypeOfType (csenv: ConstraintSolverEnv) ndeep m2 trace tp ty1 = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let g = csenv.g if isObjTy g ty1 then CompleteD elif typeEquiv g ty1 (mkTyparTy tp) then CompleteD @@ -1995,11 +1985,7 @@ and AddConstraint (csenv: ConstraintSolverEnv) ndeep m2 trace tp newConstraint } -<<<<<<< HEAD and SolveNullnessSupportsNull (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTrace) ty nullness = trackErrors { -======= -and SolveTypeSupportsNull (csenv: ConstraintSolverEnv) ndeep m2 trace ty = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let g = csenv.g let m = csenv.m let denv = csenv.DisplayEnv diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs index f3371bb7656..333b65e0689 100755 --- a/src/fsharp/ExtensionTyping.fs +++ b/src/fsharp/ExtensionTyping.fs @@ -238,11 +238,7 @@ module internal ExtensionTyping = let unmarshal (t: Tainted<_>) = t.PUntaintNoFailure id /// Try to access a member on a provided type, catching and reporting errors -<<<<<<< HEAD - let TryTypeMember<'T,'U>(st:Tainted<'T>, fullName, memberName, m, recover, f: 'T -> 'U) = -======= - let TryTypeMember(st: Tainted<_>, fullName, memberName, m, recover, f) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let TryTypeMember<'T,'U>(st: Tainted<'T>, fullName, memberName, m, recover, f: 'T -> 'U) = try st.PApply (f, m) with :? TypeProviderError as tpe -> @@ -250,26 +246,12 @@ module internal ExtensionTyping = st.PApplyNoFailure(fun _ -> recover) /// Try to access a member on a provided type, where the result is an array of values, catching and reporting errors -<<<<<<< HEAD - let TryTypeMemberArray (st:Tainted<_>, fullName, memberName, m, f) = + let TryTypeMemberArray (st: Tainted<_>, fullName, memberName, m, f) = try st.PApplyArray(f, memberName, m) with :? TypeProviderError as tpe -> tpe.Iter (fun e -> error(Error(FSComp.SR.etUnexpectedExceptionFromProvidedTypeMember(fullName, memberName, e.ContextualErrorMessage), m))) [||] -======= - let TryTypeMemberArray (st: Tainted<_>, fullName, memberName, m, f) = - let result = - try - st.PApplyArray(f, memberName, m) - with :? TypeProviderError as tpe -> - tpe.Iter (fun e -> error(Error(FSComp.SR.etUnexpectedExceptionFromProvidedTypeMember(fullName, memberName, e.ContextualErrorMessage), m))) - [||] - - match result with - | null -> error(Error(FSComp.SR.etUnexpectedNullFromProvidedTypeMember(fullName, memberName), m)); [||] - | r -> r ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb /// Try to access a member on a provided type, catching and reporting errors and checking the result is non-null, let TryTypeMemberNonNull (st: Tainted<_>, fullName, memberName, m, recover, f) = @@ -292,19 +274,14 @@ module internal ExtensionTyping = resolver.PUntaint((fun tp -> tp.GetType().Name), m) /// Validate a provided namespace name -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let ValidateNamespaceName(name, typeProvider:Tainted, m, nsp:string) = + let ValidateNamespaceName(name, typeProvider: Tainted, m, nsp:string) = #else - let ValidateNamespaceName(name, typeProvider:Tainted, m, nsp:string?) = + let ValidateNamespaceName(name, typeProvider: Tainted, m, nsp:string?) = #endif match nsp with | null -> () | NonNull nsp -> -======= - let ValidateNamespaceName(name, typeProvider: Tainted, m, nsp: string) = - if nsp<>null then // Null namespace designates the global namespace. ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb if String.IsNullOrWhiteSpace nsp then // Empty namespace is not allowed errorR(Error(FSComp.SR.etEmptyNamespaceOfTypeNotAllowed(name, typeProvider.PUntaint((fun tp -> tp.GetType().Name), m)), m)) @@ -386,16 +363,11 @@ module internal ExtensionTyping = type CustomAttributeNamedArgument = System.Reflection.CustomAttributeNamedArgument type CustomAttributeTypedArgument = System.Reflection.CustomAttributeTypedArgument -<<<<<<< HEAD [] #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE [] #endif - type ProvidedType (x:System.Type, ctxt: ProvidedTypeContext) = -======= - [] type ProvidedType (x: System.Type, ctxt: ProvidedTypeContext) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb inherit ProvidedMemberInfo(x, ctxt) let provide () = ProvidedCustomAttributeProvider.Create (fun _provider -> x.CustomAttributes) interface IProvidedCustomAttributeProvider with @@ -463,7 +435,6 @@ module internal ExtensionTyping = member __.GetEnumUnderlyingType() = x.GetEnumUnderlyingType() |> ProvidedType.CreateWithNullCheck ctxt "EnumUnderlyingType" -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE static member Create ctxt x : ProvidedType = @@ -488,12 +459,6 @@ module internal ExtensionTyping = static member CreateNoContext (x:Type) = ProvidedType.Create ProvidedTypeContext.Empty x -======= - static member Create ctxt x = match x with null -> null | t -> ProvidedType (t, ctxt) - static member CreateWithNullCheck ctxt name x = match x with null -> nullArg name | t -> ProvidedType (t, ctxt) - static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedType.Create ctxt) - static member CreateNoContext (x: Type) = ProvidedType.Create ProvidedTypeContext.Empty x ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb static member Void = ProvidedType.CreateNoContext typeof member __.Handle = x @@ -512,24 +477,17 @@ module internal ExtensionTyping = [] #endif IProvidedCustomAttributeProvider = -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string * int * int) option + abstract GetDefinitionLocationAttribute : provider: ITypeProvider -> (string * int * int) option #else - abstract GetDefinitionLocationAttribute : provider:ITypeProvider -> (string? * int * int) option + abstract GetDefinitionLocationAttribute : provider: ITypeProvider -> (string? * int * int) option #endif - abstract GetXmlDocAttributes : provider:ITypeProvider -> string[] + abstract GetXmlDocAttributes : provider: ITypeProvider -> string[] abstract GetHasTypeProviderEditorHideMethodsAttribute : provider:ITypeProvider -> bool abstract GetAttributeConstructorArgs: provider:ITypeProvider * attribName:string -> (obj option list * (string * obj option) list) option -======= - abstract GetDefinitionLocationAttribute : provider: ITypeProvider -> (string * int * int) option - abstract GetXmlDocAttributes : provider: ITypeProvider -> string[] - abstract GetHasTypeProviderEditorHideMethodsAttribute : provider: ITypeProvider -> bool - abstract GetAttributeConstructorArgs: provider: ITypeProvider * attribName: string -> (obj option list * (string * obj option) list) option ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb and ProvidedCustomAttributeProvider = static member Create (attributes :(ITypeProvider -> seq)) : IProvidedCustomAttributeProvider = @@ -673,19 +631,13 @@ module internal ExtensionTyping = member __.GetParameters() = x.GetParameters() |> ProvidedParameterInfo.CreateArray ctxt member __.GetGenericArguments() = x.GetGenericArguments() |> ProvidedType.CreateArray ctxt member __.Handle = x -<<<<<<< HEAD - static member TaintedGetHashCode (x:Tainted) = + static member TaintedGetHashCode (x: Tainted) = Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, (nonNull (nonNull st.DeclaringType).Assembly).FullName, (nonNull st.DeclaringType).FullName))) - static member TaintedEquals (pt1:Tainted, pt2:Tainted) = -======= - static member TaintedGetHashCode (x: Tainted) = - Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, st.DeclaringType.Assembly.FullName, st.DeclaringType.FullName))) static member TaintedEquals (pt1: Tainted, pt2: Tainted) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle)) member __.GetStaticParametersForMethod(provider: ITypeProvider) = @@ -843,19 +795,13 @@ module internal ExtensionTyping = override __.Equals y = assert false; match y with :? ProvidedPropertyInfo as y -> x.Equals y.Handle | _ -> false override __.GetHashCode() = assert false; x.GetHashCode() -<<<<<<< HEAD - static member TaintedGetHashCode (x:Tainted) = + static member TaintedGetHashCode (x: Tainted) = Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, (nonNull (nonNull st.DeclaringType).Assembly).FullName, (nonNull st.DeclaringType).FullName))) - static member TaintedEquals (pt1:Tainted, pt2:Tainted) = -======= - static member TaintedGetHashCode (x: Tainted) = - Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, st.DeclaringType.Assembly.FullName, st.DeclaringType.FullName))) static member TaintedEquals (pt1: Tainted, pt2: Tainted) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle)) and [] @@ -890,19 +836,13 @@ module internal ExtensionTyping = override __.Equals y = assert false; match y with :? ProvidedEventInfo as y -> x.Equals y.Handle | _ -> false override __.GetHashCode() = assert false; x.GetHashCode() -<<<<<<< HEAD - static member TaintedGetHashCode (x:Tainted) = + static member TaintedGetHashCode (x: Tainted) = Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, (nonNull (nonNull st.DeclaringType).Assembly).FullName, (nonNull st.DeclaringType).FullName))) - static member TaintedEquals (pt1:Tainted, pt2:Tainted) = -======= - static member TaintedGetHashCode (x: Tainted) = - Tainted.GetHashCodeTainted (x.PApplyNoFailure(fun st -> (st.Name, st.DeclaringType.Assembly.FullName, st.DeclaringType.FullName))) static member TaintedEquals (pt1: Tainted, pt2: Tainted) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb Tainted.EqTainted (pt1.PApplyNoFailure(fun st -> st.Handle)) (pt2.PApplyNoFailure(fun st -> st.Handle)) and [] @@ -932,16 +872,11 @@ module internal ExtensionTyping = override __.Equals y = assert false; match y with :? ProvidedConstructorInfo as y -> x.Equals y.Handle | _ -> false override __.GetHashCode() = assert false; x.GetHashCode() -<<<<<<< HEAD [] #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE [] #endif - type ProvidedExpr (x:Quotations.Expr, ctxt) = -======= - [] type ProvidedExpr (x: Quotations.Expr, ctxt) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb member __.Type = x.Type |> ProvidedType.Create ctxt member __.Handle = x member __.Context = ctxt @@ -968,27 +903,21 @@ module internal ExtensionTyping = override __.GetHashCode() = x.GetHashCode() -<<<<<<< HEAD [] #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE [] #endif - type ProvidedVar (x:Quotations.Var, ctxt) = -======= - [] type ProvidedVar (x: Quotations.Var, ctxt) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb member __.Type = x.Type |> ProvidedType.Create ctxt member __.Name = x.Name member __.IsMutable = x.IsMutable member __.Handle = x member __.Context = ctxt -<<<<<<< HEAD static member CreateNonNull ctxt t = ProvidedVar (t, ctxt) - static member Fresh (nm, ty:ProvidedType) = + static member Fresh (nm, ty: ProvidedType) = ProvidedVar.CreateNonNull ty.Context (new Quotations.Var(nm, ty.Handle)) static member CreateArray ctxt xs = @@ -996,11 +925,6 @@ module internal ExtensionTyping = | null -> [| |] | _ -> xs |> Array.map (ProvidedVar.CreateNonNull ctxt) -======= - static member Create ctxt t = match box t with null -> null | _ -> ProvidedVar (t, ctxt) - static member Fresh (nm, ty: ProvidedType) = ProvidedVar.Create ty.Context (new Quotations.Var(nm, ty.Handle)) - static member CreateArray ctxt xs = match xs with null -> null | _ -> xs |> Array.map (ProvidedVar.Create ctxt) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb override __.Equals y = match y with :? ProvidedVar as y -> x.Equals y.Handle | _ -> false override __.GetHashCode() = x.GetHashCode() @@ -1177,15 +1101,11 @@ module internal ExtensionTyping = #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE let namespaceName = TryTypeMember(st, name, "Namespace", m, "", fun st -> st.Namespace) |> unmarshal -<<<<<<< HEAD #else let namespaceName = TryTypeMember<_, string?>(st, name, "Namespace", m, "", fun st -> st.Namespace) |> unmarshal // TODO NULLNESS: why is this explicit instantiation needed? #endif - let rec declaringTypes (st:Tainted) accu = -======= let rec declaringTypes (st: Tainted) accu = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb match TryTypeMember(st, name, "DeclaringType", m, null, fun st -> st.DeclaringType) with | Tainted.Null -> accu | Tainted.NonNull dt -> declaringTypes dt (CheckAndComputeProvidedNameProperty(m, dt, (fun dt -> dt.Name), "Name")::accu) @@ -1335,15 +1255,11 @@ module internal ExtensionTyping = /// Resolve a (non-nested) provided type given a full namespace name and a type name. /// May throw an exception which will be turned into an error message by one of the 'Try' function below. /// If resolution is successful the type is then validated. -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let ResolveProvidedType (resolver:Tainted, m, moduleOrNamespace:string[], typeName) : Tainted = + let ResolveProvidedType (resolver: Tainted, m, moduleOrNamespace: string[], typeName) : Tainted = #else - let ResolveProvidedType (resolver:Tainted, m, moduleOrNamespace:string[], typeName) : Tainted = + let ResolveProvidedType (resolver: Tainted, m, moduleOrNamespace: string[], typeName) : Tainted = #endif -======= - let ResolveProvidedType (resolver: Tainted, m, moduleOrNamespace: string[], typeName) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let displayName = String.Join(".", moduleOrNamespace) // Try to find the type in the given provided namespace @@ -1526,11 +1442,10 @@ module internal ExtensionTyping = | None -> None /// Get the parts of a .NET namespace. Special rules: null means global, empty is not allowed. -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let GetPartsOfNamespaceRecover(namespaceName:string) = + let GetPartsOfNamespaceRecover(namespaceName: string) = #else - let GetPartsOfNamespaceRecover(namespaceName:string?) = + let GetPartsOfNamespaceRecover(namespaceName: string?) = #endif match namespaceName with | null -> [] @@ -1550,34 +1465,17 @@ module internal ExtensionTyping = if namespaceName.Length = 0 then errorR(Error(FSComp.SR.etEmptyNamespaceNotAllowed(DisplayNameOfTypeProvider(resolver.TypeProvider, m)), m)) GetPartsOfNamespaceRecover namespaceName -======= - let GetPartsOfNamespaceRecover(namespaceName: string) = - if namespaceName=null then [] - elif namespaceName.Length = 0 then [""] - else splitNamespace namespaceName - - /// Get the parts of a .NET namespace. Special rules: null means global, empty is not allowed. - let GetProvidedNamespaceAsPath (m, resolver: Tainted, namespaceName: string) = - if namespaceName<>null && namespaceName.Length = 0 then - errorR(Error(FSComp.SR.etEmptyNamespaceNotAllowed(DisplayNameOfTypeProvider(resolver.TypeProvider, m)), m)) - - GetPartsOfNamespaceRecover namespaceName ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb /// Get the parts of the name that encloses the .NET type including nested types. let GetFSharpPathToProvidedType (st: Tainted, m) = // Can't use st.Fullname because it may be like IEnumerable // We want [System;Collections;Generic] let namespaceParts = GetPartsOfNamespaceRecover(st.PUntaint((fun st -> st.Namespace), m)) -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let rec walkUpNestedClasses(st:Tainted, soFar) = + let rec walkUpNestedClasses(st: Tainted, soFar) = #else - let rec walkUpNestedClasses(st:Tainted, soFar) = + let rec walkUpNestedClasses(st: Tainted, soFar) = #endif -======= - let rec walkUpNestedClasses(st: Tainted, soFar) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb match st with | Tainted.Null -> soFar | Tainted.NonNull st -> walkUpNestedClasses(st.PApply((fun st ->st.DeclaringType), m), soFar) @ [st.PUntaint((fun st -> st.Name), m)] diff --git a/src/fsharp/FindUnsolved.fs b/src/fsharp/FindUnsolved.fs index 518d6be4b84..3bff23e3f38 100644 --- a/src/fsharp/FindUnsolved.fs +++ b/src/fsharp/FindUnsolved.fs @@ -74,15 +74,9 @@ let rec accExpr (cenv:cenv) (env:env) expr = accExpr cenv env f accExprs cenv env argsl -<<<<<<< HEAD - | Expr.Lambda(_,_ctorThisValOpt,_baseValOpt,argvs,_body,m,rty) -> + | Expr.Lambda(_, _ctorThisValOpt, _baseValOpt, argvs, _body, m, rty) -> let topValInfo = ValReprInfo ([],[argvs |> List.map (fun _ -> ValReprInfo.unnamedTopArg1)],ValReprInfo.unnamedRetVal) let ty = mkMultiLambdaTy cenv.g m argvs rty -======= - | Expr.Lambda(_, _ctorThisValOpt, _baseValOpt, argvs, _body, m, rty) -> - let topValInfo = ValReprInfo ([], [argvs |> List.map (fun _ -> ValReprInfo.unnamedTopArg1)], ValReprInfo.unnamedRetVal) - let ty = mkMultiLambdaTy m argvs rty ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb accLambdas cenv env topValInfo expr ty | Expr.TyLambda(_, tps, _body, _m, rty) -> diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs index ea1b34cfe22..4f9c5a8fd31 100644 --- a/src/fsharp/NameResolution.fs +++ b/src/fsharp/NameResolution.fs @@ -579,16 +579,9 @@ let AddActivePatternResultTagsToNameEnv (apinfo: PrettyNaming.ActivePatternInfo) ||> List.foldBack (fun (j, nm) acc -> acc.Add(nm, Item.ActivePatternResult(apinfo, ty, j, m))) } /// Generalize a union case, from Cons --> List.Cons -<<<<<<< HEAD -let GeneralizeUnionCaseRef (ucref:UnionCaseRef) = +let GeneralizeUnionCaseRef (ucref: UnionCaseRef) = UnionCaseInfo (generalTyconRefInst ucref.TyconRef, ucref) -======= -let GeneralizeUnionCaseRef (ucref: UnionCaseRef) = - UnionCaseInfo (fst (generalizeTyconRef ucref.TyconRef), ucref) - - ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb /// Add type definitions to the sub-table of the environment indexed by name and arity let AddTyconsByDemangledNameAndArity (bulkAddMode: BulkAdd) (tcrefs: TyconRef[]) (tab: LayeredMap) = if tcrefs.Length = 0 then tab else @@ -3721,20 +3714,13 @@ let rec ResolvePartialLongIdentInType (ncenv: NameResolver) nenv isApplicableMet // e.g. .. (rfinfos |> List.collect (fun x -> x.FieldType |> ResolvePartialLongIdentInType ncenv nenv isApplicableMeth m ad false rest)) @ -<<<<<<< HEAD // e.g. .. - let FullTypeOfPinfo (pinfo:PropInfo) = + let FullTypeOfPinfo (pinfo: PropInfo) = let rty = pinfo.GetPropertyType(amap, m) let rty = if pinfo.IsIndexer then mkFunTy g (mkRefTupledTy g (pinfo.GetParamTypes(amap, m))) rty else rty -======= - // e.g. .. - let FullTypeOfPinfo(pinfo: PropInfo) = - let rty = pinfo.GetPropertyType(amap, m) - let rty = if pinfo.IsIndexer then mkRefTupledTy g (pinfo.GetParamTypes(amap, m)) --> rty else rty ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb rty (ty diff --git a/src/fsharp/Optimizer.fs b/src/fsharp/Optimizer.fs index c1d458c80a7..fd74694a07d 100644 --- a/src/fsharp/Optimizer.fs +++ b/src/fsharp/Optimizer.fs @@ -1820,12 +1820,8 @@ let IsSystemStringConcatArray (methRef: ILMethodRef) = methRef.ArgTypes.Length = 1 && methRef.ArgTypes.Head.BasicQualifiedName = "System.String[]" /// Optimize/analyze an expression -<<<<<<< HEAD -let rec OptimizeExpr cenv (env:IncrementalOptimizationEnv) expr = - let g = cenv.g -======= let rec OptimizeExpr cenv (env: IncrementalOptimizationEnv) expr = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g // Eliminate subsumption coercions for functions. This must be done post-typechecking because we need // complete inference types. diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs index dc7b7363981..71f9db5c2dd 100755 --- a/src/fsharp/TastPickle.fs +++ b/src/fsharp/TastPickle.fs @@ -233,22 +233,13 @@ let p_prim_string (s: string) st = st.os.EmitBytes bytes let p_int c st = p_int32 c st -<<<<<<< HEAD let p_intB c st = p_int32B c st -let p_int8 (i:sbyte) st = p_int32 (int32 i) st -let p_uint8 (i:byte) st = p_byte (int i) st -let p_int16 (i:int16) st = p_int32 (int32 i) st -let p_uint16 (x:uint16) st = p_int32 (int32 x) st -let p_uint32 (x:uint32) st = p_int32 (int32 x) st -let p_int64 (i:int64) st = -======= let p_int8 (i: sbyte) st = p_int32 (int32 i) st let p_uint8 (i: byte) st = p_byte (int i) st let p_int16 (i: int16) st = p_int32 (int32 i) st let p_uint16 (x: uint16) st = p_int32 (int32 x) st let p_uint32 (x: uint32) st = p_int32 (int32 x) st let p_int64 (i: int64) st = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb p_int32 (int32 (i &&& 0xFFFFFFFFL)) st p_int32 (int32 (i >>> 32)) st @@ -430,47 +421,13 @@ let inline u_tup11 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 (st: ReaderState) = let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in (a, b, c, d, e, f, x7, x8, x9, x10, x11) -<<<<<<< HEAD -let inline u_tup13 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 (st:ReaderState) = -======= -let inline u_tup12 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 (st: ReaderState) = - let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in - let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in - let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in - (a, b, c, d, e, f, x7, x8, x9, x10, x11, x12) - let inline u_tup13 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 (st: ReaderState) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in (a, b, c, d, e, f, x7, x8, x9, x10, x11, x12, x13) -<<<<<<< HEAD -let inline u_tup17 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 (st:ReaderState) = -======= -let inline u_tup14 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 (st: ReaderState) = - let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in - let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in - let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in - let x14 = p14 st in - (a, b, c, d, e, f, x7, x8, x9, x10, x11, x12, x13, x14) -let inline u_tup15 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 (st: ReaderState) = - let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in - let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in - let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in - let x14 = p14 st in let x15 = p15 st in - (a, b, c, d, e, f, x7, x8, x9, x10, x11, x12, x13, x14, x15) - -let inline u_tup16 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 (st: ReaderState) = - let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in - let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in - let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in - let x14 = p14 st in let x15 = p15 st in let x16 = p16 st in - (a, b, c, d, e, f, x7, x8, x9, x10, x11, x12, x13, x14, x15, x16) - let inline u_tup17 p1 p2 p3 p4 p5 p6 p7 p8 p9 p10 p11 p12 p13 p14 p15 p16 p17 (st: ReaderState) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let a = p1 st in let b = p2 st in let c = p3 st in let d = p4 st in let e = p5 st in let f = p6 st in let x7 = p7 st in let x8 = p8 st in let x9 = p9 st in let x10 = p10 st in let x11 = p11 st in let x12 = p12 st in let x13 = p13 st in @@ -705,17 +662,7 @@ let u_option f st = | 1 -> Some (f st) | n -> ufailwith st ("u_option: found number " + string n) -<<<<<<< HEAD let u_lazy u st = -======= -// Boobytrap an OSGN node with a force of a lazy load of a bunch of pickled data -#if LAZY_UNPICKLE -let wire (x: osgn<_>) (res: Lazy<_>) = - x.osgnTripWire <- Some(fun () -> res.Force() |> ignore) -#endif - -let u_lazy u st = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb // Read the number of bytes in the record let len = prim_u_int32 st // fixupPos1 @@ -893,13 +840,9 @@ let pickleObjWithDanglingCcus inMem file (g: TcGlobals) scope p x = if phase2bytesB.Length <> 0 then failwith "expected phase2bytesB.Length = 0" -<<<<<<< HEAD phase2bytes, phase1bytesB -let check (ilscope:ILScopeRef) (inMap : NodeInTable<_,_>) = -======= -let check (ilscope: ILScopeRef) (inMap : NodeInTable<_, _>) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb +let check (ilscope: ILScopeRef) (inMap: NodeInTable<_,_>) = for i = 0 to inMap.Count - 1 do let n = inMap.Get i if not (inMap.IsLinked n) then @@ -909,16 +852,10 @@ let check (ilscope: ILScopeRef) (inMap : NodeInTable<_, _>) = // an identical copy of the source for the DLL containing the data being unpickled. A message will // then be printed indicating the name of the item. -<<<<<<< HEAD -let unpickleObjWithDanglingCcus file ilscope (iILModule:ILModuleDef option) u (phase2bytes:byte[]) (phase1bytesB:byte[]) = +let unpickleObjWithDanglingCcus file ilscope (iILModule: ILModuleDef option) u (phase2bytes:byte[]) (phase1bytesB:byte[]) = let st2 = { is = ByteStream.FromBytes (phase2bytes,0,phase2bytes.Length) isB = ByteStream.FromBytes ([| |],0,0) -======= -let unpickleObjWithDanglingCcus file ilscope (iILModule: ILModuleDef option) u (phase2bytes: byte[]) = - let st2 = - { is = ByteStream.FromBytes (phase2bytes, 0, phase2bytes.Length) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb iilscope= ilscope iccus= new_itbl "iccus (fake)" [| |] ientities= NodeInTable<_,_>.Create (Tycon.NewUnlinked, (fun osgn tg -> osgn.Link tg),(fun osgn -> osgn.IsLinked),"ientities",0) diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs index e783aa2cc9f..8b6ab74f9c7 100755 --- a/src/fsharp/TypeChecker.fs +++ b/src/fsharp/TypeChecker.fs @@ -1904,11 +1904,7 @@ let MakeAndPublishSimpleVals cenv env m names mergeNamesInOneNameresEnv = // to C<_> occurs then generate C for a fresh type inference variable ?ty. //------------------------------------------------------------------------- -<<<<<<< HEAD -let FreshenTyconRef (g: TcGlobals) m rigid (tcref:TyconRef) declaredTyconTypars = -======= -let FreshenTyconRef m rigid (tcref: TyconRef) declaredTyconTypars = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb +let FreshenTyconRef (g: TcGlobals) m rigid (tcref: TyconRef) declaredTyconTypars = let tpsorig = declaredTyconTypars let tps = copyTypars tpsorig if rigid <> TyparRigidity.Rigid then @@ -1929,11 +1925,7 @@ let FreshenPossibleForallTy g m rigid ty = let tps, renaming, tinst = CopyAndFixupTypars m rigid tpsorig tpsorig, tps, tinst, instType renaming tau -<<<<<<< HEAD -let infoOfTyconRef (g:TcGlobals) m (tcref:TyconRef) = -======= -let infoOfTyconRef m (tcref: TyconRef) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb +let infoOfTyconRef (g: TcGlobals) m (tcref: TyconRef) = let tps, renaming, tinst = FreshenTypeInst m (tcref.Typars m) tps, renaming, tinst, TType_app (tcref, tinst, g.knownWithoutNull) @@ -4588,12 +4580,8 @@ and TcTyparDecls cenv env synTypars = List.map (TcTyparDecl cenv env) synTypars /// If optKind=Some kind, then this is the kind we're expecting (we're in *analysis* mode) /// If optKind=None, we need to determine the kind (we're in *synthesis* mode) /// -<<<<<<< HEAD -and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv:SyntacticUnscopedTyparEnv) ty = - let g = cenv.g -======= and TcTypeOrMeasure optKind cenv newOk checkCxs occ env (tpenv: SyntacticUnscopedTyparEnv) ty = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g match ty with | SynType.LongIdent(LongIdentWithDots([], _)) -> @@ -4867,12 +4855,8 @@ and TcTyparConstraints cenv newOk checkCxs occ env tpenv wcs = tpenv #if !NO_EXTENSIONTYPING -<<<<<<< HEAD -and TcStaticConstantParameter cenv (env:TcEnv) tpenv kind (v:SynType) idOpt container = - let g = cenv.g -======= and TcStaticConstantParameter cenv (env: TcEnv) tpenv kind (v: SynType) idOpt container = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g let fail() = error(Error(FSComp.SR.etInvalidStaticArgument(NicePrint.minimalStringOfType env.DisplayEnv kind), v.Range)) let record ttype = match idOpt with @@ -4885,37 +4869,20 @@ and TcStaticConstantParameter cenv (env: TcEnv) tpenv kind (v: SynType) idOpt co | SynType.StaticConstant(sc, _) -> let v = match sc with -<<<<<<< HEAD - | SynConst.Byte n when typeEquiv g g.byte_ty kind -> record(g.byte_ty); box (n:byte) - | SynConst.Int16 n when typeEquiv g g.int16_ty kind -> record(g.int16_ty); box (n:int16) - | SynConst.Int32 n when typeEquiv g g.int32_ty kind -> record(g.int32_ty); box (n:int) - | SynConst.Int64 n when typeEquiv g g.int64_ty kind -> record(g.int64_ty); box (n:int64) - | SynConst.SByte n when typeEquiv g g.sbyte_ty kind -> record(g.sbyte_ty); box (n:sbyte) - | SynConst.UInt16 n when typeEquiv g g.uint16_ty kind -> record(g.uint16_ty); box (n:uint16) - | SynConst.UInt32 n when typeEquiv g g.uint32_ty kind -> record(g.uint32_ty); box (n:uint32) - | SynConst.UInt64 n when typeEquiv g g.uint64_ty kind -> record(g.uint64_ty); box (n:uint64) - | SynConst.Decimal n when typeEquiv g g.decimal_ty kind -> record(g.decimal_ty); box (n:decimal) - | SynConst.Single n when typeEquiv g g.float32_ty kind -> record(g.float32_ty); box (n:single) - | SynConst.Double n when typeEquiv g g.float_ty kind -> record(g.float_ty); box (n:double) - | SynConst.Char n when typeEquiv g g.char_ty kind -> record(g.char_ty); box (n:char) + | SynConst.Byte n when typeEquiv g g.byte_ty kind -> record(g.byte_ty); box (n: byte) + | SynConst.Int16 n when typeEquiv g g.int16_ty kind -> record(g.int16_ty); box (n: int16) + | SynConst.Int32 n when typeEquiv g g.int32_ty kind -> record(g.int32_ty); box (n: int) + | SynConst.Int64 n when typeEquiv g g.int64_ty kind -> record(g.int64_ty); box (n: int64) + | SynConst.SByte n when typeEquiv g g.sbyte_ty kind -> record(g.sbyte_ty); box (n: sbyte) + | SynConst.UInt16 n when typeEquiv g g.uint16_ty kind -> record(g.uint16_ty); box (n: uint16) + | SynConst.UInt32 n when typeEquiv g g.uint32_ty kind -> record(g.uint32_ty); box (n: uint32) + | SynConst.UInt64 n when typeEquiv g g.uint64_ty kind -> record(g.uint64_ty); box (n: uint64) + | SynConst.Decimal n when typeEquiv g g.decimal_ty kind -> record(g.decimal_ty); box (n: decimal) + | SynConst.Single n when typeEquiv g g.float32_ty kind -> record(g.float32_ty); box (n: single) + | SynConst.Double n when typeEquiv g g.float_ty kind -> record(g.float_ty); box (n: double) + | SynConst.Char n when typeEquiv g g.char_ty kind -> record(g.char_ty); box (n: char) | SynConst.String (s, _) when typeEquiv g g.string_ty kind -> record(g.string_ty); box s - | SynConst.Bool b when typeEquiv g g.bool_ty kind -> record(g.bool_ty); box (b:bool) -======= - | SynConst.Byte n when typeEquiv cenv.g cenv.g.byte_ty kind -> record(cenv.g.byte_ty); box (n: byte) - | SynConst.Int16 n when typeEquiv cenv.g cenv.g.int16_ty kind -> record(cenv.g.int16_ty); box (n: int16) - | SynConst.Int32 n when typeEquiv cenv.g cenv.g.int32_ty kind -> record(cenv.g.int32_ty); box (n: int) - | SynConst.Int64 n when typeEquiv cenv.g cenv.g.int64_ty kind -> record(cenv.g.int64_ty); box (n: int64) - | SynConst.SByte n when typeEquiv cenv.g cenv.g.sbyte_ty kind -> record(cenv.g.sbyte_ty); box (n: sbyte) - | SynConst.UInt16 n when typeEquiv cenv.g cenv.g.uint16_ty kind -> record(cenv.g.uint16_ty); box (n: uint16) - | SynConst.UInt32 n when typeEquiv cenv.g cenv.g.uint32_ty kind -> record(cenv.g.uint32_ty); box (n: uint32) - | SynConst.UInt64 n when typeEquiv cenv.g cenv.g.uint64_ty kind -> record(cenv.g.uint64_ty); box (n: uint64) - | SynConst.Decimal n when typeEquiv cenv.g cenv.g.decimal_ty kind -> record(cenv.g.decimal_ty); box (n: decimal) - | SynConst.Single n when typeEquiv cenv.g cenv.g.float32_ty kind -> record(cenv.g.float32_ty); box (n: single) - | SynConst.Double n when typeEquiv cenv.g cenv.g.float_ty kind -> record(cenv.g.float_ty); box (n: double) - | SynConst.Char n when typeEquiv cenv.g cenv.g.char_ty kind -> record(cenv.g.char_ty); box (n: char) - | SynConst.String (s, _) when s <> null && typeEquiv cenv.g cenv.g.string_ty kind -> record(cenv.g.string_ty); box (s: string) - | SynConst.Bool b when typeEquiv cenv.g cenv.g.bool_ty kind -> record(cenv.g.bool_ty); box (b: bool) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + | SynConst.Bool b when typeEquiv g g.bool_ty kind -> record(g.bool_ty); box (b: bool) | _ -> fail() v, tpenv | SynType.StaticConstantNull(_) -> fail() @@ -4931,38 +4898,20 @@ and TcStaticConstantParameter cenv (env: TcEnv) tpenv kind (v: SynType) idOpt co // Check we have a residue constant. We know the type was correct because we checked the expression with this type. | Expr.Const(c, _, _) -> match c with -<<<<<<< HEAD - | Const.Byte n -> record(g.byte_ty); box (n:byte) - | Const.Int16 n -> record(g.int16_ty); box (n:int16) - | Const.Int32 n -> record(g.int32_ty); box (n:int) - | Const.Int64 n -> record(g.int64_ty); box (n:int64) - | Const.SByte n -> record(g.sbyte_ty); box (n:sbyte) - | Const.UInt16 n -> record(g.uint16_ty); box (n:uint16) - | Const.UInt32 n -> record(g.uint32_ty); box (n:uint32) - | Const.UInt64 n -> record(g.uint64_ty); box (n:uint64) - | Const.Decimal n -> record(g.decimal_ty); box (n:decimal) - | Const.Single n -> record(g.float32_ty); box (n:single) - | Const.Double n -> record(g.float_ty); box (n:double) - | Const.Char n -> record(g.char_ty); box (n:char) - | Const.String s -> record(g.string_ty); box (s:string) - | Const.Bool b -> record(g.bool_ty); box (b:bool) -======= - | Const.Byte n -> record(cenv.g.byte_ty); box (n: byte) - | Const.Int16 n -> record(cenv.g.int16_ty); box (n: int16) - | Const.Int32 n -> record(cenv.g.int32_ty); box (n: int) - | Const.Int64 n -> record(cenv.g.int64_ty); box (n: int64) - | Const.SByte n -> record(cenv.g.sbyte_ty); box (n: sbyte) - | Const.UInt16 n -> record(cenv.g.uint16_ty); box (n: uint16) - | Const.UInt32 n -> record(cenv.g.uint32_ty); box (n: uint32) - | Const.UInt64 n -> record(cenv.g.uint64_ty); box (n: uint64) - | Const.Decimal n -> record(cenv.g.decimal_ty); box (n: decimal) - | Const.Single n -> record(cenv.g.float32_ty); box (n: single) - | Const.Double n -> record(cenv.g.float_ty); box (n: double) - | Const.Char n -> record(cenv.g.char_ty); box (n: char) - | Const.String null -> fail() - | Const.String s -> record(cenv.g.string_ty); box (s: string) - | Const.Bool b -> record(cenv.g.bool_ty); box (b: bool) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + | Const.Byte n -> record(g.byte_ty); box (n: byte) + | Const.Int16 n -> record(g.int16_ty); box (n: int16) + | Const.Int32 n -> record(g.int32_ty); box (n: int) + | Const.Int64 n -> record(g.int64_ty); box (n: int64) + | Const.SByte n -> record(g.sbyte_ty); box (n: sbyte) + | Const.UInt16 n -> record(g.uint16_ty); box (n: uint16) + | Const.UInt32 n -> record(g.uint32_ty); box (n: uint32) + | Const.UInt64 n -> record(g.uint64_ty); box (n: uint64) + | Const.Decimal n -> record(g.decimal_ty); box (n: decimal) + | Const.Single n -> record(g.float32_ty); box (n: single) + | Const.Double n -> record(g.float_ty); box (n: double) + | Const.Char n -> record(g.char_ty); box (n: char) + | Const.String s -> record(g.string_ty); box (s: string) + | Const.Bool b -> record(g.bool_ty); box (b: bool) | _ -> fail() | _ -> error(Error(FSComp.SR.tcInvalidConstantExpression(), v.Range)) v, tpenv' @@ -5824,13 +5773,8 @@ and CheckSuperInit cenv objTy m = // TcExprUndelayed //------------------------------------------------------------------------- -<<<<<<< HEAD and TcExprUndelayedNoType cenv env tpenv synExpr : Expr * TType * _ = let overallTy = NewInferenceType cenv.g -======= -and TcExprUndelayedNoType cenv env tpenv synExpr: Expr * TType * _ = - let overallTy = NewInferenceType () ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let expr, tpenv = TcExprUndelayed cenv overallTy env tpenv synExpr expr, overallTy, tpenv @@ -10674,15 +10618,9 @@ and TcAndBuildFixedExpr cenv env (overallPatTy, fixedExpr, overallExprTy, mBindi let elemPtrTy = mkNativePtrTy cenv.g elemTy UnifyTypes cenv env mBinding elemPtrTy overallPatTy -<<<<<<< HEAD // let ptr : nativeptr = // let tmpArray : elem[] = arr // if notNull tmpArray then -======= - // let ptr: nativeptr = - // let tmpArray: elem[] = arr - // if nonNull tmpArray then ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb // if tmpArray.Length <> 0 then // let pinned tmpArrayByref: byref = &arr.[0] // (nativeint) tmpArrayByref @@ -13486,12 +13424,8 @@ module MutRecBindingChecking = // Phase2A: create member prelimRecValues for "recursive" items, i.e. ctor val and member vals // Phase2A: also processes their arg patterns - collecting type assertions -<<<<<<< HEAD - let TcMutRecBindings_Phase2A_CreateRecursiveValuesAndCheckArgumentPatterns cenv tpenv (envMutRec, mutRecDefns : MutRecDefnsPhase2Info) = - let g = cenv.g -======= let TcMutRecBindings_Phase2A_CreateRecursiveValuesAndCheckArgumentPatterns cenv tpenv (envMutRec, mutRecDefns: MutRecDefnsPhase2Info) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g // The basic iteration over the declarations in a single type definition // State: @@ -13671,12 +13605,8 @@ module MutRecBindingChecking = /// Phase2B: check each of the bindings, convert from ast to tast and collects type assertions. /// Also generalize incrementally. -<<<<<<< HEAD - let TcMutRecBindings_Phase2B_TypeCheckAndIncrementalGeneralization cenv tpenv envInitial (envMutRec, defnsAs:MutRecDefnsPhase2AData, uncheckedRecBinds: PreCheckingRecursiveBinding list, scopem) : MutRecDefnsPhase2BData * _ * _ = - let g = cenv.g -======= let TcMutRecBindings_Phase2B_TypeCheckAndIncrementalGeneralization cenv tpenv envInitial (envMutRec, defnsAs: MutRecDefnsPhase2AData, uncheckedRecBinds: PreCheckingRecursiveBinding list, scopem) : MutRecDefnsPhase2BData * _ * _ = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g let (defnsBs: MutRecDefnsPhase2BData), (tpenv, generalizedRecBinds, preGeneralizationRecBinds, _, _) = @@ -14075,12 +14005,8 @@ module MutRecBindingChecking = tyconOpt, memberBindsWithFixups, []) /// Check a "module X = A.B.C" module abbreviation declaration -<<<<<<< HEAD - let TcModuleAbbrevDecl (cenv:cenv) scopem env (id, p, m) = - let g = cenv.g -======= let TcModuleAbbrevDecl (cenv: cenv) scopem env (id, p, m) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g let ad = env.eAccessRights let resolved = match p with @@ -14408,14 +14334,9 @@ module AddAugmentationDeclarations = | ValueSome tcref2 when tyconRefEq g tcref2 tcref -> true | _ -> false) -<<<<<<< HEAD - let AddGenericCompareDeclarations cenv (env: TcEnv) (scSet:Set) (tycon:Tycon) = + let AddGenericCompareDeclarations cenv (env: TcEnv) (scSet: Set) (tycon: Tycon) = let g = cenv.g if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare g tycon && scSet.Contains tycon.Stamp then -======= - let AddGenericCompareDeclarations cenv (env: TcEnv) (scSet: Set) (tycon: Tycon) = - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare cenv.g tycon && scSet.Contains tycon.Stamp then ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let tcref = mkLocalTyconRef tycon let tcaug = tycon.TypeContents let ty = if tcref.Deref.IsExceptionDecl then g.exn_ty else generalizedTyOfTyconRef g tcref @@ -14451,14 +14372,9 @@ module AddAugmentationDeclarations = -<<<<<<< HEAD - let AddGenericEqualityWithComparerDeclarations cenv (env: TcEnv) (seSet:Set) (tycon:Tycon) = + let AddGenericEqualityWithComparerDeclarations cenv (env: TcEnv) (seSet: Set) (tycon: Tycon) = let g = cenv.g if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals g tycon && seSet.Contains tycon.Stamp then -======= - let AddGenericEqualityWithComparerDeclarations cenv (env: TcEnv) (seSet: Set) (tycon: Tycon) = - if AugmentWithHashCompare.TyconIsCandidateForAugmentationWithEquals cenv.g tycon && seSet.Contains tycon.Stamp then ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let tcref = mkLocalTyconRef tycon let tcaug = tycon.TypeContents let m = tycon.Range @@ -14476,13 +14392,8 @@ module AddAugmentationDeclarations = PublishValueDefn cenv env ModuleOrMemberBinding evspec3 -<<<<<<< HEAD - let AddGenericCompareBindings cenv (tycon:Tycon) = - if (* AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare g tycon && *) Option.isSome tycon.GeneratedCompareToValues then -======= let AddGenericCompareBindings cenv (tycon: Tycon) = - if (* AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare cenv.g tycon && *) Option.isSome tycon.GeneratedCompareToValues then ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + if (* AugmentWithHashCompare.TyconIsCandidateForAugmentationWithCompare g tycon && *) Option.isSome tycon.GeneratedCompareToValues then AugmentWithHashCompare.MakeBindingsForCompareAugmentation cenv.g tycon else [] @@ -14698,13 +14609,8 @@ module TyconConstraintInference = // Checks if a field type supports the 'equality' constraint based on the assumptions about the type constructors // and type parameters. -<<<<<<< HEAD - let rec checkIfFieldTypeSupportsEquality (tycon:Tycon) (ty: TType) = - match tryDestTyparTy g ty with -======= let rec checkIfFieldTypeSupportsEquality (tycon: Tycon) (ty: TType) = - match tryDestTyparTy cenv.g ty with ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + match tryDestTyparTy g ty with | ValueSome tp -> // Look for an explicit 'equality' constraint if tp.Constraints |> List.exists (function TyparConstraint.SupportsEquality _ -> true | _ -> false) then @@ -16143,13 +16049,8 @@ module EstablishTypeDefinitionCores = doneTypes, acc // collect edges from the fields of a given struct type. -<<<<<<< HEAD - and accStructFields includeStaticFields ty (structTycon:Tycon) tinst (doneTypes, acc) = - if List.exists (typeEquiv g ty) doneTypes then -======= and accStructFields includeStaticFields ty (structTycon: Tycon) tinst (doneTypes, acc) = - if List.exists (typeEquiv cenv.g ty) doneTypes then ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + if List.exists (typeEquiv g ty) doneTypes then // This type (type instance) has been seen before, so no need to collect the same edges again (and avoid loops!) doneTypes, acc else @@ -16210,12 +16111,8 @@ module EstablishTypeDefinitionCores = | _ -> ()) -<<<<<<< HEAD - let TcMutRecDefns_Phase1 mkLetInfo cenv envInitial parent typeNames inSig tpenv m scopem mutRecNSInfo (mutRecDefns:MutRecShapes) = - let g = cenv.g -======= let TcMutRecDefns_Phase1 mkLetInfo cenv envInitial parent typeNames inSig tpenv m scopem mutRecNSInfo (mutRecDefns: MutRecShapes) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g // Phase1A - build Entity for type definitions, exception definitions and module definitions. // Also for abbreviations of any of these. Augmentations are skipped in this phase. @@ -16373,12 +16270,8 @@ module TcDeclarations = /// Given a type definition, compute whether its members form an extension of an existing type, and if so if it is an /// intrinsic or extrinsic extension -<<<<<<< HEAD - let private ComputeTyconDeclKind cenv tyconOpt isAtOriginalTyconDefn envForDecls inSig m (synTypars:SynTyparDecl list) synTyparCxs longPath = + let private ComputeTyconDeclKind cenv tyconOpt isAtOriginalTyconDefn envForDecls inSig m (synTypars: SynTyparDecl list) synTyparCxs longPath = let g = cenv.g -======= - let private ComputeTyconDeclKind tyconOpt isAtOriginalTyconDefn cenv envForDecls inSig m (synTypars: SynTyparDecl list) synTyparCxs longPath = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb let ad = envForDecls.eAccessRights let tcref = diff --git a/src/fsharp/TypeRelations.fs b/src/fsharp/TypeRelations.fs index b52dfc67ecc..7808b9e583b 100755 --- a/src/fsharp/TypeRelations.fs +++ b/src/fsharp/TypeRelations.fs @@ -30,24 +30,15 @@ let rec TypeDefinitelySubsumesTypeNoCoercion ndeep g amap m ty1 ty2 = else let ty1 = stripTyEqns g ty1 let ty2 = stripTyEqns g ty2 -<<<<<<< HEAD match ty1,ty2 with - | TType_app (tc1,l1, _nullness1) ,TType_app (tc2,l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this -======= - match ty1, ty2 with - | TType_app (tc1, l1) , TType_app (tc2, l2) when tyconRefEq g tc1 tc2 -> ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + | TType_app (tc1, l1, _nullness1),TType_app (tc2, l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this List.lengthsEqAndForall2 (typeEquiv g) l1 l2 | TType_ucase (tc1, l1) , TType_ucase (tc2, l2) when g.unionCaseRefEq tc1 tc2 -> List.lengthsEqAndForall2 (typeEquiv g) l1 l2 | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (typeEquiv g) l1 l2 -<<<<<<< HEAD - | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this -======= - | TType_fun (d1, r1) , TType_fun (d2, r2) -> ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + | TType_fun (d1, r1, _nullness1) ,TType_fun (d2, r2, _nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this typeEquiv g d1 d2 && typeEquiv g r1 r2 | TType_measure measure1, TType_measure measure2 -> measureEquiv g measure1 measure2 @@ -78,20 +69,12 @@ let rec TypesFeasiblyEquiv ndeep g amap m ty1 ty2 = // QUERY: should these be false for non-equal rigid typars? warn-if-not-rigid typars? | TType_var _ , _ | _, TType_var _ -> true -<<<<<<< HEAD - | TType_app (tc1,l1, _nullness1) ,TType_app (tc2,l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this -======= - | TType_app (tc1, l1) , TType_app (tc2, l2) when tyconRefEq g tc1 tc2 -> ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + | TType_app (tc1, l1, _nullness1) ,TType_app (tc2, l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 -<<<<<<< HEAD - | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this -======= - | TType_fun (d1, r1) , TType_fun (d2, r2) -> ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + | TType_fun (d1, r1, _nullness1) ,TType_fun (d2, r2, _nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this (TypesFeasiblyEquiv ndeep g amap m) d1 d2 && (TypesFeasiblyEquiv ndeep g amap m) r1 r2 | TType_measure _, TType_measure _ -> true @@ -108,20 +91,12 @@ let rec TypeFeasiblySubsumesType ndeep g amap m ty1 canCoerce ty2 = // QUERY: should these be false for non-equal rigid typars? warn-if-not-rigid typars? | TType_var _ , _ | _, TType_var _ -> true -<<<<<<< HEAD - | TType_app (tc1,l1, _nullness1) ,TType_app (tc2,l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this -======= - | TType_app (tc1, l1) , TType_app (tc2, l2) when tyconRefEq g tc1 tc2 -> ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + | TType_app (tc1, l1, _nullness1) ,TType_app (tc2, l2, _nullness2) when tyconRefEq g tc1 tc2 -> // TODO NULLNESS - check it is ok to ignore nullness for this List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> evalTupInfoIsStruct tupInfo1 = evalTupInfoIsStruct tupInfo2 && List.lengthsEqAndForall2 (TypesFeasiblyEquiv ndeep g amap m) l1 l2 -<<<<<<< HEAD - | TType_fun (d1,r1,_nullness1) ,TType_fun (d2,r2,_nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this -======= - | TType_fun (d1, r1) , TType_fun (d2, r2) -> ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + | TType_fun (d1, r1, _nullness1) ,TType_fun (d2, r2, _nullness2) -> // TODO NULLNESS - check it is ok to ignore nullness for this (TypesFeasiblyEquiv ndeep g amap m) d1 d2 && (TypesFeasiblyEquiv ndeep g amap m) r1 r2 | TType_measure _, TType_measure _ -> true @@ -168,13 +143,9 @@ let ChooseTyparSolutionAndRange (g: TcGlobals) amap (tp:Typar) = errorR(Error(FSComp.SR.typrelCannotResolveAmbiguityInPrintf(), m)) maxSoFar, m | TyparConstraint.SupportsNull m -> -<<<<<<< HEAD - addNullnessToTy KnownWithNull maxSoFar,m + addNullnessToTy KnownWithNull maxSoFar, m | TyparConstraint.NotSupportsNull m -> - maxSoFar,m // NOTE: this doesn't "force" non-nullness, since it is the default choice in 'obj' or 'int' -======= - maxSoFar, m ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + maxSoFar, m // NOTE: this doesn't "force" non-nullness, since it is the default choice in 'obj' or 'int' | TyparConstraint.SupportsComparison m -> join m g.mk_IComparable_ty, m | TyparConstraint.SupportsEquality m -> diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs index 2b6a6063fb4..2ed54fc38d6 100644 --- a/src/fsharp/ast.fs +++ b/src/fsharp/ast.fs @@ -271,12 +271,8 @@ type | UserNum of value: string * suffix: string /// F# syntax: verbatim or regular string, e.g. "abc" -<<<<<<< HEAD /// May be null coming from parser in type provider instantiation but is always treated as an error. - | String of text:string * range:range -======= | String of text: string * range: range ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb /// F# syntax: verbatim or regular byte string, e.g. "abc"B. /// @@ -458,16 +454,11 @@ and /// F# syntax is 'typar: null | WhereTyparSupportsNull of genericName: SynTypar * range: range -<<<<<<< HEAD /// F# syntax is 'typar : null - | WhereTyparNotSupportsNull of genericName:SynTypar * range:range + | WhereTyparNotSupportsNull of genericName: SynTypar * range: range /// F# syntax is 'typar : comparison - | WhereTyparIsComparable of genericName:SynTypar * range:range -======= - /// F# syntax is 'typar: comparison | WhereTyparIsComparable of genericName: SynTypar * range: range ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb /// F# syntax is 'typar: equality | WhereTyparIsEquatable of genericName: SynTypar * range: range @@ -542,16 +533,11 @@ and /// For the dimensionless units i.e. 1 , and static parameters to provided types | StaticConstant of constant: SynConst * range: range -<<<<<<< HEAD /// F# syntax : nul used in parameters to type providers - | StaticConstantNull of range:range + | StaticConstantNull of range: range /// F# syntax : const expr, used in static parameters to type providers - | StaticConstantExpr of expr:SynExpr * range:range -======= - /// F# syntax: const expr, used in static parameters to type providers | StaticConstantExpr of expr: SynExpr * range: range ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb /// F# syntax: ident=1 etc., used in static parameters to type providers | StaticConstantNamed of expr: SynType * SynType * range: range diff --git a/src/fsharp/import.fs b/src/fsharp/import.fs index afdb3330ace..a488d10fed9 100644 --- a/src/fsharp/import.fs +++ b/src/fsharp/import.fs @@ -153,8 +153,7 @@ let CanImportILTypeRef (env: ImportMap) m (tref: ILTypeRef) = /// /// Prefer the F# abbreviation for some built-in types, e.g. 'string' rather than /// 'System.String', since we prefer the F# abbreviation to the .NET equivalents. -<<<<<<< HEAD -let ImportTyconRefApp (env:ImportMap) tcref tyargs nullness = +let ImportTyconRefApp (env: ImportMap) tcref tyargs nullness = env.g.improveType tcref tyargs nullness let ImportNullness (g: TcGlobals) = @@ -168,10 +167,6 @@ let ImportNullnessForTyconRef (g: TcGlobals) (m: range) (tcref: TyconRef) = KnownWithNull else KnownAmbivalentToNull -======= -let ImportTyconRefApp (env: ImportMap) tcref tyargs = - env.g.improveType tcref tyargs ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb /// Import an IL type as an F# type. let rec ImportILType (env: ImportMap) m tinst ty = @@ -352,13 +347,8 @@ let rec ImportProvidedType (env: ImportMap) (m: range) (* (tinst: TypeInst) *) ( /// Import a provided method reference as an Abstract IL method reference -<<<<<<< HEAD -let ImportProvidedMethodBaseAsILMethodRef (env:ImportMap) (m:range) (mbase: Tainted) = - let tref = ExtensionTyping.GetILTypeRefOfProvidedType (mbase.PApply((fun mbase -> nonNull mbase.DeclaringType), m), m) -======= let ImportProvidedMethodBaseAsILMethodRef (env: ImportMap) (m: range) (mbase: Tainted) = - let tref = ExtensionTyping.GetILTypeRefOfProvidedType (mbase.PApply((fun mbase -> mbase.DeclaringType), m), m) ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let tref = ExtensionTyping.GetILTypeRefOfProvidedType (mbase.PApply((fun mbase -> nonNull mbase.DeclaringType), m), m) let mbase = // Find the formal member corresponding to the called member diff --git a/src/fsharp/lib.fs b/src/fsharp/lib.fs index c8c90c49691..4fed1c40c1d 100755 --- a/src/fsharp/lib.fs +++ b/src/fsharp/lib.fs @@ -376,17 +376,10 @@ type Graph<'Data, 'Id when 'Id : comparison and 'Id : equality> //#if BUILDING_WITH_LKG type NonNullSlot<'T when 'T : not struct> = 'T //#else -<<<<<<< HEAD //type NonNullSlot<'T when (* 'T : not null and *) 'T : not struct> = 'T? //#endif let nullableSlotEmpty() : NonNullSlot<'T> = Unchecked.defaultof<_> let nullableSlotFull (x: 'T) : NonNullSlot<'T> = x -======= -type NonNullSlot<'T> = 'T -let nullableSlotEmpty() = Unchecked.defaultof<'T> -let nullableSlotFull x = x -//#endif ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb //--------------------------------------------------------------------------- // Caches, mainly for free variables @@ -470,15 +463,11 @@ module internal AsyncUtil = // Continuations that Async.FromContinuations provide do QUWI/SynchContext.Post, // so the order is not overly relevant but still. List.rev savedConts) -<<<<<<< HEAD #if BUILDING_WITH_LKG || BUILD_FROM_SOURCE - let postOrQueue (sc:SynchronizationContext,cont) = + let postOrQueue (sc: SynchronizationContext, cont) = #else - let postOrQueue (sc:SynchronizationContext?,cont) = + let postOrQueue (sc: SynchronizationContext?, cont) = #endif -======= - let postOrQueue (sc:SynchronizationContext, cont) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb match sc with | null -> ThreadPool.QueueUserWorkItem(fun _ -> cont res) |> ignore | NonNull sc -> diff --git a/src/fsharp/service/ServiceDeclarationLists.fs b/src/fsharp/service/ServiceDeclarationLists.fs index 40f29b9ec22..ecb9f3d259c 100644 --- a/src/fsharp/service/ServiceDeclarationLists.fs +++ b/src/fsharp/service/ServiceDeclarationLists.fs @@ -576,17 +576,10 @@ type FSharpDeclarationListInfo(declarations: FSharpDeclarationListItem[], isForT items |> List.map (fun x -> match x.Item with -<<<<<<< HEAD - | Item.Types (_,(TType_app(tcref,_,_) :: _)) -> { x with MinorPriority = 1 + tcref.TyparsNoRange.Length } + | Item.Types (_, (TType_app(tcref, _, _) :: _)) -> { x with MinorPriority = 1 + tcref.TyparsNoRange.Length } // Put delegate ctors after types, sorted by #typars. RemoveDuplicateItems will remove FakeInterfaceCtor and DelegateCtor if an earlier type is also reported with this name | Item.FakeInterfaceCtor (TType_app(tcref,_,_)) | Item.DelegateCtor (TType_app(tcref,_,_)) -> { x with MinorPriority = 1000 + tcref.TyparsNoRange.Length } -======= - | Item.Types (_, (TType_app(tcref, _) :: _)) -> { x with MinorPriority = 1 + tcref.TyparsNoRange.Length } - // Put delegate ctors after types, sorted by #typars. RemoveDuplicateItems will remove FakeInterfaceCtor and DelegateCtor if an earlier type is also reported with this name - | Item.FakeInterfaceCtor (TType_app(tcref, _)) - | Item.DelegateCtor (TType_app(tcref, _)) -> { x with MinorPriority = 1000 + tcref.TyparsNoRange.Length } ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb // Put type ctors after types, sorted by #typars. RemoveDuplicateItems will remove DefaultStructCtors if a type is also reported with this name | Item.CtorGroup (_, (cinfo :: _)) -> { x with MinorPriority = 1000 + 10 * cinfo.DeclaringTyconRef.TyparsNoRange.Length } | Item.MethodGroup(_, minfo :: _, _) -> { x with IsOwnMember = tyconRefOptEq x.Type minfo.DeclaringTyconRef } diff --git a/src/fsharp/symbols/Exprs.fs b/src/fsharp/symbols/Exprs.fs index ee8b37e78c6..d2ae5b3a7a1 100644 --- a/src/fsharp/symbols/Exprs.fs +++ b/src/fsharp/symbols/Exprs.fs @@ -469,12 +469,8 @@ module FSharpExprConvert = // tailcall ConvObjectModelCallLinear cenv env (false, v, [], tyargs, List.concat untupledCurriedArgs) contf2 -<<<<<<< HEAD - and ConvExprPrim (cenv:SymbolEnv) (env:ExprTranslationEnv) expr = - let g = cenv.g -======= and ConvExprPrim (cenv: SymbolEnv) (env: ExprTranslationEnv) expr = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g // Eliminate integer 'for' loops let expr = DetectAndOptimizeForExpression g OptimizeIntRangesOnly expr @@ -875,12 +871,8 @@ module FSharpExprConvert = let envinner = env.BindVal v Some(vR, rhsR), envinner -<<<<<<< HEAD - and ConvILCall (cenv:SymbolEnv) env (isNewObj, valUseFlags, ilMethRef, enclTypeArgs, methTypeArgs, callArgs, m) = - let g = cenv.g -======= and ConvILCall (cenv: SymbolEnv) env (isNewObj, valUseFlags, ilMethRef, enclTypeArgs, methTypeArgs, callArgs, m) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb + let g = cenv.g let isNewObj = (isNewObj || (match valUseFlags with CtorValUsedAsSuperInit | CtorValUsedAsSelfInit -> true | _ -> false)) let methName = ilMethRef.Name let isPropGet = methName.StartsWithOrdinal("get_") diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 7b14595a9d3..721bfba24e3 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -5437,7 +5437,6 @@ let ccuOfTyconRef eref = // Type parameters and inference unknowns //------------------------------------------------------------------------- -<<<<<<< HEAD let NewNullnessVar() = Nullness.Variable (NullnessVar()) // we don't known (and if we never find out then it's non-null) @@ -5446,9 +5445,6 @@ let KnownWithNull = Nullness.Known NullnessInfo.WithNull let KnownWithoutNull = Nullness.Known NullnessInfo.WithoutNull let mkTyparTy (tp:Typar) = -======= -let mkTyparTy (tp: Typar) = ->>>>>>> d5f5bd005aebdd20088a4be20939aea0e9da29fb match tp.Kind with | TyparKind.Type -> tp.AsType KnownWithoutNull // TODO NULLNESS: check various callers | TyparKind.Measure -> TType_measure (Measure.Var tp) From b77e4d3e76df0f3957c9a25427585a1fd96bce6b Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 21 Mar 2019 17:15:25 -0700 Subject: [PATCH 079/137] update nightly publish path (#6361) (#6362) --- .vsts-signed.yaml | 2 +- setup/publish-assets.ps1 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.vsts-signed.yaml b/.vsts-signed.yaml index 599237086b3..21986906d64 100644 --- a/.vsts-signed.yaml +++ b/.vsts-signed.yaml @@ -86,7 +86,7 @@ jobs: displayName: Publish nightly package to MyGet inputs: scriptName: 'setup\publish-assets.ps1' - arguments: '-binariesPath artifacts\bin -configuration $(BuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)' + arguments: '-artifactsPath artifacts -configuration $(BuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)' condition: succeeded() # Package publish diff --git a/setup/publish-assets.ps1 b/setup/publish-assets.ps1 index bfa905bbad9..7ef01a5ffc3 100644 --- a/setup/publish-assets.ps1 +++ b/setup/publish-assets.ps1 @@ -2,7 +2,7 @@ .SYNOPSIS Publishes the VSIX package on MyGet. -.PARAMETER binariesPath +.PARAMETER artifactsPath The root directory where the build outputs are written. .PARAMETER branchName @@ -14,7 +14,7 @@ The API key used to authenticate with MyGet. #> Param( - [string]$binariesPath = $null, + [string]$artifactsPath = $null, [string]$branchName = $null, [string]$apiKey = $null, [string]$configuration = $null @@ -41,7 +41,7 @@ try { } $branchName = $branchName.Replace("/", "_") # can't have slashes in the branch name - $vsix = Join-Path $binariesPath "VisualFSharpFull\$configuration\net46\VisualFSharpFull.vsix" + $vsix = Join-Path $artifactsPath "VSSetup\$configuration\Insertion\VisualFSharpFull.vsix" Write-Host " Uploading '$vsix' to '$requestUrl'." From 10a9f390ed7ace5fce6873ef3eb13c481648e22c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 26 Mar 2019 23:48:07 +0000 Subject: [PATCH 080/137] merge master --- src/absil/ilread.fs | 6 ---- src/absil/ilreflect.fs | 29 ----------------- src/fsharp/CompileOps.fs | 15 --------- src/fsharp/ConstraintSolver.fs | 34 -------------------- src/fsharp/FSharp.Core/prim-types.fs | 4 --- src/fsharp/IlxGen.fs | 48 ---------------------------- src/fsharp/Optimizer.fs | 10 ------ src/fsharp/tast.fs | 26 +-------------- 8 files changed, 1 insertion(+), 171 deletions(-) diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index c65fe0db78e..9ea3fdb9439 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -907,17 +907,11 @@ let mkCacheInt32 lowMem _inbase _nm _sz = fun f (idx: int32) -> let cache = match !cache with -<<<<<<< HEAD | null -> let c = new Dictionary(11) cache := c c | NonNull c -> c -======= - | null -> cache := new Dictionary(11) - | _ -> () - !cache ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let mutable res = Unchecked.defaultof<_> let ok = cache.TryGetValue(idx, &res) if ok then diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs index c62975ca3a3..90607518f34 100644 --- a/src/absil/ilreflect.fs +++ b/src/absil/ilreflect.fs @@ -427,21 +427,10 @@ let envUpdateCreatedTypeRef emEnv (tref: ILTypeRef) = emEnv let convTypeRef cenv emEnv preferCreated (tref: ILTypeRef) = -<<<<<<< HEAD match Zmap.tryFind tref emEnv.emTypMap with | Some (_typT, _typB, _typeDef, Some createdTy) when preferCreated -> createdTy | Some (typT, _typB, _typeDef, _) -> typT | None -> convTypeRefAux cenv tref -======= - let res = - match Zmap.tryFind tref emEnv.emTypMap with - | Some (_typT, _typB, _typeDef, Some createdTy) when preferCreated -> createdTy - | Some (typT, _typB, _typeDef, _) -> typT - | None -> convTypeRefAux cenv tref - match res with - | null -> error(Error(FSComp.SR.itemNotFoundDuringDynamicCodeGen ("type", tref.QualifiedName, tref.Scope.QualifiedName), range0)) - | _ -> res ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let envBindConsRef emEnv (mref: ILMethodRef) consB = {emEnv with emConsMap = Zmap.add mref consB emEnv.emConsMap} @@ -873,15 +862,9 @@ let convMethodSpec cenv emEnv (mspec: ILMethodSpec) = // - QueryableTypeGetConstructors: get a constructor on a non-TypeBuilder type //---------------------------------------------------------------------------- -<<<<<<< HEAD let queryableTypeGetConstructor cenv emEnv (parentT: Type) (mref: ILMethodRef) : ConstructorInfo = let tyargTs = getGenericArgumentsOfType parentT let reqArgTs = -======= -let queryableTypeGetConstructor cenv emEnv (parentT: Type) (mref: ILMethodRef) = - let tyargTs = getGenericArgumentsOfType parentT - let reqArgTs = ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let emEnv = envPushTyvars emEnv tyargTs convTypesToArray cenv emEnv mref.ArgTypes let res = parentT.GetConstructor(BindingFlags.Public ||| BindingFlags.NonPublic ||| BindingFlags.Instance, null, reqArgTs, null) @@ -1006,17 +989,10 @@ let getArrayMethInfo n ty = let setArrayMethInfo n ty = match n with -<<<<<<< HEAD | 2 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray2D Unchecked.defaultof<_> 0 0 0 @@> ty | 3 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray3D Unchecked.defaultof<_> 0 0 0 0 @@> ty | 4 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray4D Unchecked.defaultof<_> 0 0 0 0 0 @@> ty | _ -> invalidArg "n" "not expecting array dimension > 4" -======= - | 2 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray2D null 0 0 0 @@> ty - | 3 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray3D null 0 0 0 0 @@> ty - | 4 -> getGenericMethodDefinition <@@ LanguagePrimitives.IntrinsicFunctions.SetArray4D null 0 0 0 0 0 @@> ty - | _ -> invalidArg "n" "not expecting array dimension > 4" ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a //---------------------------------------------------------------------------- @@ -1329,13 +1305,8 @@ let rec emitInstr cenv (modB: ModuleBuilder) emEnv (ilG: ILGenerator) instr = if (shape = ILArrayShape.SingleDimensional) then ilG.EmitAndLog(OpCodes.Newarr, convType cenv emEnv ty) else -<<<<<<< HEAD let aty = convType cenv emEnv (ILType.Array(shape, ty)) let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, null, Array.create shape.Rank (typeof)) -======= - let aty = convType cenv emEnv (ILType.Array(shape, ty)) - let meth = modB.GetArrayMethodAndLog(aty, ".ctor", System.Reflection.CallingConventions.HasThis, (null: Type), Array.create shape.Rank (typeof)) ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a ilG.EmitAndLog(OpCodes.Newobj, meth) | I_ldlen -> ilG.EmitAndLog(OpCodes.Ldlen) diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index f9d3125edcd..d3dbeab00dc 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -677,11 +677,7 @@ let OutputPhasedErrorR (os: StringBuilder) (err: PhasedDiagnostic) = // REVIEW: consider if we need to show _cxs (the type parameter constraints) let t1, t2, _cxs = NicePrint.minimalStringsOfTwoTypes denv t1 t2 -<<<<<<< HEAD os.Append(ConstraintSolverTypesNotInEqualityRelation1E().Format t1 t2) |> ignore -======= - os.Append(ConstraintSolverTypesNotInEqualityRelation1E().Format t1 t2 ) |> ignore ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a if m.StartLine <> m2.StartLine then os.Append(SeeAlsoE().Format (stringOfRange m)) |> ignore @@ -2144,12 +2140,8 @@ type IRawFSharpAssemblyData = abstract GetAutoOpenAttributes: ILGlobals -> string list /// The raw list InternalsVisibleToAttribute attributes in the assembly -<<<<<<< HEAD abstract GetInternalsVisibleToAttributes: ILGlobals -> string list -======= - abstract GetInternalsVisibleToAttributes: ILGlobals -> string list ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a /// The raw IL module definition in the assembly, if any. This is not present for cross-project references /// in the language service abstract TryGetILModuleDef: unit -> ILModuleDef option @@ -3848,7 +3840,6 @@ let IsSignatureDataResource (r: ILResource) = r.Name.StartsWithOrdinal(FSharpSignatureDataResourceName) || r.Name.StartsWithOrdinal(FSharpSignatureDataResourceName2) -<<<<<<< HEAD let IsSignatureDataResourceB (r: ILResource) = r.Name.StartsWithOrdinal(FSharpSignatureDataResourceNameB) @@ -3859,12 +3850,6 @@ let IsOptimizationDataResource (r: ILResource) = let IsOptimizationDataResourceB (r: ILResource) = r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceNameB) -======= -let IsOptimizationDataResource (r: ILResource) = - r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceName)|| - r.Name.StartsWithOrdinal(FSharpOptimizationDataResourceName2) - ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let GetSignatureDataResourceName (r: ILResource) = if r.Name.StartsWithOrdinal(FSharpSignatureDataResourceName) then String.dropPrefix r.Name FSharpSignatureDataResourceName diff --git a/src/fsharp/ConstraintSolver.fs b/src/fsharp/ConstraintSolver.fs index 6f8eb6e4d0a..af18cd714d9 100644 --- a/src/fsharp/ConstraintSolver.fs +++ b/src/fsharp/ConstraintSolver.fs @@ -985,13 +985,7 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra | TType_app _, TType_app _ -> localAbortD -<<<<<<< HEAD | TType_tuple (tupInfo1, l1) , TType_tuple (tupInfo2, l2) -> -======= - | TType_app (tc1, l1), TType_app (tc2, l2) when tyconRefEq g tc1 tc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 - | TType_app (_, _), TType_app (_, _) -> localAbortD - | TType_tuple (tupInfo1, l1), TType_tuple (tupInfo2, l2) -> ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a if evalTupInfoIsStruct tupInfo1 <> evalTupInfoIsStruct tupInfo2 then ErrorD (ConstraintSolverError(FSComp.SR.tcTupleStructMismatch(), csenv.m, m2)) else SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 @@ -1006,12 +1000,6 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra | TType_anon (anonInfo1, l1),TType_anon (anonInfo2, l2) -> SolveAnonInfoEqualsAnonInfo csenv m2 anonInfo1 anonInfo2 ++ (fun () -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2) -<<<<<<< HEAD - -======= - | TType_fun (d1, r1), TType_fun (d2, r2) -> SolveFunTypeEqn csenv ndeep m2 trace None d1 d2 r1 r2 - | TType_measure ms1, TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | TType_forall(tps1, rty1), TType_forall(tps2, rty2) -> if tps1.Length <> tps2.Length then localAbortD else let aenv = aenv.BindEquivTypars tps1 tps2 @@ -1019,13 +1007,9 @@ and SolveTypeEqualsType (csenv:ConstraintSolverEnv) ndeep m2 (trace: OptionalTra if not (typarsAEquiv g aenv tps1 tps2) then localAbortD else SolveTypeEqualsTypeKeepAbbrevs csenv ndeep m2 trace rty1 rty2 -<<<<<<< HEAD | TType_ucase (uc1, l1) , TType_ucase (uc2, l2) when g.unionCaseRefEq uc1 uc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 -======= - | TType_ucase (uc1, l1), TType_ucase (uc2, l2) when g.unionCaseRefEq uc1 uc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace None l1 l2 ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | _ -> localAbortD @@ -1111,11 +1095,6 @@ and SolveTypeSubsumesType (csenv: ConstraintSolverEnv) ndeep m2 (trace: Optional | TType_anon (anonInfo1, l1), TType_anon (anonInfo2, l2) -> SolveAnonInfoEqualsAnonInfo csenv m2 anonInfo1 anonInfo2 ++ (fun () -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2) (* nb. can unify since no variance *) -<<<<<<< HEAD - -======= - | TType_fun (d1, r1), TType_fun (d2, r2) -> SolveFunTypeEqn csenv ndeep m2 trace cxsln d1 d2 r1 r2 (* nb. can unify since no variance *) ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | TType_measure ms1, TType_measure ms2 -> UnifyMeasures csenv trace ms1 ms2 // Enforce the identities float=float<1>, float32=float32<1> and decimal=decimal<1> @@ -1130,11 +1109,7 @@ and SolveTypeSubsumesType (csenv: ConstraintSolverEnv) ndeep m2 (trace: Optional ) // Special subsumption rule for byref tags -<<<<<<< HEAD | TType_app (tc1, l1, _nullness1) , TType_app (tc2, l2, _nullness2) when tyconRefEq g tc1 tc2 && g.byref2_tcr.CanDeref && tyconRefEq g g.byref2_tcr tc1 -> -======= - | TType_app (tc1, l1), TType_app (tc2, l2) when tyconRefEq g tc1 tc2 && g.byref2_tcr.CanDeref && tyconRefEq g g.byref2_tcr tc1 -> ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a match l1, l2 with | [ h1; tag1 ], [ h2; tag2 ] -> trackErrors { do! SolveTypeEqualsType csenv ndeep m2 trace None h1 h2 @@ -1146,15 +1121,10 @@ and SolveTypeSubsumesType (csenv: ConstraintSolverEnv) ndeep m2 (trace: Optional } | _ -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 -<<<<<<< HEAD | TType_app (tc1, l1, nullness1) , TType_app (tc2, l2, nullness2) when tyconRefEq g tc1 tc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 ++ (fun () -> SolveNullnessSubsumesNullness csenv m2 trace ty1 ty2 nullness1 nullness2 ) -======= - | TType_app (tc1, l1), TType_app (tc2, l2) when tyconRefEq g tc1 tc2 -> - SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | TType_ucase (uc1, l1), TType_ucase (uc2, l2) when g.unionCaseRefEq uc1 uc2 -> SolveTypeEqualsTypeEqns csenv ndeep m2 trace cxsln l1 l2 @@ -1895,7 +1865,6 @@ and AddConstraint (csenv: ConstraintSolverEnv) ndeep m2 trace tp newConstraint } | TyparConstraint.SupportsComparison _, TyparConstraint.IsDelegate _ -<<<<<<< HEAD | TyparConstraint.IsDelegate _ , TyparConstraint.SupportsComparison _ -> ErrorD (Error(FSComp.SR.csDelegateComparisonConstraintInconsistent(), m)) @@ -1907,9 +1876,6 @@ and AddConstraint (csenv: ConstraintSolverEnv) ndeep m2 trace tp newConstraint | TyparConstraint.IsNonNullableStruct _, TyparConstraint.SupportsNull _ -> ErrorD (Error(FSComp.SR.csStructNullConstraintInconsistent(), m)) -======= - | TyparConstraint.IsDelegate _, TyparConstraint.SupportsComparison _ ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | TyparConstraint.IsNonNullableStruct _, TyparConstraint.IsReferenceType _ | TyparConstraint.IsReferenceType _, TyparConstraint.IsNonNullableStruct _ -> ErrorD (Error(FSComp.SR.csStructConstraintInconsistent(), m)) diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index 2c895099f53..6438801f981 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -823,12 +823,8 @@ namespace Microsoft.FSharp.Core /// Implements generic comparison between two objects. This corresponds to the pseudo-code in the F# /// specification. The treatment of NaNs is governed by "comp". -<<<<<<< HEAD let rec GenericCompare (comp:GenericComparer) (xobj:obj, yobj:obj) = (*if objEq xobj yobj then 0 else *) -======= - let rec GenericCompare (comp:GenericComparer) (xobj:obj,yobj:obj) = ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a match xobj,yobj with | null,null -> 0 | null,_ -> -1 diff --git a/src/fsharp/IlxGen.fs b/src/fsharp/IlxGen.fs index f02de57489c..2395c78127d 100644 --- a/src/fsharp/IlxGen.fs +++ b/src/fsharp/IlxGen.fs @@ -521,14 +521,8 @@ and GenTypeAux amap m (tyenv: TypeReprEnv) voidOK ptrsOK ty = | TType_tuple (tupInfo, args) -> GenTypeAux amap m tyenv VoidNotOK ptrsOK (mkCompiledTupleTy g (evalTupInfoIsStruct tupInfo) args) -<<<<<<< HEAD | TType_fun (dty, returnTy, _nullness) -> EraseClosures.mkILFuncTy g.ilxPubCloEnv (GenTypeArgAux amap m tyenv dty) (GenTypeArgAux amap m tyenv returnTy) -======= - | TType_tuple (tupInfo, args) -> GenTypeAux amap m tyenv VoidNotOK ptrsOK (mkCompiledTupleTy g (evalTupInfoIsStruct tupInfo) args) - - | TType_fun (dty, returnTy) -> EraseClosures.mkILFuncTy g.ilxPubCloEnv (GenTypeArgAux amap m tyenv dty) (GenTypeArgAux amap m tyenv returnTy) ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | TType_anon (anonInfo, tinst) -> let tref = anonInfo.ILTypeRef @@ -6736,17 +6730,10 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) = let name = vref.DisplayName match vref.MemberInfo with | None -> None -<<<<<<< HEAD | Some memberInfo -> match name, memberInfo.MemberFlags.MemberKind with | ("Item" | "op_IndexedLookup"), (MemberKind.PropertyGet | MemberKind.PropertySet) when not (isNil (ArgInfosOfPropertyVal g vref.Deref)) -> Some( mkILCustomAttribute g.ilg (g.FindSysILTypeRef "System.Reflection.DefaultMemberAttribute", [g.ilg.typ_String], [ILAttribElem.String(Some(name))], []) ) -======= - | Some memberInfo -> - match name, memberInfo.MemberFlags.MemberKind with - | ("Item" | "op_IndexedLookup"), (MemberKind.PropertyGet | MemberKind.PropertySet) when not (isNil (ArgInfosOfPropertyVal cenv.g vref.Deref)) -> - Some( mkILCustomAttribute cenv.g.ilg (cenv.g.FindSysILTypeRef "System.Reflection.DefaultMemberAttribute", [cenv.g.ilg.typ_String], [ILAttribElem.String(Some(name))], []) ) ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | _ -> None) |> Option.toList @@ -6766,12 +6753,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) = let ilDebugDisplayAttributes = [ yield! GenAttrs cenv eenv debugDisplayAttrs if generateDebugDisplayAttribute then -<<<<<<< HEAD yield g.mkDebuggerDisplayAttribute ("{" + debugDisplayMethodName + "(),nq}") ] -======= - yield cenv.g.mkDebuggerDisplayAttribute ("{" + debugDisplayMethodName + "(),nq}") ] - ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let ilCustomAttrs = [ yield! defaultMemberAttrs @@ -6805,11 +6787,7 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) = isEmptyStruct && cenv.opts.workAroundReflectionEmitBugs && not tycon.TyparsNoRange.IsEmpty // Compute a bunch of useful things for each field -<<<<<<< HEAD let isCLIMutable = (TryFindFSharpBoolAttribute g g.attrib_CLIMutableAttribute tycon.Attribs = Some true) -======= - let isCLIMutable = (TryFindFSharpBoolAttribute cenv.g cenv.g.attrib_CLIMutableAttribute tycon.Attribs = Some true) ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let fieldSummaries = [ for fspec in tycon.AllFieldsArray do @@ -6836,13 +6814,8 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) = [ for (useGenuineField, ilFieldName, isFSharpMutable, isStatic, _, ilPropType, isPropHidden, fspec) in fieldSummaries do let ilFieldOffset = -<<<<<<< HEAD match TryFindFSharpAttribute g g.attrib_FieldOffsetAttribute fspec.FieldAttribs with | Some (Attrib(_, _, [ AttribInt32Arg(fieldOffset) ], _, _, _, _)) -> -======= - match TryFindFSharpAttribute cenv.g cenv.g.attrib_FieldOffsetAttribute fspec.FieldAttribs with - | Some (Attrib(_, _, [ AttribInt32Arg(fieldOffset) ], _, _, _, _)) -> ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a Some fieldOffset | Some (Attrib(_, _, _, _, _, _, m)) -> errorR(Error(FSComp.SR.ilFieldOffsetAttributeCouldNotBeDecoded(), m)) @@ -7063,13 +7036,8 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) = let tdef = tdef.With(customAttrs = mkILCustomAttrs ilCustomAttrs, genericParams = ilGenParams) tdef, None -<<<<<<< HEAD | TRecdRepr _ | TFSharpObjectRepr _ as tyconRepr -> let super = superOfTycon g tycon -======= - | TRecdRepr _ | TFSharpObjectRepr _ as tyconRepr -> - let super = superOfTycon cenv.g tycon ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let ilBaseTy = GenType cenv.amap m eenvinner.tyenv super // Build a basic type definition @@ -7109,15 +7077,9 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) = let tdef = tdef.WithSealed(isSealedTy g thisTy || isTheSealedAttribute).WithSerializable(isSerializable).WithAbstract(isAbstract).WithImport(isComInteropTy g thisTy) let tdef = tdef.With(methodImpls=mkILMethodImpls methodImpls) -<<<<<<< HEAD let tdLayout,tdEncoding = match TryFindFSharpAttribute g g.attrib_StructLayoutAttribute tycon.Attribs with | Some (Attrib(_, _, [ AttribInt32Arg(layoutKind) ], namedArgs, _, _, _)) -> -======= - let tdLayout, tdEncoding = - match TryFindFSharpAttribute cenv.g cenv.g.attrib_StructLayoutAttribute tycon.Attribs with - | Some (Attrib(_, _, [ AttribInt32Arg(layoutKind) ], namedArgs, _, _, _)) -> ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let decoder = AttributeDecoder namedArgs let ilPack = decoder.FindInt32 "Pack" 0x0 let ilSize = decoder.FindInt32 "Size" 0x0 @@ -7270,12 +7232,8 @@ and GenTypeDef cenv mgbuf lazyInitInfo eenv m (tycon: Tycon) = /// Generate the type for an F# exception declaration. and GenExnDef cenv mgbuf eenv m (exnc: Tycon) = -<<<<<<< HEAD let g = cenv.g let exncref = mkLocalEntityRef exnc -======= - let exncref = mkLocalEntityRef exnc ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a match exnc.ExceptionInfo with | TExnAbbrevRepr _ | TExnAsmRepr _ | TExnNone -> () | TExnFresh _ -> @@ -7331,15 +7289,9 @@ and GenExnDef cenv mgbuf eenv m (exnc: Tycon) = [ mkLdarg0 mkLdarg 1us mkLdarg 2us -<<<<<<< HEAD mkNormalCall (mkILCtorMethSpecForTy (g.iltyp_Exception, [serializationInfoType; streamingContextType])) ] ,None)) -======= - mkNormalCall (mkILCtorMethSpecForTy (cenv.g.iltyp_Exception, [serializationInfoType; streamingContextType])) ], - None)) - ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a //#if BE_SECURITY_TRANSPARENT [ilCtorDefForSerialziation] //#else diff --git a/src/fsharp/Optimizer.fs b/src/fsharp/Optimizer.fs index a3415655802..cead8e46d92 100644 --- a/src/fsharp/Optimizer.fs +++ b/src/fsharp/Optimizer.fs @@ -1795,13 +1795,8 @@ let TryDetectQueryQuoteAndRun cenv (expr: Expr) = let resultExprAfterConvertToResultTy = match reqdResultInfo, exprIsEnumerableInfo with | Some _, Some _ | None, None -> resultExpr // the expression is a QuerySource, the result is a QuerySource, nothing to do -<<<<<<< HEAD | Some resultElemTy, None -> mkCallGetQuerySourceAsEnumerable cenv.g expr.Range resultElemTy (TType_app(cenv.g.tcref_System_Collections_IEnumerable, [], g.knownWithoutNull)) resultExpr | None, Some (resultElemTy, qTy) -> mkCallNewQuerySource cenv.g expr.Range resultElemTy qTy resultExpr -======= - | Some resultElemTy, None -> mkCallGetQuerySourceAsEnumerable cenv.g expr.Range resultElemTy (TType_app(cenv.g.tcref_System_Collections_IEnumerable, [])) resultExpr - | None, Some (resultElemTy, qTy) -> mkCallNewQuerySource cenv.g expr.Range resultElemTy qTy resultExpr ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a Some resultExprAfterConvertToResultTy | None -> None @@ -1879,13 +1874,8 @@ let rec OptimizeExpr cenv (env: IncrementalOptimizationEnv) expr = let ty = mkForallTyIfNeeded tps rty OptimizeLambdas None cenv env topValInfo expr ty -<<<<<<< HEAD | Expr.TyChoose _ -> OptimizeExpr cenv env (TypeRelations.ChooseTyparSolutionsForFreeChoiceTypars g cenv.amap expr) -======= - | Expr.TyChoose _ -> - OptimizeExpr cenv env (TypeRelations.ChooseTyparSolutionsForFreeChoiceTypars cenv.g cenv.amap expr) ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | Expr.Match(spMatch, exprm, dtree, targets, m, ty) -> OptimizeMatch cenv env (spMatch, exprm, dtree, targets, m, ty) diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index 7448cf31013..97bf152f6b8 100644 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -3158,13 +3158,8 @@ and assert (j >= 0) assert (j <= path.Length - 1) let matched = -<<<<<<< HEAD [ for resolver in resolvers do let moduleOrNamespace = if j = 0 then [| |] else path.[0..j-1] -======= - [ for resolver in resolvers do - let moduleOrNamespace = if j = 0 then null else path.[0..j-1] ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a let typename = path.[j] let resolution = ExtensionTyping.TryLinkProvidedType(resolver, moduleOrNamespace, typename, m) match resolution with @@ -4048,11 +4043,7 @@ and /// TType_fun(domainType, rangeType, nullness). /// /// Indicates the type is a function type -<<<<<<< HEAD - | TType_fun of TType * TType * Nullness -======= - | TType_fun of TType * TType ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a + | TType_fun of TType * TType * Nullness /// TType_ucase(unionCaseRef, typeInstantiation) /// @@ -4072,7 +4063,6 @@ and /// See https://github.com/Microsoft/visualfsharp/issues/2561 member x.GetAssemblyName() = match x with -<<<<<<< HEAD | TType_forall (_tps, ty) -> ty.GetAssemblyName() | TType_app (tcref, _tinst, _) -> tcref.CompilationPath.ILScopeRef.QualifiedName | TType_tuple _ -> "" @@ -4080,15 +4070,6 @@ and | TType_fun _ -> "" | TType_measure _ -> "" | TType_var (tp, _nullness) -> tp.Solution |> function Some sln -> sln.GetAssemblyName() | None -> "" -======= - | TType_forall (_tps, ty) -> ty.GetAssemblyName() - | TType_app (tcref, _tinst) -> tcref.CompilationPath.ILScopeRef.QualifiedName - | TType_tuple (_tupInfo, _tinst) -> "" - | TType_anon (anonInfo, _tinst) -> defaultArg anonInfo.Assembly.QualifiedName "" - | TType_fun (_d, _r) -> "" - | TType_measure _ms -> "" - | TType_var tp -> tp.Solution |> function Some sln -> sln.GetAssemblyName() | None -> "" ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | TType_ucase (_uc, _tinst) -> let (TILObjectReprData(scope, _nesting, _definition)) = _uc.Tycon.ILTyconInfo scope.QualifiedName @@ -4098,13 +4079,8 @@ and override x.ToString() = match x with -<<<<<<< HEAD | TType_forall (_tps, ty) -> "forall ... " + ty.ToString() | TType_app (tcref, tinst, nullness) -> tcref.DisplayName + (match tinst with [] -> "" | tys -> "<" + String.concat "," (List.map string tys) + ">") + nullness.ToString() -======= - | TType_forall (_tps, ty) -> "forall ... " + ty.ToString() - | TType_app (tcref, tinst) -> tcref.DisplayName + (match tinst with [] -> "" | tys -> "<" + String.concat "," (List.map string tys) + ">") ->>>>>>> 87cbf6f2faf76e0f4fbbbc4eee0a5bb6efe0786a | TType_tuple (tupInfo, tinst) -> (match tupInfo with | TupInfo.Const false -> "" From 6e7e3c4c71a45930227f26c77fdf1de96d9df82c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 27 Mar 2019 11:57:03 +0000 Subject: [PATCH 081/137] us proto build on mac and linux --- eng/build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eng/build.sh b/eng/build.sh index d814dcd04d4..c00b144a859 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -217,6 +217,13 @@ function BuildSolution { cp $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp2.0/* $bootstrap_dir cp $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp2.0/* $bootstrap_dir + MSBuild "$repo_root/proto.proj" \ + /restore \ + /p:Configuration=$bootstrap_config \ + /t:Build + + cp $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.0/* $bootstrap_dir + # do real build MSBuild $toolset_build_proj \ $bl \ @@ -230,6 +237,7 @@ function BuildSolution { /p:Publish=$publish \ /p:UseRoslynAnalyzers=$enable_analyzers \ /p:ContinuousIntegrationBuild=$ci \ + /p:BootstrapBuildPath="$bootstrap_dir" \ /p:QuietRestore=$quiet_restore \ /p:QuietRestoreBinaryLog="$binary_log" \ $properties From 39ec26ad4f68b5530675418212fce6fd8e26cd12 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 27 Mar 2019 13:24:28 +0000 Subject: [PATCH 082/137] build right proto on unix --- proto.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proto.proj b/proto.proj index c60f17d8426..1d707586ea7 100644 --- a/proto.proj +++ b/proto.proj @@ -8,7 +8,7 @@ TargetFramework=net46 - TargetFramework=netcoreapp2.1 + TargetFramework=netstandard2.0 TargetFramework=net46 From 7cc99ca04b475f2fa3c53b03474e2f2fa085a0f1 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 11:46:15 +0000 Subject: [PATCH 083/137] fix build to really use proto --- eng/build-utils.ps1 | 4 ++-- eng/build.sh | 14 ++++++++------ fcs/build.fsx | 8 +++++--- src/fsharp/ExtensionTyping.fs | 4 ++-- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1 index 845169db12a..d4f2b625f2b 100644 --- a/eng/build-utils.ps1 +++ b/eng/build-utils.ps1 @@ -242,8 +242,8 @@ function Make-BootstrapBuild() { # prepare FsLex and Fsyacc Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Build" -logFileName "BuildTools" -configuration $bootstrapConfiguration - Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.0\*" -Destination $dir - Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.0\*" -Destination $dir + Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\$coreclrTargetFramework\*" -Destination $dir + Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\$coreclrTargetFramework\*" -Destination $dir # prepare compiler $projectPath = "$RepoRoot\proto.proj" diff --git a/eng/build.sh b/eng/build.sh index c00b144a859..bae5b6a45f7 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -205,6 +205,8 @@ function BuildSolution { quiet_restore=true fi + coreclr_target_framework=netcoreapp2.0 + # build bootstrap tools bootstrap_config=Proto MSBuild "$repo_root/src/buildtools/buildtools.proj" \ @@ -214,15 +216,15 @@ function BuildSolution { bootstrap_dir=$artifacts_dir/Bootstrap mkdir -p "$bootstrap_dir" - cp $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp2.0/* $bootstrap_dir - cp $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp2.0/* $bootstrap_dir + cp $artifacts_dir/bin/fslex/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir + cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir MSBuild "$repo_root/proto.proj" \ /restore \ /p:Configuration=$bootstrap_config \ /t:Build - cp $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.0/* $bootstrap_dir + cp $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.1/* $bootstrap_dir # do real build MSBuild $toolset_build_proj \ @@ -248,9 +250,9 @@ InitializeDotNetCli $restore BuildSolution if [[ "$test_core_clr" == true ]]; then - TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework netcoreapp2.0 - TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework netcoreapp2.0 - TestUsingNUnit --testproject "$repo_root/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj" --targetframework netcoreapp2.0 + TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclr_target_framework + TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclr_target_framework + TestUsingNUnit --testproject "$repo_root/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj" --targetframework $coreclr_target_framework fi ExitWithExitCode 0 diff --git a/fcs/build.fsx b/fcs/build.fsx index 50735795d88..58262f7c40a 100644 --- a/fcs/build.fsx +++ b/fcs/build.fsx @@ -24,6 +24,8 @@ let isMono = false // Utilities // -------------------------------------------------------------------------------------- +let coreclrTargetFramework = "netcoreapp2.0" + let dotnetExePath = // Build.cmd normally downloads a dotnet cli to: \artifacts\toolset\dotnet // check if there is one there to avoid downloading an additional one here @@ -92,13 +94,13 @@ Target "BuildVersion" (fun _ -> Target "Build" (fun _ -> runDotnet __SOURCE_DIRECTORY__ "build ../src/buildtools/buildtools.proj -v n -c Proto" - let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp2.0/fslex.dll" - let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp2.0/fsyacc.dll" + let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/" + coreclrTargetFramework + "/fslex.dll" + let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/" + coreclrTargetFramework + "/fsyacc.dll" runDotnet __SOURCE_DIRECTORY__ (sprintf "build FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath) ) Target "Test" (fun _ -> - // This project file is used for the netcoreapp2.0 tests to work out reference sets + // This project file is used for the tests to work out reference sets runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableCompilerRedirection=true" // Now run the tests diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs index 9bf54e3be79..cd0dfdbd2e3 100755 --- a/src/fsharp/ExtensionTyping.fs +++ b/src/fsharp/ExtensionTyping.fs @@ -45,9 +45,9 @@ module internal ExtensionTyping = // Detect the host tooling context let toolingCompatibleVersions() = if typeof.Assembly.GetName().Name = "mscorlib" then - [ "net461"; "net452"; "net451"; "net45"; "netstandard2.0"] + [ "net48"; "net472"; "net471"; "net47"; "net462"; "net461"; "net452"; "net451"; "net45"; "netstandard2.0"] elif typeof.Assembly.GetName().Name = "System.Private.CoreLib" then - [ "netcoreapp2.0"; "netstandard2.0"] + [ "netcoreapp2.1"; "netcoreapp2.0"; "netstandard2.0"] else System.Diagnostics.Debug.Assert(false, "Couldn't determine runtime tooling context, assuming it supports at least .NET Standard 2.0") [ "netstandard2.0"] From c15c030bb9ac7246e29ae93e82fb77bfdc5d5090 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 12:38:15 +0000 Subject: [PATCH 084/137] fix build --- eng/build-utils.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1 index d4f2b625f2b..845169db12a 100644 --- a/eng/build-utils.ps1 +++ b/eng/build-utils.ps1 @@ -242,8 +242,8 @@ function Make-BootstrapBuild() { # prepare FsLex and Fsyacc Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Build" -logFileName "BuildTools" -configuration $bootstrapConfiguration - Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\$coreclrTargetFramework\*" -Destination $dir - Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\$coreclrTargetFramework\*" -Destination $dir + Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.0\*" -Destination $dir + Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.0\*" -Destination $dir # prepare compiler $projectPath = "$RepoRoot\proto.proj" From 9d61ee7e4ef40267ecb178212a6193caf42aedc1 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 17:39:22 +0000 Subject: [PATCH 085/137] update tfms for type providers --- .../ProductVersion.fs | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs index fe95e82a977..462f621941d 100644 --- a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs +++ b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs @@ -93,21 +93,21 @@ module TypeProviderDesignTimeComponentLoading = let ``check tooling paths for type provider design time component loading`` () = let expected = [ -#if NET46 // only available on net46 - Path.Combine("typeproviders", "fsharp41", "net461") - Path.Combine("tools", "fsharp41", "net461") - Path.Combine("typeproviders", "fsharp41", "net452") - Path.Combine("tools", "fsharp41", "net452") - Path.Combine("typeproviders", "fsharp41", "net451") - Path.Combine("tools", "fsharp41", "net451") - Path.Combine("typeproviders", "fsharp41", "net45") - Path.Combine("tools", "fsharp41", "net45") -#else // only available on netcoreapp2.0 - Path.Combine("typeproviders", "fsharp41", "netcoreapp2.0") - Path.Combine("tools", "fsharp41", "netcoreapp2.0") -#endif // available in both - Path.Combine("typeproviders", "fsharp41", "netstandard2.0") - Path.Combine("tools", "fsharp41", "netstandard2.0") +#if NET46 + // only searched when executing on .NET Framework + for tfm in ["net48"; "net472"; "net471"; "net47"; "net462"; "net461"; "net452"; "net451"; "net45"] do + yield Path.Combine("typeproviders", "fsharp41", tfm) + yield Path.Combine("tools", "fsharp41", tfm) +#else + // only searched when executing on .NET Core + for tfm in ["netcoreapp2.1"; "netcoreapp2.0"] do + yield Path.Combine("typeproviders", "fsharp41", tfm) + yield Path.Combine("tools", "fsharp41", tfm) +#endif + // always searched + for tfm in ["netstandard2.0"] do + yield Path.Combine("typeproviders", "fsharp41", tfm) + yield Path.Combine("tools", "fsharp41", tfm) ] let actual = FSharp.Compiler.ExtensionTyping.toolingCompatiblePaths() printfn "actual = %A" actual From 08d89c70db7bb6f96586613caab69bd634a27120 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 19:25:02 +0000 Subject: [PATCH 086/137] verbose build --- .vsts-pr.yaml | 6 +++--- eng/Build.ps1 | 1 + eng/build.sh | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.vsts-pr.yaml b/.vsts-pr.yaml index b7d3862888d..b0186db4e1e 100644 --- a/.vsts-pr.yaml +++ b/.vsts-pr.yaml @@ -11,7 +11,7 @@ jobs: _configuration: Release _testKind: testcoreclr steps: - - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) + - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) --verbosity normal - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: @@ -55,7 +55,7 @@ jobs: _configuration: Release _testKind: testcoreclr steps: - - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) + - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) --verbosity normal - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: @@ -108,7 +108,7 @@ jobs: _configuration: Release _testKind: testVs steps: - - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind) + - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind) -verbosity normal - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 04afc1b1d46..72a664f1715 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -157,6 +157,7 @@ function BuildSolution() { /p:QuietRestore=$quietRestore ` /p:QuietRestoreBinaryLog=$binaryLog ` /p:TestTargetFrameworks=$testTargetFrameworks ` + /v:$verbosity ` $suppressExtensionDeployment ` @properties } diff --git a/eng/build.sh b/eng/build.sh index bae5b6a45f7..a7c055e7cae 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -211,6 +211,7 @@ function BuildSolution { bootstrap_config=Proto MSBuild "$repo_root/src/buildtools/buildtools.proj" \ /restore \ + /v:$verbosity \ /p:Configuration=$bootstrap_config \ /t:Build @@ -221,6 +222,7 @@ function BuildSolution { MSBuild "$repo_root/proto.proj" \ /restore \ + /v:$verbosity \ /p:Configuration=$bootstrap_config \ /t:Build @@ -229,6 +231,7 @@ function BuildSolution { # do real build MSBuild $toolset_build_proj \ $bl \ + /v:$verbosity \ /p:Configuration=$configuration \ /p:Projects="$projects" \ /p:RepoRoot="$repo_root" \ From 088951b942cc7ab1e81a3804b6f87407b46b7c15 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 21:28:32 +0000 Subject: [PATCH 087/137] try to fix build --- FSharpBuild.Directory.Build.props | 4 ++-- eng/Build.ps1 | 1 - eng/build-utils.ps1 | 4 ---- eng/build.sh | 1 - fcs/Directory.Build.props | 4 ---- 5 files changed, 2 insertions(+), 12 deletions(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index 31d24301299..93b66901c80 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -12,7 +12,7 @@ $(RepoRoot)src $(ArtifactsDir)\SymStore $(ArtifactsDir)\Bootstrap - $(ArtifactsDir)/fsc/Proto/netcoreapp2.1 + $(ArtifactsDir)/bin/fsc/Proto/netcoreapp2.1 4.4.0 1182;0025;$(WarningsAsErrors) @@ -80,7 +80,7 @@ - + $(ProtoOutputPath)\Microsoft.FSharp.Targets $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 87d0873deca..46219f4bd56 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -155,7 +155,6 @@ function BuildSolution() { /p:Publish=$publish ` /p:ContinuousIntegrationBuild=$ci ` /p:OfficialBuildId=$officialBuildId ` - /p:BootstrapBuildPath=$bootstrapDir ` /p:QuietRestore=$quietRestore ` /p:QuietRestoreBinaryLog=$binaryLog ` /p:TestTargetFrameworks=$testTargetFrameworks ` diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1 index c76c9421c19..5f5f7441712 100644 --- a/eng/build-utils.ps1 +++ b/eng/build-utils.ps1 @@ -216,10 +216,6 @@ function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string] $args += " /p:ContinuousIntegrationBuild=true" } - if ($bootstrapDir -ne "") { - $args += " /p:BootstrapBuildPath=$bootstrapDir" - } - $args += " $buildArgs" $args += " $projectFilePath" $args += " $properties" diff --git a/eng/build.sh b/eng/build.sh index a7c055e7cae..34cc7cf496f 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -242,7 +242,6 @@ function BuildSolution { /p:Publish=$publish \ /p:UseRoslynAnalyzers=$enable_analyzers \ /p:ContinuousIntegrationBuild=$ci \ - /p:BootstrapBuildPath="$bootstrap_dir" \ /p:QuietRestore=$quiet_restore \ /p:QuietRestoreBinaryLog="$binary_log" \ $properties diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index 3179fe221f9..99ac310b2a3 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -20,8 +20,4 @@ true - - - $(ArtifactsBinDir)\FSharp.Build\Proto\net46 - From 9c93ac19ed2476668570566679e9b5c24125d3b9 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 21:36:13 +0000 Subject: [PATCH 088/137] don't rebuild proto --- eng/build.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/eng/build.sh b/eng/build.sh index 34cc7cf496f..47e6e57e397 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -216,17 +216,19 @@ function BuildSolution { /t:Build bootstrap_dir=$artifacts_dir/Bootstrap - mkdir -p "$bootstrap_dir" - cp $artifacts_dir/bin/fslex/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir - cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir + if [ ! -d "$bootstrap_dir" ]; then + mkdir -p "$bootstrap_dir" + cp $artifacts_dir/bin/fslex/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir + cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir - MSBuild "$repo_root/proto.proj" \ - /restore \ - /v:$verbosity \ - /p:Configuration=$bootstrap_config \ - /t:Build + MSBuild "$repo_root/proto.proj" \ + /restore \ + /v:$verbosity \ + /p:Configuration=$bootstrap_config \ + /t:Build - cp $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.1/* $bootstrap_dir + cp $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.1/* $bootstrap_dir + fi # do real build MSBuild $toolset_build_proj \ From ddd0ac7e57bad7b66c7ef6c5eb50cf92f5d87421 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 21:44:55 +0000 Subject: [PATCH 089/137] trim list --- src/fsharp/ExtensionTyping.fs | 2 +- tests/FSharp.Compiler.UnitTests/ProductVersion.fs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs index cd0dfdbd2e3..97c4feddbc4 100755 --- a/src/fsharp/ExtensionTyping.fs +++ b/src/fsharp/ExtensionTyping.fs @@ -45,7 +45,7 @@ module internal ExtensionTyping = // Detect the host tooling context let toolingCompatibleVersions() = if typeof.Assembly.GetName().Name = "mscorlib" then - [ "net48"; "net472"; "net471"; "net47"; "net462"; "net461"; "net452"; "net451"; "net45"; "netstandard2.0"] + [ "net471"; "net47"; "net462"; "net461"; "net452"; "net451"; "net45"; "netstandard2.0"] elif typeof.Assembly.GetName().Name = "System.Private.CoreLib" then [ "netcoreapp2.1"; "netcoreapp2.0"; "netstandard2.0"] else diff --git a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs index 462f621941d..77ff2e60d3b 100644 --- a/tests/FSharp.Compiler.UnitTests/ProductVersion.fs +++ b/tests/FSharp.Compiler.UnitTests/ProductVersion.fs @@ -95,7 +95,7 @@ module TypeProviderDesignTimeComponentLoading = [ #if NET46 // only searched when executing on .NET Framework - for tfm in ["net48"; "net472"; "net471"; "net47"; "net462"; "net461"; "net452"; "net451"; "net45"] do + for tfm in ["net471"; "net47"; "net462"; "net461"; "net452"; "net451"; "net45"] do yield Path.Combine("typeproviders", "fsharp41", tfm) yield Path.Combine("tools", "fsharp41", tfm) #else From 67717f86770cd66a9863f16369a5c19423959575 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 22:00:10 +0000 Subject: [PATCH 090/137] disable proto compiler for fslex/fsyacc --- FSharpBuild.Directory.Build.props | 2 +- eng/build.sh | 17 +++++++++-------- fcs/Directory.Build.props | 2 +- fcs/build.fsx | 8 ++++---- src/buildtools/buildtools.proj | 1 + 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index 93b66901c80..9d1161037b8 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -80,7 +80,7 @@ - + $(ProtoOutputPath)\Microsoft.FSharp.Targets $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets diff --git a/eng/build.sh b/eng/build.sh index 47e6e57e397..540866dbb1f 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -209,18 +209,19 @@ function BuildSolution { # build bootstrap tools bootstrap_config=Proto - MSBuild "$repo_root/src/buildtools/buildtools.proj" \ - /restore \ - /v:$verbosity \ - /p:Configuration=$bootstrap_config \ - /t:Build - bootstrap_dir=$artifacts_dir/Bootstrap - if [ ! -d "$bootstrap_dir" ]; then + if [ ! -d "$bootstrap_dir/fslex.dll" ]; then + MSBuild "$repo_root/src/buildtools/buildtools.proj" \ + /restore \ + /v:$verbosity \ + /p:Configuration=$bootstrap_config \ + /t:Build + mkdir -p "$bootstrap_dir" cp $artifacts_dir/bin/fslex/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir - + fi + if [ ! -d "$bootstrap_dir/fsc.exe" ]; then MSBuild "$repo_root/proto.proj" \ /restore \ /v:$verbosity \ diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index 99ac310b2a3..e09dc41a671 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -17,7 +17,7 @@ $(ArtifactsDir)\obj $(ArtifactsBinDir)\fcs $(ArtifactsObjDir)\fcs - true + true diff --git a/fcs/build.fsx b/fcs/build.fsx index 58262f7c40a..7807d278aea 100644 --- a/fcs/build.fsx +++ b/fcs/build.fsx @@ -24,7 +24,7 @@ let isMono = false // Utilities // -------------------------------------------------------------------------------------- -let coreclrTargetFramework = "netcoreapp2.0" +let fslexyaccTargetFramework = "netcoreapp2.0" let dotnetExePath = // Build.cmd normally downloads a dotnet cli to: \artifacts\toolset\dotnet @@ -94,14 +94,14 @@ Target "BuildVersion" (fun _ -> Target "Build" (fun _ -> runDotnet __SOURCE_DIRECTORY__ "build ../src/buildtools/buildtools.proj -v n -c Proto" - let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/" + coreclrTargetFramework + "/fslex.dll" - let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/" + coreclrTargetFramework + "/fsyacc.dll" + let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/" + fslexyaccTargetFramework + "/fslex.dll" + let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/" + fslexyaccTargetFramework + "/fsyacc.dll" runDotnet __SOURCE_DIRECTORY__ (sprintf "build FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath) ) Target "Test" (fun _ -> // This project file is used for the tests to work out reference sets - runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableCompilerRedirection=true" + runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableProtoCompiler=true" // Now run the tests let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.xml") diff --git a/src/buildtools/buildtools.proj b/src/buildtools/buildtools.proj index 593f086dd07..4e6e42a27bf 100644 --- a/src/buildtools/buildtools.proj +++ b/src/buildtools/buildtools.proj @@ -2,6 +2,7 @@ Debug + true From 2eb152834ad0ae8710b699b2e6725bae696c0d94 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 28 Mar 2019 23:01:44 +0000 Subject: [PATCH 091/137] fix build --- FSharpBuild.Directory.Build.props | 2 +- src/buildtools/buildtools.proj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index 9d1161037b8..bdb8c36c398 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -80,7 +80,7 @@ - + $(ProtoOutputPath)\Microsoft.FSharp.Targets $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets diff --git a/src/buildtools/buildtools.proj b/src/buildtools/buildtools.proj index 4e6e42a27bf..9e7f671a351 100644 --- a/src/buildtools/buildtools.proj +++ b/src/buildtools/buildtools.proj @@ -11,23 +11,23 @@ - + - + - + - + - + From 713b40fb376d316ffe318046b51ab3787af8b2d0 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 01:07:07 +0000 Subject: [PATCH 092/137] add buildtools props file instead --- src/buildtools/buildtools.proj | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/buildtools/buildtools.proj b/src/buildtools/buildtools.proj index 9e7f671a351..593f086dd07 100644 --- a/src/buildtools/buildtools.proj +++ b/src/buildtools/buildtools.proj @@ -2,7 +2,6 @@ Debug - true @@ -11,23 +10,23 @@ - + - + - + - + - + From feebc9936100b70ea9f23febe2516285d67dc4d0 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 01:23:36 +0000 Subject: [PATCH 093/137] add missing file --- src/buildtools/Directory.Build.props | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/buildtools/Directory.Build.props diff --git a/src/buildtools/Directory.Build.props b/src/buildtools/Directory.Build.props new file mode 100644 index 00000000000..a2a60f76a95 --- /dev/null +++ b/src/buildtools/Directory.Build.props @@ -0,0 +1,7 @@ + + + + true + + + From 385c4d938ad267fc7285767178aea6c72616d6e5 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 02:16:05 +0000 Subject: [PATCH 094/137] proto --- src/buildtools/buildtools.proj | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/buildtools/buildtools.proj b/src/buildtools/buildtools.proj index 593f086dd07..d96cf6a8d8c 100644 --- a/src/buildtools/buildtools.proj +++ b/src/buildtools/buildtools.proj @@ -2,7 +2,8 @@ Debug - + true + @@ -10,23 +11,23 @@ - + - + - + - + - + From 9b4ff938774a7dde85e4aac3cab66d29b83fa3de Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 02:18:25 +0000 Subject: [PATCH 095/137] proto --- src/buildtools/Directory.Build.props | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/buildtools/Directory.Build.props diff --git a/src/buildtools/Directory.Build.props b/src/buildtools/Directory.Build.props deleted file mode 100644 index a2a60f76a95..00000000000 --- a/src/buildtools/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - true - - - From 40bb2de5d8e7ef359469e44adee0818d3cd00065 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 02:41:20 +0000 Subject: [PATCH 096/137] simplify --- FSharpBuild.Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index bdb8c36c398..9d1161037b8 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -80,7 +80,7 @@ - + $(ProtoOutputPath)\Microsoft.FSharp.Targets $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets From 2f96a634333c1a0ea4fde0b7d84cc252a21b1183 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 02:46:49 +0000 Subject: [PATCH 097/137] more --- FSharpTests.Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 6c298fe4426..55098121979 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -33,8 +33,8 @@ <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net46 - <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netstandard2.0 - <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework) + <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netcoreapp2.1 + <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fcs\$(Configuration)\$(_FSharpBuildTargetFramework) $(_FSharpBuildBinPath)\FSharp.Build.dll From 266d69569a86d8d216427c92cf3467dc7dbc3fd5 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 02:50:36 +0000 Subject: [PATCH 098/137] more --- eng/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.sh b/eng/build.sh index 540866dbb1f..82908aadafc 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -210,7 +210,7 @@ function BuildSolution { # build bootstrap tools bootstrap_config=Proto bootstrap_dir=$artifacts_dir/Bootstrap - if [ ! -d "$bootstrap_dir/fslex.dll" ]; then + if [ ! -e "$bootstrap_dir/fslex.dll" ]; then MSBuild "$repo_root/src/buildtools/buildtools.proj" \ /restore \ /v:$verbosity \ @@ -221,7 +221,7 @@ function BuildSolution { cp $artifacts_dir/bin/fslex/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir fi - if [ ! -d "$bootstrap_dir/fsc.exe" ]; then + if [ ! -e "$bootstrap_dir/fsc.exe" ]; then MSBuild "$repo_root/proto.proj" \ /restore \ /v:$verbosity \ From 0f3ddebff891eae19dd0c6e8dc5287b6539aa854 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 03:03:50 +0000 Subject: [PATCH 099/137] more --- eng/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/build.sh b/eng/build.sh index 82908aadafc..c01740d0acf 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -210,7 +210,7 @@ function BuildSolution { # build bootstrap tools bootstrap_config=Proto bootstrap_dir=$artifacts_dir/Bootstrap - if [ ! -e "$bootstrap_dir/fslex.dll" ]; then + if [ ! -f "$bootstrap_dir/fslex.dll" ]; then MSBuild "$repo_root/src/buildtools/buildtools.proj" \ /restore \ /v:$verbosity \ @@ -221,7 +221,7 @@ function BuildSolution { cp $artifacts_dir/bin/fslex/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir fi - if [ ! -e "$bootstrap_dir/fsc.exe" ]; then + if [ ! -f "$bootstrap_dir/fsc.exe" ]; then MSBuild "$repo_root/proto.proj" \ /restore \ /v:$verbosity \ From 7e7fbf04e9697b64dd21b7ee0e5836e5adc45d87 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 03:10:52 +0000 Subject: [PATCH 100/137] proto --- eng/build.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eng/build.sh b/eng/build.sh index c01740d0acf..d624578d485 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -13,6 +13,7 @@ usage() echo " --binaryLog Create MSBuild binary log (short: -bl)" echo "" echo "Actions:" + echo " --bootstrap Force the build of the bootstrap compiler" echo " --restore Restore projects required to build (short: -r)" echo " --build Build all projects (short: -b)" echo " --rebuild Rebuild all projects" @@ -54,6 +55,7 @@ test_core_clr=false configuration="Debug" verbosity='minimal' binary_log=false +force_bootstrap=false ci=false skip_analyzers=false prepare_machine=false @@ -88,6 +90,9 @@ while [[ $# > 0 ]]; do --binarylog|-bl) binary_log=true ;; + --bootstrap) + force_bootstrap=true + ;; --restore|-r) restore=true ;; @@ -210,6 +215,9 @@ function BuildSolution { # build bootstrap tools bootstrap_config=Proto bootstrap_dir=$artifacts_dir/Bootstrap + if [ $force_bootstrap == "true" ]; then + rm -fr $bootstrap_dir + fi if [ ! -f "$bootstrap_dir/fslex.dll" ]; then MSBuild "$repo_root/src/buildtools/buildtools.proj" \ /restore \ From 6b20514444df10a69e2deaa6a7bc7aeca4786a33 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 03:21:54 +0000 Subject: [PATCH 101/137] try revert --- FSharpTests.Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 55098121979..6c298fe4426 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -33,8 +33,8 @@ <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net46 - <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netcoreapp2.1 - <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fcs\$(Configuration)\$(_FSharpBuildTargetFramework) + <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netstandard2.0 + <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework) $(_FSharpBuildBinPath)\FSharp.Build.dll From 28cdc002d5ec49c9f92b6872a731f2d04cdcbbc5 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 03:27:50 +0000 Subject: [PATCH 102/137] proto --- FSharpTests.Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 6c298fe4426..55098121979 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -33,8 +33,8 @@ <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net46 - <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netstandard2.0 - <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework) + <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netcoreapp2.1 + <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fcs\$(Configuration)\$(_FSharpBuildTargetFramework) $(_FSharpBuildBinPath)\FSharp.Build.dll From 44472076a1b24044bec83c95f6eb9da87674bd12 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 11:41:19 +0000 Subject: [PATCH 103/137] try again --- eng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.sh b/eng/build.sh index d624578d485..2a0550e0889 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -215,7 +215,7 @@ function BuildSolution { # build bootstrap tools bootstrap_config=Proto bootstrap_dir=$artifacts_dir/Bootstrap - if [ $force_bootstrap == "true" ]; then + if [[ "$force_bootstrap" == true ]]; then rm -fr $bootstrap_dir fi if [ ! -f "$bootstrap_dir/fslex.dll" ]; then From 6563fa3c903ae68250bb77cd62c68130f4db7510 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 11:43:50 +0000 Subject: [PATCH 104/137] try again --- eng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.sh b/eng/build.sh index 2a0550e0889..a89ea576db4 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -45,7 +45,7 @@ while [[ -h "$source" ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -restore=false +restore=true build=false rebuild=false pack=false From f1056d7d1c7952fb5c8abb0d015b54f6b9001b4c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 11:54:11 +0000 Subject: [PATCH 105/137] disable node reuse --- eng/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/build.sh b/eng/build.sh index a89ea576db4..f3e5149ef91 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -209,9 +209,11 @@ function BuildSolution { if [[ "$ci" != true ]]; then quiet_restore=true fi - coreclr_target_framework=netcoreapp2.0 + # Node reuse fails because multiple different versions of FSharp.Build.dll get loaded into MSBuild nodes + node_reuse=false + # build bootstrap tools bootstrap_config=Proto bootstrap_dir=$artifacts_dir/Bootstrap From ea11aaefca210f5c9588df07b9bb5d767c413028 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 13:32:53 +0000 Subject: [PATCH 106/137] fix tests --- FSharpTests.Directory.Build.props | 2 +- eng/build.sh | 12 ++++++------ src/scripts/scriptlib.fsx | 4 ---- tests/fsharp/single-test.fs | 4 +++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 55098121979..f2e1653a83d 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -34,7 +34,7 @@ <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net46 <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netcoreapp2.1 - <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fcs\$(Configuration)\$(_FSharpBuildTargetFramework) + <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework) $(_FSharpBuildBinPath)\FSharp.Build.dll diff --git a/eng/build.sh b/eng/build.sh index f3e5149ef91..43803435b56 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -209,7 +209,7 @@ function BuildSolution { if [[ "$ci" != true ]]; then quiet_restore=true fi - coreclr_target_framework=netcoreapp2.0 + fslexyacc_target_framework=netcoreapp2.0 # Node reuse fails because multiple different versions of FSharp.Build.dll get loaded into MSBuild nodes node_reuse=false @@ -228,8 +228,8 @@ function BuildSolution { /t:Build mkdir -p "$bootstrap_dir" - cp $artifacts_dir/bin/fslex/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir - cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$coreclr_target_framework/* $bootstrap_dir + cp $artifacts_dir/bin/fslex/$bootstrap_config/$fslexyacc_target_framework/* $bootstrap_dir + cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$fslexyacc_target_framework/* $bootstrap_dir fi if [ ! -f "$bootstrap_dir/fsc.exe" ]; then MSBuild "$repo_root/proto.proj" \ @@ -265,9 +265,9 @@ InitializeDotNetCli $restore BuildSolution if [[ "$test_core_clr" == true ]]; then - TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework $coreclr_target_framework - TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework $coreclr_target_framework - TestUsingNUnit --testproject "$repo_root/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj" --targetframework $coreclr_target_framework + TestUsingNUnit --testproject "$repo_root/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj" --targetframework netcoreapp2.0 + TestUsingNUnit --testproject "$repo_root/tests/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj" --targetframework netcoreapp2.0 + TestUsingNUnit --testproject "$repo_root/tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj" --targetframework netcoreapp2.0 fi ExitWithExitCode 0 diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx index f5f9276c492..ce9ac2e3cc8 100644 --- a/src/scripts/scriptlib.fsx +++ b/src/scripts/scriptlib.fsx @@ -108,12 +108,8 @@ module Scripting = processInfo.UseShellExecute <- false processInfo.WorkingDirectory <- workDir -#if !NET46 - ignore envs // work out what to do about this -#else envs |> Map.iter (fun k v -> processInfo.EnvironmentVariables.[k] <- v) -#endif let p = new Process() p.EnableRaisingEvents <- true diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index b0a24ccb8e9..614183b319f 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -219,7 +219,8 @@ let singleTestBuildAndRunCore cfg copyFiles p = let projectBody = generateProjectArtifacts pc targetFramework cfg.BUILD_CONFIG emitFile projectFileName projectBody use testOkFile = new FileGuard(Path.Combine(directory, "test.ok")) - exec { cfg with Directory = directory } cfg.DotNetExe (sprintf "run -f %s" targetFramework) + printfn "executeFsc: cfg.DotNetExe = %s" cfg.DotNetExe + exec { cfg with Directory = directory } cfg.DotNetExe "help" // (sprintf "run -f %s" targetFramework) testOkFile.CheckExists() executeFsc compilerType targetFramework else @@ -229,6 +230,7 @@ let singleTestBuildAndRunCore cfg copyFiles p = let projectBody = generateProjectArtifacts pc targetFramework cfg.BUILD_CONFIG emitFile projectFileName projectBody use testOkFile = new FileGuard(Path.Combine(directory, "test.ok")) + printfn "executeFsi: cfg.DotNetExe = %s" cfg.DotNetExe exec { cfg with Directory = directory } cfg.DotNetExe "build /t:RunFSharpScript" testOkFile.CheckExists() executeFsi compilerType targetFramework From f4bd2211d871ce82c4ea3a6355f63d6a14da4aa8 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Fri, 29 Mar 2019 23:55:45 +0000 Subject: [PATCH 107/137] use proto on mac and linux --- .vsts-pr.yaml | 6 ++--- FSharpBuild.Directory.Build.props | 4 +-- FSharpTests.Directory.Build.props | 4 +++ eng/Build.ps1 | 2 +- eng/build-utils.ps1 | 4 --- eng/build.sh | 43 ++++++++++++++++++++++++------- fcs/Directory.Build.props | 6 +---- fcs/build.fsx | 10 ++++--- proto.proj | 2 +- src/buildtools/buildtools.proj | 13 +++++----- 10 files changed, 59 insertions(+), 35 deletions(-) diff --git a/.vsts-pr.yaml b/.vsts-pr.yaml index b7d3862888d..b0186db4e1e 100644 --- a/.vsts-pr.yaml +++ b/.vsts-pr.yaml @@ -11,7 +11,7 @@ jobs: _configuration: Release _testKind: testcoreclr steps: - - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) + - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) --verbosity normal - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: @@ -55,7 +55,7 @@ jobs: _configuration: Release _testKind: testcoreclr steps: - - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) + - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) --verbosity normal - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: @@ -108,7 +108,7 @@ jobs: _configuration: Release _testKind: testVs steps: - - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind) + - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind) -verbosity normal - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index 31d24301299..9d1161037b8 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -12,7 +12,7 @@ $(RepoRoot)src $(ArtifactsDir)\SymStore $(ArtifactsDir)\Bootstrap - $(ArtifactsDir)/fsc/Proto/netcoreapp2.1 + $(ArtifactsDir)/bin/fsc/Proto/netcoreapp2.1 4.4.0 1182;0025;$(WarningsAsErrors) @@ -80,7 +80,7 @@ - + $(ProtoOutputPath)\Microsoft.FSharp.Targets $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 6c298fe4426..d62503cea93 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -35,6 +35,10 @@ <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net46 <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netstandard2.0 <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework) + $(_FSharpBuildBinPath)\FSharp.Build.dll diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 865cf231575..e93d735e44b 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -155,10 +155,10 @@ function BuildSolution() { /p:Publish=$publish ` /p:ContinuousIntegrationBuild=$ci ` /p:OfficialBuildId=$officialBuildId ` - /p:BootstrapBuildPath=$bootstrapDir ` /p:QuietRestore=$quietRestore ` /p:QuietRestoreBinaryLog=$binaryLog ` /p:TestTargetFrameworks=$testTargetFrameworks ` + /v:$verbosity ` $suppressExtensionDeployment ` @properties } diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1 index 304eac5a3e5..26b0c0ad8ab 100644 --- a/eng/build-utils.ps1 +++ b/eng/build-utils.ps1 @@ -216,10 +216,6 @@ function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string] $args += " /p:ContinuousIntegrationBuild=true" } - if ($bootstrapDir -ne "") { - $args += " /p:BootstrapBuildPath=$bootstrapDir" - } - $args += " $buildArgs" $args += " $projectFilePath" $args += " $properties" diff --git a/eng/build.sh b/eng/build.sh index d814dcd04d4..43803435b56 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -13,6 +13,7 @@ usage() echo " --binaryLog Create MSBuild binary log (short: -bl)" echo "" echo "Actions:" + echo " --bootstrap Force the build of the bootstrap compiler" echo " --restore Restore projects required to build (short: -r)" echo " --build Build all projects (short: -b)" echo " --rebuild Rebuild all projects" @@ -44,7 +45,7 @@ while [[ -h "$source" ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -restore=false +restore=true build=false rebuild=false pack=false @@ -54,6 +55,7 @@ test_core_clr=false configuration="Debug" verbosity='minimal' binary_log=false +force_bootstrap=false ci=false skip_analyzers=false prepare_machine=false @@ -88,6 +90,9 @@ while [[ $# > 0 ]]; do --binarylog|-bl) binary_log=true ;; + --bootstrap) + force_bootstrap=true + ;; --restore|-r) restore=true ;; @@ -204,22 +209,42 @@ function BuildSolution { if [[ "$ci" != true ]]; then quiet_restore=true fi + fslexyacc_target_framework=netcoreapp2.0 + + # Node reuse fails because multiple different versions of FSharp.Build.dll get loaded into MSBuild nodes + node_reuse=false # build bootstrap tools bootstrap_config=Proto - MSBuild "$repo_root/src/buildtools/buildtools.proj" \ - /restore \ - /p:Configuration=$bootstrap_config \ - /t:Build - bootstrap_dir=$artifacts_dir/Bootstrap - mkdir -p "$bootstrap_dir" - cp $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp2.0/* $bootstrap_dir - cp $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp2.0/* $bootstrap_dir + if [[ "$force_bootstrap" == true ]]; then + rm -fr $bootstrap_dir + fi + if [ ! -f "$bootstrap_dir/fslex.dll" ]; then + MSBuild "$repo_root/src/buildtools/buildtools.proj" \ + /restore \ + /v:$verbosity \ + /p:Configuration=$bootstrap_config \ + /t:Build + + mkdir -p "$bootstrap_dir" + cp $artifacts_dir/bin/fslex/$bootstrap_config/$fslexyacc_target_framework/* $bootstrap_dir + cp $artifacts_dir/bin/fsyacc/$bootstrap_config/$fslexyacc_target_framework/* $bootstrap_dir + fi + if [ ! -f "$bootstrap_dir/fsc.exe" ]; then + MSBuild "$repo_root/proto.proj" \ + /restore \ + /v:$verbosity \ + /p:Configuration=$bootstrap_config \ + /t:Build + + cp $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.1/* $bootstrap_dir + fi # do real build MSBuild $toolset_build_proj \ $bl \ + /v:$verbosity \ /p:Configuration=$configuration \ /p:Projects="$projects" \ /p:RepoRoot="$repo_root" \ diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index 3179fe221f9..e09dc41a671 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -17,11 +17,7 @@ $(ArtifactsDir)\obj $(ArtifactsBinDir)\fcs $(ArtifactsObjDir)\fcs - true + true - - - $(ArtifactsBinDir)\FSharp.Build\Proto\net46 - diff --git a/fcs/build.fsx b/fcs/build.fsx index d1d575c4f76..d03f9664fe5 100644 --- a/fcs/build.fsx +++ b/fcs/build.fsx @@ -24,6 +24,8 @@ let isMono = false // Utilities // -------------------------------------------------------------------------------------- +let fslexyaccTargetFramework = "netcoreapp2.0" + let dotnetExePath = // Build.cmd normally downloads a dotnet cli to: \artifacts\toolset\dotnet // check if there is one there to avoid downloading an additional one here @@ -92,14 +94,14 @@ Target "BuildVersion" (fun _ -> Target "Build" (fun _ -> runDotnet __SOURCE_DIRECTORY__ "build ../src/buildtools/buildtools.proj -v n -c Proto" - let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp2.0/fslex.dll" - let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp2.0/fsyacc.dll" + let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/" + fslexyaccTargetFramework + "/fslex.dll" + let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/" + fslexyaccTargetFramework + "/fsyacc.dll" runDotnet __SOURCE_DIRECTORY__ (sprintf "build FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath) ) Target "Test" (fun _ -> - // This project file is used for the netcoreapp2.0 tests to work out reference sets - runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableCompilerRedirection=true" + // This project file is used for the tests to work out reference sets + runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableProtoCompiler=true" // Now run the tests let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.xml") diff --git a/proto.proj b/proto.proj index bbad2c34cc5..b0bff16a289 100644 --- a/proto.proj +++ b/proto.proj @@ -8,7 +8,7 @@ TargetFramework=net46 - TargetFramework=netcoreapp2.1 + TargetFramework=netstandard2.0 TargetFramework=net46 diff --git a/src/buildtools/buildtools.proj b/src/buildtools/buildtools.proj index 593f086dd07..d96cf6a8d8c 100644 --- a/src/buildtools/buildtools.proj +++ b/src/buildtools/buildtools.proj @@ -2,7 +2,8 @@ Debug - + true + @@ -10,23 +11,23 @@ - + - + - + - + - + From 8a4baf313be5834a729b26c843bdcac647e3e100 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sat, 30 Mar 2019 12:21:44 +0000 Subject: [PATCH 108/137] reduce diff --- FSharpBuild.Directory.Build.props | 2 +- fcs/Directory.Build.props | 2 +- fcs/build.fsx | 2 +- src/buildtools/buildtools.proj | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index 9d1161037b8..93b66901c80 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -80,7 +80,7 @@ - + $(ProtoOutputPath)\Microsoft.FSharp.Targets $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index e09dc41a671..99ac310b2a3 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -17,7 +17,7 @@ $(ArtifactsDir)\obj $(ArtifactsBinDir)\fcs $(ArtifactsObjDir)\fcs - true + true diff --git a/fcs/build.fsx b/fcs/build.fsx index d03f9664fe5..39fb3070e74 100644 --- a/fcs/build.fsx +++ b/fcs/build.fsx @@ -101,7 +101,7 @@ Target "Build" (fun _ -> Target "Test" (fun _ -> // This project file is used for the tests to work out reference sets - runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableProtoCompiler=true" + runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableCompilerRedirection=true" // Now run the tests let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.xml") diff --git a/src/buildtools/buildtools.proj b/src/buildtools/buildtools.proj index d96cf6a8d8c..630bb678561 100644 --- a/src/buildtools/buildtools.proj +++ b/src/buildtools/buildtools.proj @@ -2,7 +2,7 @@ Debug - true + true @@ -11,23 +11,23 @@ - + - + - + - + - + From 0474a23faf73ef71fc4ddb2313613dc480d9a3e0 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sat, 30 Mar 2019 12:24:30 +0000 Subject: [PATCH 109/137] reduce diff --- fcs/Directory.Build.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index 99ac310b2a3..3179fe221f9 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -20,4 +20,8 @@ true + + + $(ArtifactsBinDir)\FSharp.Build\Proto\net46 + From b96120e417c7131ac93fb46305a6770f5d5d2d75 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sat, 30 Mar 2019 12:25:25 +0000 Subject: [PATCH 110/137] reduce diff --- fcs/build.fsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fcs/build.fsx b/fcs/build.fsx index 39fb3070e74..dd5d3c64fc1 100644 --- a/fcs/build.fsx +++ b/fcs/build.fsx @@ -24,8 +24,6 @@ let isMono = false // Utilities // -------------------------------------------------------------------------------------- -let fslexyaccTargetFramework = "netcoreapp2.0" - let dotnetExePath = // Build.cmd normally downloads a dotnet cli to: \artifacts\toolset\dotnet // check if there is one there to avoid downloading an additional one here @@ -94,8 +92,8 @@ Target "BuildVersion" (fun _ -> Target "Build" (fun _ -> runDotnet __SOURCE_DIRECTORY__ "build ../src/buildtools/buildtools.proj -v n -c Proto" - let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/" + fslexyaccTargetFramework + "/fslex.dll" - let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/" + fslexyaccTargetFramework + "/fsyacc.dll" + let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp2.0/fslex.dll" + let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp2.0/fsyacc.dll" runDotnet __SOURCE_DIRECTORY__ (sprintf "build FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath) ) From cf9147bd2dd42febdea9e37082ff46fa34f0ed64 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sat, 30 Mar 2019 12:26:18 +0000 Subject: [PATCH 111/137] reduce diff --- FSharpTests.Directory.Build.props | 4 ---- 1 file changed, 4 deletions(-) diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index d62503cea93..6c298fe4426 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -35,10 +35,6 @@ <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net46 <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netstandard2.0 <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework) - $(_FSharpBuildBinPath)\FSharp.Build.dll From 286c336d7b0fe6e783edd42c2d02ac99cae083d9 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sat, 30 Mar 2019 12:26:48 +0000 Subject: [PATCH 112/137] reduce diff --- fcs/build.fsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fcs/build.fsx b/fcs/build.fsx index dd5d3c64fc1..d1d575c4f76 100644 --- a/fcs/build.fsx +++ b/fcs/build.fsx @@ -98,7 +98,7 @@ Target "Build" (fun _ -> ) Target "Test" (fun _ -> - // This project file is used for the tests to work out reference sets + // This project file is used for the netcoreapp2.0 tests to work out reference sets runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableCompilerRedirection=true" // Now run the tests From 7a6448eda01bfe982c942b707c1110ac4a767d20 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sat, 30 Mar 2019 13:00:00 +0000 Subject: [PATCH 113/137] reduce diff --- FSharpBuild.Directory.Build.props | 2 +- eng/Build.ps1 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index 93b66901c80..1d456ec2d72 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -80,7 +80,7 @@ - + $(ProtoOutputPath)\Microsoft.FSharp.Targets $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets diff --git a/eng/Build.ps1 b/eng/Build.ps1 index e93d735e44b..0acdb67cdb7 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -99,6 +99,7 @@ function Process-Arguments() { Print-Usage exit 0 } + $script:nodeReuse = $False; if ($testAll) { $script:testDesktop = $True From b3e1c32eda499a65fab948465094f3b851fc4add Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 31 Mar 2019 14:52:43 +0100 Subject: [PATCH 114/137] fix merge --- FSharpBuild.Directory.Build.props | 2 +- FSharpTests.Directory.Build.props | 4 ++-- fcs/Directory.Build.props | 6 +++++- .../FSharp.Compiler.Service.fsproj | 1 - fcs/build.fsx | 10 ++++------ 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index 9d1161037b8..1d456ec2d72 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -80,7 +80,7 @@ - + $(ProtoOutputPath)\Microsoft.FSharp.Targets $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index f2e1653a83d..6c298fe4426 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -33,8 +33,8 @@ <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net46 - <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netcoreapp2.1 - <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework) + <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netstandard2.0 + <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework) $(_FSharpBuildBinPath)\FSharp.Build.dll diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index e09dc41a671..3179fe221f9 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -17,7 +17,11 @@ $(ArtifactsDir)\obj $(ArtifactsBinDir)\fcs $(ArtifactsObjDir)\fcs - true + true + + + $(ArtifactsBinDir)\FSharp.Build\Proto\net46 + diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 0d80dcd4cfc..9471d212939 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -16,7 +16,6 @@ $(TargetFramework)\ $(OtherFlags) /warnon:1182 $(OtherFlags) --times - $(NoWarn);44;62;69;65;54;61;75;62;9;2003;2015 $(NoWarn);44;62;69;65;54;61;75;62;9;2003;NU5125 true true diff --git a/fcs/build.fsx b/fcs/build.fsx index d03f9664fe5..d1d575c4f76 100644 --- a/fcs/build.fsx +++ b/fcs/build.fsx @@ -24,8 +24,6 @@ let isMono = false // Utilities // -------------------------------------------------------------------------------------- -let fslexyaccTargetFramework = "netcoreapp2.0" - let dotnetExePath = // Build.cmd normally downloads a dotnet cli to: \artifacts\toolset\dotnet // check if there is one there to avoid downloading an additional one here @@ -94,14 +92,14 @@ Target "BuildVersion" (fun _ -> Target "Build" (fun _ -> runDotnet __SOURCE_DIRECTORY__ "build ../src/buildtools/buildtools.proj -v n -c Proto" - let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/" + fslexyaccTargetFramework + "/fslex.dll" - let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/" + fslexyaccTargetFramework + "/fsyacc.dll" + let fslexPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fslex/Proto/netcoreapp2.0/fslex.dll" + let fsyaccPath = __SOURCE_DIRECTORY__ + "/../artifacts/bin/fsyacc/Proto/netcoreapp2.0/fsyacc.dll" runDotnet __SOURCE_DIRECTORY__ (sprintf "build FSharp.Compiler.Service.sln -v n -c Release /p:FsLexPath=%s /p:FsYaccPath=%s" fslexPath fsyaccPath) ) Target "Test" (fun _ -> - // This project file is used for the tests to work out reference sets - runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableProtoCompiler=true" + // This project file is used for the netcoreapp2.0 tests to work out reference sets + runDotnet __SOURCE_DIRECTORY__ "build ../tests/projects/Sample_NETCoreSDK_FSharp_Library_netstandard2_0/Sample_NETCoreSDK_FSharp_Library_netstandard2_0.fsproj -v n /restore /p:DisableCompilerRedirection=true" // Now run the tests let logFilePath = Path.Combine(__SOURCE_DIRECTORY__, "..", "artifacts", "TestResults", "Release", "FSharp.Compiler.Service.Test.xml") From 0bdc46b151ff9b44aed57bd5760d13a6c777ee8b Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 2 Apr 2019 00:00:12 +0100 Subject: [PATCH 115/137] merge master --- src/fsharp/CompileOps.fs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 7e75b942755..4936b44ec76 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -3683,14 +3683,9 @@ let WriteSignatureData (tcConfig: TcConfig, tcGlobals, exportRemapping, ccu: Ccu let mspec = ApplyExportRemappingToEntity tcGlobals exportRemapping mspec // For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers // don't complain when they see the resource. -<<<<<<< HEAD let rname = if ccu.AssemblyName = GetFSharpCoreLibraryName() then FSharpSignatureDataResourceName2 else FSharpSignatureDataResourceName let rnameB = FSharpSignatureDataResourceNameB PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) (rnameB+ccu.AssemblyName) pickleCcuInfo -======= - let rname = if ccu.AssemblyName = getFSharpCoreLibraryName then FSharpSignatureDataResourceName2 else FSharpSignatureDataResourceName - PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) pickleCcuInfo ->>>>>>> 92ffe0ce2611a17134a8cef57df99bf9f81a7a6f { mspec=mspec compileTimeWorkingDir=tcConfig.implicitIncludeDir usesQuotations = ccu.UsesFSharp20PlusQuotations } @@ -3701,14 +3696,9 @@ let GetOptimizationData (file, ilScopeRef, ilModule, byteReader, byteReaderB) = let WriteOptimizationData (tcGlobals, file, inMem, ccu: CcuThunk, modulInfo) = // For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers // don't complain when they see the resource. -<<<<<<< HEAD let rname = if ccu.AssemblyName = GetFSharpCoreLibraryName() then FSharpOptimizationDataResourceName2 else FSharpOptimizationDataResourceName let rnameB = FSharpOptimizationDataResourceNameB PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) (rnameB+ccu.AssemblyName) Optimizer.p_CcuOptimizationInfo modulInfo -======= - let rname = if ccu.AssemblyName = getFSharpCoreLibraryName then FSharpOptimizationDataResourceName2 else FSharpOptimizationDataResourceName - PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) Optimizer.p_CcuOptimizationInfo modulInfo ->>>>>>> 92ffe0ce2611a17134a8cef57df99bf9f81a7a6f //---------------------------------------------------------------------------- // Abstraction for project reference From 0fd27da08d6d54770844a3b47cc3ef25c4ea359c Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 2 Apr 2019 00:03:44 +0100 Subject: [PATCH 116/137] fix merge --- src/fsharp/CompileOps.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 4936b44ec76..864a32adf18 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -3683,7 +3683,7 @@ let WriteSignatureData (tcConfig: TcConfig, tcGlobals, exportRemapping, ccu: Ccu let mspec = ApplyExportRemappingToEntity tcGlobals exportRemapping mspec // For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers // don't complain when they see the resource. - let rname = if ccu.AssemblyName = GetFSharpCoreLibraryName() then FSharpSignatureDataResourceName2 else FSharpSignatureDataResourceName + let rname = if ccu.AssemblyName = getFSharpCoreLibraryName then FSharpSignatureDataResourceName2 else FSharpSignatureDataResourceName let rnameB = FSharpSignatureDataResourceNameB PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) (rnameB+ccu.AssemblyName) pickleCcuInfo { mspec=mspec @@ -3696,7 +3696,7 @@ let GetOptimizationData (file, ilScopeRef, ilModule, byteReader, byteReaderB) = let WriteOptimizationData (tcGlobals, file, inMem, ccu: CcuThunk, modulInfo) = // For historical reasons, we use a different resource name for FSharp.Core, so older F# compilers // don't complain when they see the resource. - let rname = if ccu.AssemblyName = GetFSharpCoreLibraryName() then FSharpOptimizationDataResourceName2 else FSharpOptimizationDataResourceName + let rname = if ccu.AssemblyName = getFSharpCoreLibraryName then FSharpOptimizationDataResourceName2 else FSharpOptimizationDataResourceName let rnameB = FSharpOptimizationDataResourceNameB PickleToResource inMem file tcGlobals ccu (rname+ccu.AssemblyName) (rnameB+ccu.AssemblyName) Optimizer.p_CcuOptimizationInfo modulInfo From 8d5ce1d4efae084aaa666da4509f76e29d41e926 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 15:13:17 +0100 Subject: [PATCH 117/137] fix dangling net46 references --- fcs/Directory.Build.props | 2 +- tests/service/AssemblyContentProviderTests.fs | 4 ++-- tests/service/AssemblyReaderShim.fs | 4 ++-- tests/service/CSharpProjectAnalysis.fs | 4 ++-- tests/service/EditorTests.fs | 4 ++-- tests/service/ExprTests.fs | 6 +++--- tests/service/FileSystemTests.fs | 4 ++-- tests/service/FscTests.fs | 4 ++-- tests/service/FsiTests.fs | 4 ++-- tests/service/InteractiveCheckerTests.fs | 4 ++-- tests/service/MultiProjectAnalysisTests.fs | 4 ++-- tests/service/PerfTests.fs | 4 ++-- tests/service/ProjectAnalysisTests.fs | 4 ++-- tests/service/ProjectOptionsTests.fs | 6 +++--- tests/service/ServiceUntypedParseTests.fs | 4 ++-- tests/service/StructureTests.fs | 4 ++-- tests/service/Symbols.fs | 4 ++-- tests/service/TokenizerTests.fs | 4 ++-- 18 files changed, 37 insertions(+), 37 deletions(-) diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index 3179fe221f9..70903956e4e 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -22,6 +22,6 @@ - $(ArtifactsBinDir)\FSharp.Build\Proto\net46 + $(ArtifactsBinDir)\FSharp.Build\Proto\net472 diff --git a/tests/service/AssemblyContentProviderTests.fs b/tests/service/AssemblyContentProviderTests.fs index 0c0d7579077..1a940aaf4c4 100644 --- a/tests/service/AssemblyContentProviderTests.fs +++ b/tests/service/AssemblyContentProviderTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/AssemblyReaderShim.fs b/tests/service/AssemblyReaderShim.fs index e3512178f02..329fce81989 100644 --- a/tests/service/AssemblyReaderShim.fs +++ b/tests/service/AssemblyReaderShim.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/CSharpProjectAnalysis.fs b/tests/service/CSharpProjectAnalysis.fs index 0493f593485..bac536c294b 100644 --- a/tests/service/CSharpProjectAnalysis.fs +++ b/tests/service/CSharpProjectAnalysis.fs @@ -1,8 +1,8 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive #r "../../bin/v4.5/CSharp_Analysis.dll" -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/EditorTests.fs b/tests/service/EditorTests.fs index 949040441f7..63406f09cb4 100644 --- a/tests/service/EditorTests.fs +++ b/tests/service/EditorTests.fs @@ -19,8 +19,8 @@ // Use F# Interactive. This only works for FSHarp.Compiler.Service.dll which has a public API #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/ExprTests.fs b/tests/service/ExprTests.fs index 84cf6d4306d..a13b29fa960 100644 --- a/tests/service/ExprTests.fs +++ b/tests/service/ExprTests.fs @@ -1,8 +1,8 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.ProjectCracker.dll" -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.ProjectCracker.dll" +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/FileSystemTests.fs b/tests/service/FileSystemTests.fs index 6011d8d4c8c..947d83a879d 100644 --- a/tests/service/FileSystemTests.fs +++ b/tests/service/FileSystemTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/FscTests.fs b/tests/service/FscTests.fs index 6d8cafc9105..9bedfd38b1b 100644 --- a/tests/service/FscTests.fs +++ b/tests/service/FscTests.fs @@ -1,7 +1,7 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/FsiTests.fs b/tests/service/FsiTests.fs index 279e031dce2..54f7829f6aa 100644 --- a/tests/service/FsiTests.fs +++ b/tests/service/FsiTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/InteractiveCheckerTests.fs b/tests/service/InteractiveCheckerTests.fs index 9f390d42571..ea892fc1b5e 100644 --- a/tests/service/InteractiveCheckerTests.fs +++ b/tests/service/InteractiveCheckerTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/MultiProjectAnalysisTests.fs b/tests/service/MultiProjectAnalysisTests.fs index 51c06808eb1..45608256535 100644 --- a/tests/service/MultiProjectAnalysisTests.fs +++ b/tests/service/MultiProjectAnalysisTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/PerfTests.fs b/tests/service/PerfTests.fs index 7e97f923985..c5f2afbc7af 100644 --- a/tests/service/PerfTests.fs +++ b/tests/service/PerfTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/ProjectAnalysisTests.fs b/tests/service/ProjectAnalysisTests.fs index 37bef3c9c26..517c542aa02 100644 --- a/tests/service/ProjectAnalysisTests.fs +++ b/tests/service/ProjectAnalysisTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/ProjectOptionsTests.fs b/tests/service/ProjectOptionsTests.fs index 141c33be92e..de7aed16756 100644 --- a/tests/service/ProjectOptionsTests.fs +++ b/tests/service/ProjectOptionsTests.fs @@ -1,7 +1,7 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.ProjectCracker.dll" -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.ProjectCracker.dll" +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/ServiceUntypedParseTests.fs b/tests/service/ServiceUntypedParseTests.fs index bfe20d54ecc..24c55cee890 100644 --- a/tests/service/ServiceUntypedParseTests.fs +++ b/tests/service/ServiceUntypedParseTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/StructureTests.fs b/tests/service/StructureTests.fs index 1c710643e3c..e3f7b7fe9b2 100644 --- a/tests/service/StructureTests.fs +++ b/tests/service/StructureTests.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/Symbols.fs b/tests/service/Symbols.fs index b01c13d7090..b0932e9075d 100644 --- a/tests/service/Symbols.fs +++ b/tests/service/Symbols.fs @@ -1,6 +1,6 @@ #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else diff --git a/tests/service/TokenizerTests.fs b/tests/service/TokenizerTests.fs index 74348b3d471..c03fbce9370 100644 --- a/tests/service/TokenizerTests.fs +++ b/tests/service/TokenizerTests.fs @@ -1,7 +1,7 @@  #if INTERACTIVE -#r "../../artifacts/bin/fcs/net46/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive -#r "../../artifacts/bin/fcs/net46/nunit.framework.dll" +#r "../../artifacts/bin/fcs/net461/FSharp.Compiler.Service.dll" // note, build FSharp.Compiler.Service.Tests.fsproj to generate this, this DLL has a public API so can be used from F# Interactive +#r "../../artifacts/bin/fcs/net461/nunit.framework.dll" #load "FsUnit.fs" #load "Common.fs" #else From 13339b330405d7286fe79db50f1cb8aa3aa982b4 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 15:32:49 +0100 Subject: [PATCH 118/137] fix build --- .../FSharp.Compiler.Server.Shared.fsproj | 6 +----- .../src/FSharp.Editor/Completion/CompletionProvider.fs | 2 +- .../LanguageService/LegacyProjectWorkspaceMap.fs | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 8db231daa12..417f4456918 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -3,15 +3,11 @@ - net46 - FSharp.Compiler.Server.Shared - v4.6 - $(OtherFlags) --checknulls - true true net472 FSharp.Compiler.Server.Shared true + $(OtherFlags) --checknulls diff --git a/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs b/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs index 4b80da57009..a0daa928249 100644 --- a/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs +++ b/vsintegration/src/FSharp.Editor/Completion/CompletionProvider.fs @@ -156,7 +156,7 @@ type internal FSharpCompletionProvider | _, idents -> Array.last idents let completionItem = - CommonCompletionItem.Create(name, null, glyph = Nullable glyph, rules = getRules intellisenseOptions.ShowAfterCharIsTyped, filterText = filterText) + CommonCompletionItem.Create(name, displayTextSuffix = null, glyph = Nullable glyph, rules = getRules intellisenseOptions.ShowAfterCharIsTyped, filterText = filterText) .AddProperty(FullNamePropName, declarationItem.FullName) let completionItem = diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LegacyProjectWorkspaceMap.fs b/vsintegration/src/FSharp.Editor/LanguageService/LegacyProjectWorkspaceMap.fs index 0bf2e5c8063..cc20b56ba83 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LegacyProjectWorkspaceMap.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/LegacyProjectWorkspaceMap.fs @@ -113,7 +113,7 @@ type internal LegacyProjectWorkspaceMap(solution: IVsSolution, // Roslyn is expecting site to be an IVsHierarchy. // It just so happens that the object that implements IProvideProjectSite is also // an IVsHierarchy. This assertion is to ensure that the assumption holds true. - Debug.Assert(not (isNull hierarchy), "About to CreateProjectContext with a non-hierarchy site") + Debug.Assert(not (isNull (box hierarchy)), "About to CreateProjectContext with a non-hierarchy site") let projectContext = projectContextFactory.CreateProjectContext( From 366ed83dc631ef0d758479d927b0f2d03a98d071 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 17:11:41 +0100 Subject: [PATCH 119/137] do not try to build latest FSHarp.Core as part of proto build --- FSharpBuild.Directory.Build.props | 1 + src/fsharp/FSharp.Build/FSharp.Build.fsproj | 4 +++- .../FSharp.Compiler.Interactive.Settings.fsproj | 4 +++- .../FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj | 4 +++- .../FSharp.Compiler.Server.Shared.fsproj | 4 +++- src/fsharp/fsc/fsc.fsproj | 6 +++--- src/fsharp/fsi/fsi.fsproj | 4 +++- src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj | 4 +++- 8 files changed, 22 insertions(+), 9 deletions(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index a1ba7ab156d..95036cb5ae1 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -92,6 +92,7 @@ fs false true + 4.6.2 diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 0dad55058b0..7bab41796bd 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -33,7 +33,9 @@ - + + + diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index 6307f17baf3..799fda75246 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -28,7 +28,9 @@ - + + + diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index 9fef6d27589..bed8c55e91e 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -675,7 +675,9 @@ - + + + diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 75a7353bb96..39ba868aeee 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -21,7 +21,9 @@ - + + + diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj index 8ddb082c56a..4b812970716 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index a7bafddfded..43e95426220 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -26,7 +26,9 @@ - + + + diff --git a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj index dbe31f6ec2a..fd6c5b7ef3e 100644 --- a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj +++ b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj @@ -26,7 +26,9 @@ - + + + From 6fae5c43b23e072e2dbe75afe631a035d7256733 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 17:13:05 +0100 Subject: [PATCH 120/137] do not try to build latest FSHarp.Core as part of proto build --- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index 440850ed55c..b3ed7590476 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -232,7 +232,7 @@ - + From 6a27e0274adf747e32816ad8f6ec9143c8d4568b Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 17:45:33 +0100 Subject: [PATCH 121/137] do not try to build latest FSHarp.Core as part of proto build --- eng/build-utils.ps1 | 2 +- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 2 +- .../FSharp.Compiler.Interactive.Settings.fsproj | 2 +- .../FSharp.Compiler.Private.fsproj | 2 +- .../FSharp.Compiler.Server.Shared.fsproj | 2 +- src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.csproj | 2 +- src/fsharp/fsc/fsc.fsproj | 7 ++++++- src/fsharp/fsi/fsi.fsproj | 11 +++++++---- src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj | 11 +++++++---- 9 files changed, 26 insertions(+), 15 deletions(-) diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1 index d1e5dd85d55..a1e16a5f7ec 100644 --- a/eng/build-utils.ps1 +++ b/eng/build-utils.ps1 @@ -249,7 +249,7 @@ function Make-BootstrapBuild() { $projectPath = "$RepoRoot\proto.proj" Run-MSBuild $projectPath "/restore /t:Build" -logFileName "Bootstrap" -configuration $bootstrapConfiguration Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir - Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir + Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir -Force return $dir } diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 7bab41796bd..38a1ffa90bc 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -33,7 +33,7 @@ - + diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index 799fda75246..51c4017d67d 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -28,7 +28,7 @@ - + diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index bed8c55e91e..f7d8f20440a 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -675,7 +675,7 @@ - + diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 39ba868aeee..faab0f8cc3b 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -21,7 +21,7 @@ - + diff --git a/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.csproj b/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.csproj index fd2d5162c75..e304369556b 100644 --- a/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.csproj +++ b/src/fsharp/FSharp.Core.nuget/FSharp.Core.nuget.csproj @@ -10,7 +10,7 @@ - + false diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj index 4b812970716..8ea9e6d8b07 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -29,11 +29,16 @@ - + + + + + + diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index 43e95426220..d088ca69384 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -26,14 +26,17 @@ - + - - + + + + + - + diff --git a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj index fd6c5b7ef3e..96117f719f4 100644 --- a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj +++ b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj @@ -26,12 +26,15 @@ - + - - - + + + + + + From c6eb1055f1a882f705d1d5f190961a3c50689cd7 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 18:06:59 +0100 Subject: [PATCH 122/137] revert breaking change and fix build --- src/fsharp/FSharp.Core/prim-types.fs | 4 ++-- src/fsharp/FSharp.Core/prim-types.fsi | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index f116f39102a..24bba8e54fb 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -3379,8 +3379,8 @@ namespace Microsoft.FSharp.Core | _ -> None [] - let inline isNull (value : 'T when 'T : not struct and 'T : null) = - match value with + let inline isNull (value : 'T when 'T : null) = + match box value with | null -> true | _ -> false diff --git a/src/fsharp/FSharp.Core/prim-types.fsi b/src/fsharp/FSharp.Core/prim-types.fsi index 8b1edf2a46e..d1736607a65 100644 --- a/src/fsharp/FSharp.Core/prim-types.fsi +++ b/src/fsharp/FSharp.Core/prim-types.fsi @@ -2280,8 +2280,7 @@ namespace Microsoft.FSharp.Core /// The value to check. /// True when value is null, false otherwise. [] - // TODO NULLNESS: assess this change - is it a breaking change? - val inline isNull : value: 'T -> bool when 'T : not struct and 'T : null + val inline isNull : value: 'T -> bool when 'T : null #if !BUILDING_WITH_LKG && !BUILD_FROM_SOURCE /// Determines whether the given value is null. From aed6752ecc08695a95f50ef87286ae0f27d01a41 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 18:15:55 +0100 Subject: [PATCH 123/137] fix build --- .vsts-pr.yaml | 4 ++-- eng/build.sh | 3 ++- proto.proj | 2 +- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.vsts-pr.yaml b/.vsts-pr.yaml index d33bdae439e..57446ed1e85 100644 --- a/.vsts-pr.yaml +++ b/.vsts-pr.yaml @@ -11,7 +11,7 @@ jobs: _configuration: Release _testKind: testcoreclr steps: - - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) --verbosity normal + - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: @@ -55,7 +55,7 @@ jobs: _configuration: Release _testKind: testcoreclr steps: - - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) --verbosity normal + - script: ./eng/cibuild.sh --configuration $(_configuration) --$(_testKind) - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: diff --git a/eng/build.sh b/eng/build.sh index b874fb842d6..ea44f9e9237 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -15,6 +15,7 @@ usage() echo "Actions:" echo " --bootstrap Force the build of the bootstrap compiler" echo " --restore Restore projects required to build (short: -r)" + echo " --norestore Don't restore projects required to build (short: -r)" echo " --build Build all projects (short: -b)" echo " --rebuild Rebuild all projects" echo " --pack Build nuget packages" @@ -45,7 +46,7 @@ while [[ -h "$source" ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -restore=true +restore=false build=false rebuild=false pack=false diff --git a/proto.proj b/proto.proj index e6f7a4f8cc0..84103f6fdf8 100644 --- a/proto.proj +++ b/proto.proj @@ -8,7 +8,7 @@ TargetFramework=net472 - TargetFramework=netstandard2.0 + TargetFramework=netcoreapp2.1 TargetFramework=net472 diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index f5f297bda75..0dad55058b0 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -4,8 +4,8 @@ Library - net472;netstandard2.0 - netstandard2.0 + net472;netcoreapp2.1 + netcoreapp2.1 FSharp.Build $(NoWarn);45;55;62;75;1204 true From bb78e5f53dbbf6addf82829cfad9f5614b36fb06 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 18:18:27 +0100 Subject: [PATCH 124/137] fix build --- .vsts-pr.yaml | 2 +- eng/Build.ps1 | 1 + eng/build.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.vsts-pr.yaml b/.vsts-pr.yaml index 57446ed1e85..eeebe57d085 100644 --- a/.vsts-pr.yaml +++ b/.vsts-pr.yaml @@ -108,7 +108,7 @@ jobs: _configuration: Release _testKind: testVs steps: - - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind) -verbosity normal + - script: eng\CIBuild.cmd -configuration $(_configuration) -$(_testKind) - task: PublishBuildArtifacts@1 displayName: Publish Build Logs inputs: diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 352fd9e0583..993adc1d1e9 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -65,6 +65,7 @@ function Print-Usage() { Write-Host "" Write-Host "Actions:" Write-Host " -restore Restore packages (short: -r)" + Write-Host " -norestore Don't restore packages" Write-Host " -build Build main solution (short: -b)" Write-Host " -rebuild Rebuild main solution" Write-Host " -pack Build NuGet packages, VS insertion manifests and installer" diff --git a/eng/build.sh b/eng/build.sh index ea44f9e9237..6b0ddf324b3 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -15,7 +15,7 @@ usage() echo "Actions:" echo " --bootstrap Force the build of the bootstrap compiler" echo " --restore Restore projects required to build (short: -r)" - echo " --norestore Don't restore projects required to build (short: -r)" + echo " --norestore Don't restore projects required to build" echo " --build Build all projects (short: -b)" echo " --rebuild Rebuild all projects" echo " --pack Build nuget packages" From 9ad30ad24165f542644ec26ccd689bef6208471d Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 19:53:54 +0100 Subject: [PATCH 125/137] fix tests --- tests/fsharp/single-test.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index 96ac8a432a4..d23a2f4f448 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -223,7 +223,7 @@ let singleTestBuildAndRunCore cfg copyFiles p = emitFile projectFileName projectBody use testOkFile = new FileGuard(Path.Combine(directory, "test.ok")) printfn "executeFsc: cfg.DotNetExe = %s" cfg.DotNetExe - exec { cfg with Directory = directory } cfg.DotNetExe "help" // (sprintf "run -f %s" targetFramework) + exec { cfg with Directory = directory } cfg.DotNetExe "run" // (sprintf "run -f %s" targetFramework) testOkFile.CheckExists() executeFsc compilerType targetFramework else From 7097f021f193f555d69ef14a15c2ebc442fa2525 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 19:55:43 +0100 Subject: [PATCH 126/137] fix tests --- tests/fsharp/single-test.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index d23a2f4f448..5b956dc39b3 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -223,7 +223,7 @@ let singleTestBuildAndRunCore cfg copyFiles p = emitFile projectFileName projectBody use testOkFile = new FileGuard(Path.Combine(directory, "test.ok")) printfn "executeFsc: cfg.DotNetExe = %s" cfg.DotNetExe - exec { cfg with Directory = directory } cfg.DotNetExe "run" // (sprintf "run -f %s" targetFramework) + exec { cfg with Directory = directory } cfg.DotNetExe (sprintf "run -f %s" targetFramework) testOkFile.CheckExists() executeFsc compilerType targetFramework else From 4b80057eb5ca16ac1857f5e45109ac04fc96806e Mon Sep 17 00:00:00 2001 From: Don Syme Date: Sun, 14 Apr 2019 21:29:14 +0100 Subject: [PATCH 127/137] fix build --- fcs/FSharp.Compiler.Service/AssemblyInfo.fs | 7 ------- fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/fcs/FSharp.Compiler.Service/AssemblyInfo.fs b/fcs/FSharp.Compiler.Service/AssemblyInfo.fs index 90521fefd5a..20b5b909304 100644 --- a/fcs/FSharp.Compiler.Service/AssemblyInfo.fs +++ b/fcs/FSharp.Compiler.Service/AssemblyInfo.fs @@ -52,11 +52,4 @@ open System.Runtime.InteropServices [] [] -// Until dotnet sdk can version assemblies, use this -#if BUILD_FROM_SOURCE -[] -[] -[] -#endif - do() \ No newline at end of file diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 76626589d10..c50ebc22fe6 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -43,7 +43,7 @@ $(DefineConstants);FX_RESHAPED_REFEMIT - + AssemblyInfo/AssemblyInfo.fs From 1b8e5dd367d40b38588ba8100563030bd5e117a3 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 15 Apr 2019 12:49:14 +0100 Subject: [PATCH 128/137] reduce diff --- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 1 - .../FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj | 3 --- src/fsharp/FSharp.Core/FSharp.Core.fsproj | 3 --- vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj | 2 -- 4 files changed, 9 deletions(-) diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 194228843a0..47f627a73bf 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -9,7 +9,6 @@ FSharp.Build $(NoWarn);45;55;62;75;1204 true - {702A7979-BCF9-4C41-853E-3ADFC9897890} $(OtherFlags) --checknulls $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 true diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index 9c6b0f93d83..1d25a1ae024 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -9,9 +9,6 @@ FSharp.Compiler.Private $(NoWarn);45;55;62;75;1204 true - 0x06800000 - $(OtherFlags) /warnon:1182 - $(OtherFlags) --maxerrors:10000 $(OtherFlags) --checknulls $(DefineConstants);COMPILER $(DefineConstants);MSBUILD_AT_LEAST_15 diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj index 792c1ce02a1..7743ea13b34 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj +++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj @@ -8,10 +8,7 @@ netstandard1.6 $(NoWarn);45;55;62;75;1204 true - $(OtherFlags) --warnon:1182 --compiling-fslib --extraoptimizationloops:1 $(OtherFlags) --warnon:3218 - $(OtherFlags) --maxerrors:20 - $(OtherFlags) --warnon:1182 --compiling-fslib --maxerrors:20 --extraoptimizationloops:1 $(OtherFlags) --compiling-fslib-40 $(DefineConstants);FSHARP_CORE diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index d1273c1c9bd..d82e204e449 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -11,8 +11,6 @@ $(SystemValueTuplePackageVersion) $(OtherFlags) --warnon:1182 --subsystemversion:6.00 $(OtherFlags) /checknulls - true - true false From 1aa6a410178ba7f250372dfe170a1958b886ee27 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 15 Apr 2019 22:34:31 +0100 Subject: [PATCH 129/137] load right FSHarp.Build --- FSharpTests.Directory.Build.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 7c00805dda5..8a7a832a43e 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -32,9 +32,9 @@ - <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net472 - <_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netcoreapp2.1 - <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework) + <_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472 + <_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">netcoreapp2.1 + <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework) $(_FSharpBuildBinPath)\FSharp.Build.dll From 058bdc9a5a5ab6d9906c80618ae6486dc739434a Mon Sep 17 00:00:00 2001 From: Don Syme Date: Mon, 15 Apr 2019 23:01:00 +0100 Subject: [PATCH 130/137] publish proto apps --- FSharpBuild.Directory.Build.props | 11 +++++------ FSharpTests.Directory.Build.props | 10 +++++----- eng/Build.ps1 | 2 +- eng/build-utils.ps1 | 12 ++++++------ eng/build.sh | 10 +++++----- fcs/Directory.Build.props | 5 ----- proto.proj | 4 ++++ src/buildtools/buildtools.targets | 4 ++-- 8 files changed, 28 insertions(+), 30 deletions(-) diff --git a/FSharpBuild.Directory.Build.props b/FSharpBuild.Directory.Build.props index 905ea66544f..515de9bbdc7 100644 --- a/FSharpBuild.Directory.Build.props +++ b/FSharpBuild.Directory.Build.props @@ -11,8 +11,7 @@ $(RepoRoot)src $(ArtifactsDir)\SymStore - $(ArtifactsDir)\Bootstrap - $(ArtifactsDir)/bin/fsc/Proto/netcoreapp2.1 + $(ArtifactsDir)\Bootstrap 4.4.0 1182;0025;$(WarningsAsErrors) @@ -96,10 +95,10 @@ - $(ProtoOutputPath)\Microsoft.FSharp.Targets - $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props - $(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets - $(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets + $(ProtoOutputPath)\fsc\Microsoft.FSharp.Targets + $(ProtoOutputPath)\fsc\Microsoft.FSharp.NetSdk.props + $(ProtoOutputPath)\fsc\Microsoft.FSharp.NetSdk.targets + $(ProtoOutputPath)\fsc\Microsoft.FSharp.Overrides.NetSdk.targets diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 8a7a832a43e..9ad765f036d 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -7,11 +7,11 @@ true - $(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net472 + $(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net472\publish fsc.exe - $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net472 + $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net472\publish fsi.exe @@ -22,19 +22,19 @@ $([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)')) dotnet.exe dotnet - $(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp2.1\fsc.exe + $(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp2.1\publish\fsc.exe $([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)')) dotnet.exe dotnet - $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp2.1\fsi.exe + $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp2.1\publish\fsi.exe <_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472 <_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">netcoreapp2.1 - <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework) + <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)\publish $(_FSharpBuildBinPath)\FSharp.Build.dll diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 993adc1d1e9..30ef852db76 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -196,7 +196,7 @@ function UpdatePath() { } function VerifyAssemblyVersions() { - $fsiPath = Join-Path $ArtifactsDir "bin\fsi\Proto\net472\fsi.exe" + $fsiPath = Join-Path $ArtifactsDir "bin\fsi\Proto\net472\publish\fsi.exe" # Only verify versions on CI or official build if ($ci -or $official) { diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1 index 9c626f7c8f3..c16e31ebfc2 100644 --- a/eng/build-utils.ps1 +++ b/eng/build-utils.ps1 @@ -237,15 +237,15 @@ function Make-BootstrapBuild() { Create-Directory $dir # prepare FsLex and Fsyacc - Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Build" -logFileName "BuildTools" -configuration $bootstrapConfiguration - Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.1\*" -Destination $dir - Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.1\*" -Destination $dir + Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Publish" -logFileName "BuildTools" -configuration $bootstrapConfiguration + Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\fslex" -Force -Recurse + Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\fsyacc" -Force -Recurse # prepare compiler $projectPath = "$RepoRoot\proto.proj" - Run-MSBuild $projectPath "/restore /t:Build" -logFileName "Bootstrap" -configuration $bootstrapConfiguration - Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir - Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\*" -Destination $dir + Run-MSBuild $projectPath "/restore /t:Publish" -logFileName "Bootstrap" -configuration $bootstrapConfiguration + Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsc" -Force -Recurse + Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsi" -Force -Recurse return $dir } diff --git a/eng/build.sh b/eng/build.sh index 6b0ddf324b3..8a236373f37 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -225,20 +225,20 @@ function BuildSolution { /restore \ /v:$verbosity \ /p:Configuration=$bootstrap_config \ - /t:Build + /t:Publish mkdir -p "$bootstrap_dir" - cp $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp2.1/* $bootstrap_dir - cp $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp2.1/* $bootstrap_dir + cp -pr $artifacts_dir/bin/fslex/$bootstrap_config/netcoreapp2.1/publish $bootstrap_dir/fslex + cp -pr $artifacts_dir/bin/fsyacc/$bootstrap_config/netcoreapp2.1/publish $bootstrap_dir/fsyacc fi if [ ! -f "$bootstrap_dir/fsc.exe" ]; then MSBuild "$repo_root/proto.proj" \ /restore \ /v:$verbosity \ /p:Configuration=$bootstrap_config \ - /t:Build + /t:Publish - cp $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.1/* $bootstrap_dir + cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.1/publish $bootstrap_dir/fsc fi # do real build diff --git a/fcs/Directory.Build.props b/fcs/Directory.Build.props index 596b06c0716..4c8aac0a5b6 100644 --- a/fcs/Directory.Build.props +++ b/fcs/Directory.Build.props @@ -20,9 +20,4 @@ $(ArtifactsObjDir)\fcs true - - - - $(ArtifactsBinDir)\FSharp.Build\Proto\net472 - diff --git a/proto.proj b/proto.proj index 84103f6fdf8..b0ee288977f 100644 --- a/proto.proj +++ b/proto.proj @@ -28,6 +28,10 @@ + + + + diff --git a/src/buildtools/buildtools.targets b/src/buildtools/buildtools.targets index 303ab00825d..185fd4d0599 100644 --- a/src/buildtools/buildtools.targets +++ b/src/buildtools/buildtools.targets @@ -20,7 +20,7 @@ BeforeTargets="CoreCompile"> - $(ArtifactsDir)\Bootstrap\fslex.dll + $(ArtifactsDir)\Bootstrap\fslex\fslex.dll @@ -43,7 +43,7 @@ BeforeTargets="CoreCompile"> - $(ArtifactsDir)\Bootstrap\fsyacc.dll + $(ArtifactsDir)\Bootstrap\fsyacc\fsyacc.dll From 688850f47922d2b9134331d7d4d3c2cf5a04a7e7 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 16 Apr 2019 00:13:17 +0100 Subject: [PATCH 131/137] revert test env changes --- FSharpTests.Directory.Build.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 9ad765f036d..7b9242dc0db 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -22,19 +22,19 @@ $([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)')) dotnet.exe dotnet - $(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp2.1\publish\fsc.exe + $(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\netcoreapp2.1\fsc.exe $([System.IO.Path]::GetDirectoryName('$(DOTNET_HOST_PATH)')) dotnet.exe dotnet - $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp2.1\publish\fsi.exe + $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\netcoreapp2.1\fsi.exe <_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472 <_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">netcoreapp2.1 - <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)\publish + <_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework) $(_FSharpBuildBinPath)\FSharp.Build.dll From c2c7213ed66f7d415db2c1a53249a325b74986bf Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 16 Apr 2019 01:27:25 +0100 Subject: [PATCH 132/137] revert testing changes --- FSharpTests.Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FSharpTests.Directory.Build.props b/FSharpTests.Directory.Build.props index 7b9242dc0db..8a7a832a43e 100644 --- a/FSharpTests.Directory.Build.props +++ b/FSharpTests.Directory.Build.props @@ -7,11 +7,11 @@ true - $(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net472\publish + $(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\net472 fsc.exe - $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net472\publish + $(MSBuildThisFileDirectory)artifacts\bin\fsi\$(Configuration)\net472 fsi.exe From e46dcd5681fdcf52b889c145799dc96a668613ee Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 16 Apr 2019 15:19:09 +0100 Subject: [PATCH 133/137] don't repeat bootstrap --- eng/Build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Build.ps1 b/eng/Build.ps1 index 30ef852db76..04bee5a40d8 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -128,7 +128,7 @@ function Process-Arguments() { } function Update-Arguments() { - if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc.exe")) { + if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.exe")) { $script:bootstrap = $True } } From 75e9cc3f7baa083aa3717a0a54bfa61ce0671bfc Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 17 Apr 2019 13:23:04 +0100 Subject: [PATCH 134/137] be systematic about verbosity --- eng/build-utils.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1 index c16e31ebfc2..f85a9007296 100644 --- a/eng/build-utils.ps1 +++ b/eng/build-utils.ps1 @@ -178,7 +178,7 @@ function Get-PackageDir([string]$name, [string]$version = "") { return $p } -function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string]$logFileName = "", [switch]$parallel = $true, [switch]$summary = $true, [switch]$warnAsError = $true, [string]$configuration = $script:configuration) { +function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string]$logFileName = "", [switch]$parallel = $true, [switch]$summary = $true, [switch]$warnAsError = $true, [string]$configuration = $script:configuration, [string]$verbosity = $script:verbosity) { # Because we override the C#/VB toolset to build against our LKG package, it is important # that we do not reuse MSBuild nodes from other jobs/builds on the machine. Otherwise, # we'll run into issues such as https://github.com/dotnet/roslyn/issues/6211. @@ -190,9 +190,9 @@ function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string] } if ($summary) { - $args += " /consoleloggerparameters:Verbosity=minimal;summary" + $args += " /consoleloggerparameters:Verbosity=$verbosity;summary" } else { - $args += " /consoleloggerparameters:Verbosity=minimal" + $args += " /consoleloggerparameters:Verbosity=$verbosity" } if ($parallel) { @@ -237,13 +237,13 @@ function Make-BootstrapBuild() { Create-Directory $dir # prepare FsLex and Fsyacc - Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Publish" -logFileName "BuildTools" -configuration $bootstrapConfiguration + Run-MSBuild "$RepoRoot\src\buildtools\buildtools.proj" "/restore /t:Publish" -logFileName "BuildTools" -configuration $bootstrapConfiguration -verbosity $verbosity Copy-Item "$ArtifactsDir\bin\fslex\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\fslex" -Force -Recurse Copy-Item "$ArtifactsDir\bin\fsyacc\$bootstrapConfiguration\netcoreapp2.1\publish" -Destination "$dir\fsyacc" -Force -Recurse # prepare compiler $projectPath = "$RepoRoot\proto.proj" - Run-MSBuild $projectPath "/restore /t:Publish" -logFileName "Bootstrap" -configuration $bootstrapConfiguration + Run-MSBuild $projectPath "/restore /t:Publish" -logFileName "Bootstrap" -configuration $bootstrapConfiguration -verbosity $verbosity Copy-Item "$ArtifactsDir\bin\fsc\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsc" -Force -Recurse Copy-Item "$ArtifactsDir\bin\fsi\$bootstrapConfiguration\$bootstrapTfm\publish" -Destination "$dir\fsi" -Force -Recurse From c8d40a50c62a93da2a30959f2bc8dee3c696a10f Mon Sep 17 00:00:00 2001 From: Don Syme Date: Thu, 18 Apr 2019 15:25:39 +0100 Subject: [PATCH 135/137] merge master --- src/fsharp/TastOps.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index b5e68f82c47..6b9f9a2083e 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -3077,7 +3077,7 @@ let isSpanTyconRef g m tcref = tcref.CompiledRepresentationForNamedType.BasicQualifiedName = "System.Span`1" let isSpanTy g m ty = - ty |> stripTyEqns g |> (function TType_app(tcref, _) -> isSpanTyconRef g m tcref | _ -> false) + ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> isSpanTyconRef g m tcref | _ -> false) let rec tryDestSpanTy g m ty = match tryAppTy g ty with @@ -3094,7 +3094,7 @@ let isReadOnlySpanTyconRef g m tcref = tcref.CompiledRepresentationForNamedType.BasicQualifiedName = "System.ReadOnlySpan`1" let isReadOnlySpanTy g m ty = - ty |> stripTyEqns g |> (function TType_app(tcref, _) -> isReadOnlySpanTyconRef g m tcref | _ -> false) + ty |> stripTyEqns g |> (function TType_app(tcref, _, _) -> isReadOnlySpanTyconRef g m tcref | _ -> false) let tryDestReadOnlySpanTy g m ty = match tryAppTy g ty with From 65f4244047c95a6638ecb51f0b841fca8a2d8df0 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Tue, 23 Apr 2019 21:04:50 +0100 Subject: [PATCH 136/137] add test --- tests/fsharp/typecheck/sigs/neg115.bsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fsharp/typecheck/sigs/neg115.bsl b/tests/fsharp/typecheck/sigs/neg115.bsl index 02cc368dae7..4a6688603fe 100644 --- a/tests/fsharp/typecheck/sigs/neg115.bsl +++ b/tests/fsharp/typecheck/sigs/neg115.bsl @@ -1,2 +1,2 @@ -neg115.fs(8,30,8,34): typecheck error FS0001: Expecting a type supporting the operator 'get_Item1' but given a tuple type +neg115.fs(6,9,6,17): parse error FS0525: An integer for loop must use a simple identifier From 5215809a6577e13ea01a9c7209a6650f3e9a6414 Mon Sep 17 00:00:00 2001 From: Don Syme Date: Wed, 24 Apr 2019 14:56:59 +0100 Subject: [PATCH 137/137] merge master --- src/absil/ilread.fs | 6 +++--- src/fsharp/CompileOps.fs | 2 +- src/fsharp/FSharp.Build/Fsc.fs | 11 ++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/absil/ilread.fs b/src/absil/ilread.fs index da014c0acd3..88b0ef474f7 100644 --- a/src/absil/ilread.fs +++ b/src/absil/ilread.fs @@ -913,9 +913,9 @@ let mkCacheInt32 lowMem _inbase _nm _sz = cache := c c | NonNull c -> c - let mutable res = Unchecked.defaultof<_> - let ok = cache.TryGetValue(idx, &res) - if ok then + + match cache.TryGetValue idx with + | true, res -> incr count res | _ -> diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs index 52f2101a550..b51cb081a32 100644 --- a/src/fsharp/CompileOps.fs +++ b/src/fsharp/CompileOps.fs @@ -3690,7 +3690,7 @@ let MakeILResource rname bytes = CustomAttrsStored = storeILCustomAttrs emptyILCustomAttrs MetadataIndex = NoMetadataIdx } -let PickleToResource inMem file g scope rname rnameB p x = +let PickleToResource inMem file (g: TcGlobals) scope rname rnameB p x = let file = PathMap.apply g.pathMap file let bytes, bytesB = pickleObjWithDanglingCcus inMem file g scope p x { Name = rname diff --git a/src/fsharp/FSharp.Build/Fsc.fs b/src/fsharp/FSharp.Build/Fsc.fs index 3b63a898a2c..f06b03c81a1 100644 --- a/src/fsharp/FSharp.Build/Fsc.fs +++ b/src/fsharp/FSharp.Build/Fsc.fs @@ -91,6 +91,7 @@ type public Fsc () as this = let mutable keyFile : string? = null let mutable otherFlags : string? = null let mutable outputAssembly : string? = null + let mutable pathMap : string? = null let mutable pdbFile : string? = null let mutable platform : string? = null let mutable preferredUILang : string? = null @@ -283,9 +284,13 @@ type public Fsc () as this = builder.AppendSwitch("--nocopyfsharpcore") - match pathMap with - | null -> () - | _ -> builder.AppendSwitchIfNotNull("--pathmap:", pathMap.Split([|';'; ','|], StringSplitOptions.RemoveEmptyEntries), ",") + let pathMapArray = // create a array of strings + match pathMap with + | null -> null + | NonNull pathMap -> + pathMap.Split([|';'; ','|], StringSplitOptions.RemoveEmptyEntries) + + builder.AppendSwitchesIfNotNull("--pathmap:", pathMapArray, ",") if deterministic then builder.AppendSwitch("--deterministic+")